Some cleanup of earlier ship struct work; comments

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2800 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/sc2code/build.c

@@ -384,7 +384,6 @@ CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level)
 		ShipFragPtr->which_side = TemplatePtr->ship_flags &
 				(GOOD_GUY | BAD_GUY);
 		ShipFragPtr->captains_name_index = captains_name_index;
-		// XXX: SHIP_INFO struct copy
 		ShipFragPtr->race_strings = TemplatePtr->race_strings;
 		ShipFragPtr->icons = TemplatePtr->icons;
 		ShipFragPtr->melee_icon = TemplatePtr->melee_icon;

sc2/src/sc2code/comm.c

@@ -1718,7 +1718,6 @@ RaceCommunication (void)
 
 			hStarShip = GetStarShipFromIndex (&GLOBAL (npc_built_ship_q), i);
 			FragPtr = LockShipFrag (&GLOBAL (npc_built_ship_q), hStarShip);
-			// XXX: SHIP_INFO struct copy
 			BSIPtr = &EncounterPtr->ShipList[i];
 			BSIPtr->race_id = FragPtr->race_id;
 			BSIPtr->crew_level = FragPtr->crew_level;

sc2/src/sc2code/displist.h

@@ -23,6 +23,12 @@
 #include "libs/memlib.h"
 #include "port.h"
 
+// Note that we MUST use the QUEUE_TABLE variant at this time, because
+// certain gameplay elements depend on it. Namely, the maximum number
+// of HyperSpace encounter globes chasing the player is defined by the
+// allocated size of the encounter_q. If switched to non-table variant,
+// the max number of encounters will be virtually unlimited the way the
+// code works now.
 #define QUEUE_TABLE
 
 #ifdef QUEUE_TABLE

sc2/src/sc2code/element.h

@@ -127,7 +127,6 @@ struct element
 	BYTE mass_points;
 			/* Also: system loc for IP flagship */
 	BYTE turn_wait;
-			/* Also: group_id for IP groups */
 	BYTE thrust_wait;
 	VELOCITY_DESC velocity;
 	INTERSECT_CONTROL IntersectControl;

sc2/src/sc2code/globdata.c

@@ -239,7 +239,6 @@ InitSIS (void)
 				hMasterShip = FindMasterShip (ship_ref);
 				MasterPtr = LockMasterShip (&master_q, hMasterShip);
 				// Grab a copy of loaded icons and strings (not owned)
-				// XXX: SHIP_INFO struct copy
 				copyFleetInfo (FleetPtr, &MasterPtr->ShipInfo,
 						&MasterPtr->Fleet);
 				UnlockMasterShip (&master_q, hMasterShip);
@@ -251,7 +250,6 @@ InitSIS (void)
 						FALSE);
 				if (RDPtr)
 				{	// Grab a copy of loaded icons and strings
-					// XXX: SHIP_INFO struct copy
 					copyFleetInfo (FleetPtr, &RDPtr->ship_info,
 							&RDPtr->fleet);
 					// avail_race_q owns these resources now

sc2/src/sc2code/hyper.c

@@ -961,7 +961,6 @@ AddEncounterElement (ENCOUNTER *EncounterPtr, POINT *puniverse)
 
 			hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), Type);
 			FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip);
-			// XXX: SHIP_INFO struct copy
 			BSIPtr->race_id = Type;
 			BSIPtr->crew_level = FleetPtr->crew_level;
 			BSIPtr->max_crew = FleetPtr->max_crew;

sc2/src/sc2code/ipdisp.c

@@ -582,7 +582,7 @@ spawn_ip_group (IP_GROUP *GroupPtr)
 
 		LockElement (hIPSHIPElement, &IPSHIPElementPtr);
 		// XXX: turn_wait hack is not actually used anywhere
-		IPSHIPElementPtr->turn_wait = GroupPtr->group_id;
+		//IPSHIPElementPtr->turn_wait = GroupPtr->group_id;
 		IPSHIPElementPtr->mass_points = 1;
 		IPSHIPElementPtr->hit_points = 1;
 		IPSHIPElementPtr->state_flags =

sc2/src/sc2code/planets/genpet.c

@@ -54,7 +54,6 @@ ZapToUrquanEncounter (void)
 		EncounterPtr->radius = TemplatePtr->actual_strength;
 		EncounterPtr->SD.Type = URQUAN_SHIP;
 		EncounterPtr->SD.Index = MAKE_BYTE (1, 0) | ONE_SHOT_ENCOUNTER;
-		// XXX: SHIP_INFO struct copy
 		BSIPtr = &EncounterPtr->ShipList[0];
 		BSIPtr->race_id = URQUAN_SHIP;
 		BSIPtr->crew_level = TemplatePtr->crew_level;