Browse Source

Merge branch 'minor_bugfixes' into bshift

bshift
Night Owl 8 years ago
parent
commit
9b40735be9
  1. 2
      dlls/talkmonster.cpp
  2. 4
      pm_shared/pm_shared.c

2
dlls/talkmonster.cpp

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

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

Loading…
Cancel
Save