From 9e1b5ac5c43145cf485dea8287da8839c2284542 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Thu, 5 Nov 2009 04:09:55 +0000
Subject: [PATCH] Fixes Pkunk crash bug due to a static variable; also moves
 the static data to owning STARSHIP

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3277 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/uqm/races.h             |  3 +++
 sc2/src/uqm/ships/pkunk/pkunk.c | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sc2/src/uqm/races.h b/sc2/src/uqm/races.h
index 145f539f9..5dc5bc783 100644
--- a/sc2/src/uqm/races.h
+++ b/sc2/src/uqm/races.h
@@ -19,6 +19,7 @@
 #ifndef _RACES_H
 #define _RACES_H
 
+#include "types.h"
 #include "libs/compiler.h"
 #include "units.h"
 #include "displist.h"
@@ -275,6 +276,8 @@ struct STARSHIP
 			// -1: neutral; this should currently never happen (asserts)
 	BYTE control;
 			// HUMAN, COMPUTER or NETWORK control flags, see intel.h
+
+	intptr_t data;  // private ship data, ship code owns this
 };
 
 #define RPG_PLAYER_NUM  0
diff --git a/sc2/src/uqm/ships/pkunk/pkunk.c b/sc2/src/uqm/ships/pkunk/pkunk.c
index b6f78a641..ae46f16f2 100644
--- a/sc2/src/uqm/ships/pkunk/pkunk.c
+++ b/sc2/src/uqm/ships/pkunk/pkunk.c
@@ -179,20 +179,20 @@ initialize_bug_missile (ELEMENT *ShipPtr, HELEMENT MissileArray[])
 	return (3);
 }
 
-static HELEMENT hPhoenix = 0;
-
 static void
 pkunk_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern,
 		COUNT ConcernCounter)
 {
 	STARSHIP *StarShipPtr;
+	HELEMENT hPhoenix;
 
 	GetElementStarShip (ShipPtr, &StarShipPtr);
-	if (hPhoenix && StarShipPtr->special_counter)
+	hPhoenix = (HELEMENT) StarShipPtr->data;
+	if (hPhoenix && (StarShipPtr->control & STANDARD_RATING))
 	{
 		RemoveElement (hPhoenix);
 		FreeElement (hPhoenix);
-		hPhoenix = 0;
+		StarShipPtr->data = 0;
 	}
 
 	if (StarShipPtr->RaceDescPtr->ship_info.energy_level <
@@ -442,11 +442,14 @@ pkunk_preprocess (ELEMENT *ElementPtr)
 	GetElementStarShip (ElementPtr, &StarShipPtr);
 	if (ElementPtr->state_flags & APPEARING)
 	{
-		ELEMENT *PhoenixPtr;
+		HELEMENT hPhoenix = 0;
 
-		if (((BYTE)TFB_Random () & 1)
-				&& (hPhoenix = AllocElement ()))
+		if ((BYTE)TFB_Random () & 1)
+			hPhoenix = AllocElement ();
+
+		if (hPhoenix)
 		{
+			ELEMENT *PhoenixPtr;
 
 			LockElement (hPhoenix, &PhoenixPtr);
 			PhoenixPtr->playerNr = ElementPtr->playerNr;
@@ -460,6 +463,7 @@ pkunk_preprocess (ELEMENT *ElementPtr)
 			UnlockElement (hPhoenix);
 			InsertElement (hPhoenix, GetHeadElement ());
 		}
+		StarShipPtr->data = (intptr_t) hPhoenix;
 
 		if (ElementPtr->hTarget == 0)
 			StarShipPtr->RaceDescPtr->preprocess_func = 0;