FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20 from nekonomicon/minor_bugfixes 

Fix some crashes.
This commit is contained in:
Alibek Omarov 2016-12-24 02:49:36 +03:00 committed by GitHub
parent 21317e7da3 74edcd09b3
commit 8d6f8c1a73
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;