Merge branch 'minor_bugfixes' into aom

8 years ago · 16607d0036
2 changed files with 4 additions and 2 deletions
--- a/dlls/talkmonster.cpp
+++ b/dlls/talkmonster.cpp
@ -1342,6 +1342,8 @@ BOOL CTalkMonster::CanFollow( void )
				@@ -1342,6 +1342,8 @@ BOOL CTalkMonster::CanFollow( void )
 {
 	if( m_MonsterState == MONSTERSTATE_SCRIPT )
 	{
+		if( !m_pCine )
+			return FALSE;
 		if( !m_pCine->CanInterrupt() )
 			return FALSE;
 	}
--- a/pm_shared/pm_shared.c
+++ b/pm_shared/pm_shared.c
@ -30,8 +30,8 @@
				@@ -30,8 +30,8 @@
 #ifdef CLIENT_DLL
 	// Spectator Mode
 	int	iJumpSpectator;
-	float	vJumpOrigin[3];
-	float	vJumpAngles[3];
+extern	float	vJumpOrigin[3];
+extern	float	vJumpAngles[3];
 #endif

 static int pm_shared_initialized = 0;