Merge branch 'minor_bugfixes' into visitors

This commit is contained in:
Night Owl 2016-12-07 01:10:49 +05:00
commit 214bb88638
2 changed files with 4 additions and 2 deletions

View File

@ -1342,6 +1342,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;