fixed possible zero pointer error

2012-11-12 18:58:39 +01:00 · 2012-11-12 18:58:39 +01:00 · 08246163b7
parent 2ee7f54d2a
commit 08246163b7
1 changed files with 4 additions and 1 deletions
--- a/planet/Objects.ocd/Libraries.ocd/AimManager.ocd/Script.c
+++ b/planet/Objects.ocd/Libraries.ocd/AimManager.ocd/Script.c
@ -163,7 +163,10 @@ func PauseAim()
 {
 	if(!aim_weapon) return CancelAiming();
 	ResetHands(1);
-	aim_weapon->~OnPauseAim(this);
+	
+	// might be invalid if the weapon does anything weird on Reset() 
+	if(aim_weapon)
+		aim_weapon->~OnPauseAim(this);
 }

 func RestartAim()