From 2d0ef9914ae871a9d5824e64fb727aadb2af2c97 Mon Sep 17 00:00:00 2001 From: Night Owl Date: Wed, 30 Nov 2016 01:41:14 +0500 Subject: [PATCH 1/2] Prevent crash when pressed USE and called scripted_sequence. --- dlls/talkmonster.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/talkmonster.cpp b/dlls/talkmonster.cpp index a0a52f52..d832c2cc 100644 --- a/dlls/talkmonster.cpp +++ b/dlls/talkmonster.cpp @@ -1342,6 +1342,8 @@ BOOL CTalkMonster::CanFollow( void ) { if( m_MonsterState == MONSTERSTATE_SCRIPT ) { + if( !m_pCine ) + return FALSE; if( !m_pCine->CanInterrupt() ) return FALSE; } From 74edcd09b335be7a69bafa7f964645556eccb3e9 Mon Sep 17 00:00:00 2001 From: Night Owl Date: Sun, 4 Dec 2016 00:41:40 +0500 Subject: [PATCH 2/2] Make duplicate global variables extern. --- pm_shared/pm_shared.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pm_shared/pm_shared.c b/pm_shared/pm_shared.c index a9ac380f..de855a50 100644 --- a/pm_shared/pm_shared.c +++ b/pm_shared/pm_shared.c @@ -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;