Merge branch 'minor_bugfixes' into bshift

This commit is contained in:
Night Owl 2016-12-04 00:42:19 +05:00
commit 9b40735be9
2 changed files with 4 additions and 2 deletions

View File

@ -1343,6 +1343,8 @@ BOOL CTalkMonster::CanFollow( void )
{
if( m_MonsterState == MONSTERSTATE_SCRIPT )
{
if( !m_pCine )
return FALSE;
if( !m_pCine->CanInterrupt() )
return FALSE;
}

View File

@ -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;