YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-14 17:07:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'minor_bugfixes' into visitors

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/talkmonster.cpp
View File

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

4
pm_shared/pm_shared.c
View File

@ -30,8 +30,8 @@
#ifdef CLIENT_DLL #ifdef CLIENT_DLL
// Spectator Mode // Spectator Mode
int iJumpSpectator; int iJumpSpectator;
float vJumpOrigin[3]; extern float vJumpOrigin[3];
float vJumpAngles[3]; extern float vJumpAngles[3];
#endif #endif
static int pm_shared_initialized = 0; static int pm_shared_initialized = 0;