Crash bug fixes: Fast zombie torso missing precache and null ptr in s…

…tunstick
entropy-zero · Nov 2, 2019 · 683df06 · 683df06
1 parent 7b10c07
commit 683df06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/sp/src/game/server/hl2/npc_fastzombie.cpp b/sp/src/game/server/hl2/npc_fastzombie.cpp
@@ -501,6 +501,7 @@ void CFastZombie::Precache( void )
 	}
 
 	PrecacheModel( STRING( GetModelName() ) );
+	PrecacheModel( STRING( GetLivingTorsoModelName() ) );
 
 	BaseClass::Precache();
 #else

diff --git a/sp/src/game/shared/hl2mp/weapon_stunstick.cpp b/sp/src/game/shared/hl2mp/weapon_stunstick.cpp
@@ -1078,7 +1078,7 @@ void C_WeaponStunStick::Simulate( void )
 				m_pStunstickLight->TurnOn();
 			}
 
-			if (GetOwner()->IsPlayer())
+			if ( GetOwner() != NULL && GetOwner()->IsPlayer() )
 			{
 				CBasePlayer *pPlayer = ToBasePlayer( GetOwner() );
 				if (pPlayer != NULL)
-Original file line number
+Diff line change
@@ Expand Up / @@ -501,6 +501,7 @@ void CFastZombie::Precache( void ) @@
     	}
     	PrecacheModel( STRING( GetModelName() ) );
+    	PrecacheModel( STRING( GetLivingTorsoModelName() ) );
     	BaseClass::Precache();
     #else
@@ Expand Down @@