From 6dc1824fb1eeb7ff1092708c26c8df6189e3292d Mon Sep 17 00:00:00 2001
From: Andrey Akhmichin <sepulkarium45@yahoo.com>
Date: Sun, 7 Jul 2019 23:02:57 +0500
Subject: [PATCH] Fix compilation after merge.

---
 dlls/doors.cpp | 1 +
 dlls/subs.cpp  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/doors.cpp b/dlls/doors.cpp
index c92e2a4d..a37d881b 100644
--- a/dlls/doors.cpp
+++ b/dlls/doors.cpp
@@ -1394,6 +1394,7 @@ void CMomentaryDoor::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYP
 
 void CMomentaryDoor::MomentaryMoveDone( void )
 {
+	m_iState = STATE_OFF;
 	SetThink(&CMomentaryDoor::StopMoveSound);
 	pev->nextthink = pev->ltime + 0.1;
 }
diff --git a/dlls/subs.cpp b/dlls/subs.cpp
index 9f2d65ca..7bc6ee5e 100644
--- a/dlls/subs.cpp
+++ b/dlls/subs.cpp
@@ -575,7 +575,7 @@ void CBaseToggle :: LinearMoveNow( void )
 
 	if( flTravelTime < 0.05 )
 	{
-		UTIL_SetOrigin( pev, m_vecFinalDest );
+		UTIL_SetOrigin( this, m_vecFinalDest );
 		LinearMoveDone();
 		return;
 	}