[Sc2-cvs] sc2/src/sc2code/planets gencol.c, 1.5, 1.6 genmel.c, 1.3, 1.4 gensam.c, 1.7, 1.8 genshof.c, 1.5, 1.6 gensol.c, 1.12, 1.13 genzoq.c, 1.7, 1.8

[<av...@us...>]

Update of /cvsroot/sc2/sc2/src/sc2code/planets
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28541/planets

Modified Files:
	gencol.c genmel.c gensam.c genshof.c gensol.c genzoq.c 
Log Message:
Added SET_GAME_STATE_32/GET_GAME_STATE_32 to clean up some code

Index: gencol.c
===================================================================
RCS file: /cvsroot/sc2/sc2/src/sc2code/planets/gencol.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gencol.c	9 Jun 2006 03:54:08 -0000	1.5
--- gencol.c	9 Jun 2006 20:43:17 -0000	1.6
***************
*** 30,57 ****
  		case INIT_NPCS:
  		{
- 			BYTE b0, b1, b2, b3;
  			HSTARSHIP hStarShip;
  
! 			b0 = GET_GAME_STATE (COLONY_GRPOFFS0);
! 			b1 = GET_GAME_STATE (COLONY_GRPOFFS1);
! 			b2 = GET_GAME_STATE (COLONY_GRPOFFS2);
! 			b3 = GET_GAME_STATE (COLONY_GRPOFFS3);
! 			GLOBAL (BattleGroupRef) = MAKE_DWORD (
! 					MAKE_WORD (b0, b1), MAKE_WORD (b2, b3)
! 					);
  			if (GLOBAL (BattleGroupRef) == 0)
  			{
! 					CloneShipFragment (URQUAN_SHIP,
! 							&GLOBAL (npc_built_ship_q), 0);
  
! 					GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 					b0 = LOBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 					b1 = HIBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 					b2 = LOBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 					b3 = HIBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 					SET_GAME_STATE (COLONY_GRPOFFS0, b0);
! 					SET_GAME_STATE (COLONY_GRPOFFS1, b1);
! 					SET_GAME_STATE (COLONY_GRPOFFS2, b2);
! 					SET_GAME_STATE (COLONY_GRPOFFS3, b3);
  			}
  
--- 30,43 ----
  		case INIT_NPCS:
  		{
  			HSTARSHIP hStarShip;
  
! 			GLOBAL (BattleGroupRef) = GET_GAME_STATE_32 (COLONY_GRPOFFS0);
  			if (GLOBAL (BattleGroupRef) == 0)
  			{
! 				CloneShipFragment (URQUAN_SHIP,
! 						&GLOBAL (npc_built_ship_q), 0);
  
! 				GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 				SET_GAME_STATE_32 (COLONY_GRPOFFS0, GLOBAL (BattleGroupRef));
  			}
  

Index: genmel.c
===================================================================
RCS file: /cvsroot/sc2/sc2/src/sc2code/planets/genmel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** genmel.c	9 Jun 2006 03:54:08 -0000	1.3
--- genmel.c	9 Jun 2006 20:43:17 -0000	1.4
***************
*** 22,92 ****
  #include "state.h"
  #include "planets/genall.h"
  
  
! 
! static DWORD
! GetMelnormeRef (void)
  {
! 	BYTE b0, b1, b2, b3;
  
  	switch (CurStarDescPtr->Index)
  	{
  		case MELNORME0_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME0_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME0_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME0_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME0_GRPOFFS3);
  			break;
  		case MELNORME1_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME1_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME1_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME1_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME1_GRPOFFS3);
  			break;
  		case MELNORME2_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME2_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME2_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME2_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME2_GRPOFFS3);
  			break;
  		case MELNORME3_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME3_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME3_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME3_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME3_GRPOFFS3);
  			break;
  		case MELNORME4_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME4_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME4_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME4_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME4_GRPOFFS3);
  			break;
  		case MELNORME5_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME5_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME5_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME5_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME5_GRPOFFS3);
  			break;
  		case MELNORME6_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME6_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME6_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME6_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME6_GRPOFFS3);
  			break;
  		case MELNORME7_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME7_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME7_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME7_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME7_GRPOFFS3);
  			break;
  		case MELNORME8_DEFINED:
! 			b0 = GET_GAME_STATE (MELNORME8_GRPOFFS0);
! 			b1 = GET_GAME_STATE (MELNORME8_GRPOFFS1);
! 			b2 = GET_GAME_STATE (MELNORME8_GRPOFFS2);
! 			b3 = GET_GAME_STATE (MELNORME8_GRPOFFS3);
  			break;
  	}
  
! 	return (MAKE_DWORD (MAKE_WORD (b0, b1), MAKE_WORD (b2, b3)));
  }
  
--- 22,79 ----
  #include "state.h"
  #include "planets/genall.h"
+ #include "libs/log.h"
  
  
! static int
! SelectMelnormeRefVar (void)
  {
! 	int RefVar;
  
  	switch (CurStarDescPtr->Index)
  	{
  		case MELNORME0_DEFINED:
! 			RefVar = MELNORME0_GRPOFFS0;
  			break;
  		case MELNORME1_DEFINED:
! 			RefVar = MELNORME1_GRPOFFS0;
  			break;
  		case MELNORME2_DEFINED:
! 			RefVar = MELNORME2_GRPOFFS0;
  			break;
  		case MELNORME3_DEFINED:
! 			RefVar = MELNORME3_GRPOFFS0;
  			break;
  		case MELNORME4_DEFINED:
! 			RefVar = MELNORME4_GRPOFFS0;
  			break;
  		case MELNORME5_DEFINED:
! 			RefVar = MELNORME5_GRPOFFS0;
  			break;
  		case MELNORME6_DEFINED:
! 			RefVar = MELNORME6_GRPOFFS0;
  			break;
  		case MELNORME7_DEFINED:
! 			RefVar = MELNORME7_GRPOFFS0;
  			break;
  		case MELNORME8_DEFINED:
! 			RefVar = MELNORME8_GRPOFFS0;
  			break;
+ 		default:
+ 			RefVar = -1;
  	}
+ 	return RefVar;
+ }
  
! static DWORD
! GetMelnormeRef (void)
! {
! 	int RefVar = SelectMelnormeRefVar ();
! 	if (RefVar < 0)
! 	{
! 		log_add (log_Warning, "GetMelnormeRef(): reference unknown");
! 		return 0;
! 	}
! 
! 	return GET_GAME_STATE_32 (RefVar);
  }
  
***************
*** 94,160 ****
  SetMelnormeRef (DWORD Ref)
  {
! 	BYTE b0, b1, b2, b3;
! 
! 	b0 = LOBYTE (LOWORD (Ref));
! 	b1 = HIBYTE (LOWORD (Ref));
! 	b2 = LOBYTE (HIWORD (Ref));
! 	b3 = HIBYTE (HIWORD (Ref));
! 	switch (CurStarDescPtr->Index)
  	{
! 		case MELNORME0_DEFINED:
! 			SET_GAME_STATE (MELNORME0_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME0_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME0_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME0_GRPOFFS3, b3);
! 			break;
! 		case MELNORME1_DEFINED:
! 			SET_GAME_STATE (MELNORME1_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME1_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME1_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME1_GRPOFFS3, b3);
! 			break;
! 		case MELNORME2_DEFINED:
! 			SET_GAME_STATE (MELNORME2_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME2_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME2_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME2_GRPOFFS3, b3);
! 			break;
! 		case MELNORME3_DEFINED:
! 			SET_GAME_STATE (MELNORME3_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME3_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME3_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME3_GRPOFFS3, b3);
! 			break;
! 		case MELNORME4_DEFINED:
! 			SET_GAME_STATE (MELNORME4_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME4_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME4_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME4_GRPOFFS3, b3);
! 			break;
! 		case MELNORME5_DEFINED:
! 			SET_GAME_STATE (MELNORME5_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME5_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME5_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME5_GRPOFFS3, b3);
! 			break;
! 		case MELNORME6_DEFINED:
! 			SET_GAME_STATE (MELNORME6_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME6_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME6_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME6_GRPOFFS3, b3);
! 			break;
! 		case MELNORME7_DEFINED:
! 			SET_GAME_STATE (MELNORME7_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME7_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME7_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME7_GRPOFFS3, b3);
! 			break;
! 		case MELNORME8_DEFINED:
! 			SET_GAME_STATE (MELNORME8_GRPOFFS0, b0);
! 			SET_GAME_STATE (MELNORME8_GRPOFFS1, b1);
! 			SET_GAME_STATE (MELNORME8_GRPOFFS2, b2);
! 			SET_GAME_STATE (MELNORME8_GRPOFFS3, b3);
! 			break;
  	}
  }
  
--- 81,92 ----
  SetMelnormeRef (DWORD Ref)
  {
! 	int RefVar = SelectMelnormeRefVar ();
! 	if (RefVar < 0)
  	{
! 		log_add (log_Warning, "SetMelnormeRef(): reference unknown");
! 		return;
  	}
+ 
+ 	SET_GAME_STATE_32 (RefVar, Ref);
  }
  

Index: gensam.c
===================================================================
RCS file: /cvsroot/sc2/sc2/src/sc2code/planets/gensam.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gensam.c	9 Jun 2006 14:21:40 -0000	1.7
--- gensam.c	9 Jun 2006 20:43:17 -0000	1.8
***************
*** 31,45 ****
  {
  	BYTE ship1, ship2;
! 	BYTE b0, b1, b2, b3;
  	POINT org;
  	HSTARSHIP hStarShip, hNextShip;
  
! 	b0 = GET_GAME_STATE (SAMATRA_GRPOFFS0);
! 	b1 = GET_GAME_STATE (SAMATRA_GRPOFFS1);
! 	b2 = GET_GAME_STATE (SAMATRA_GRPOFFS2);
! 	b3 = GET_GAME_STATE (SAMATRA_GRPOFFS3);
! 	GLOBAL (BattleGroupRef) = MAKE_DWORD (
! 			MAKE_WORD (b0, b1), MAKE_WORD (b2, b3)
! 			);
  
  	if (!GET_GAME_STATE (KOHR_AH_FRENZY))
--- 31,39 ----
  {
  	BYTE ship1, ship2;
! 	BYTE b0, b1;
  	POINT org;
  	HSTARSHIP hStarShip, hNextShip;
  
! 	GLOBAL (BattleGroupRef) = GET_GAME_STATE_32 (SAMATRA_GRPOFFS0);
  
  	if (!GET_GAME_STATE (KOHR_AH_FRENZY))
***************
*** 54,66 ****
  	if (GLOBAL (BattleGroupRef) == 0)
  	{
! 			GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 			b0 = LOBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 			b1 = HIBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 			b2 = LOBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 			b3 = HIBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 			SET_GAME_STATE (SAMATRA_GRPOFFS0, b0);
! 			SET_GAME_STATE (SAMATRA_GRPOFFS1, b1);
! 			SET_GAME_STATE (SAMATRA_GRPOFFS2, b2);
! 			SET_GAME_STATE (SAMATRA_GRPOFFS3, b3);
  	}
  
--- 48,53 ----
  	if (GLOBAL (BattleGroupRef) == 0)
  	{
! 		GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 		SET_GAME_STATE_32 (SAMATRA_GRPOFFS0, GLOBAL (BattleGroupRef));
  	}
  

Index: genshof.c
===================================================================
RCS file: /cvsroot/sc2/sc2/src/sc2code/planets/genshof.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** genshof.c	9 Jun 2006 03:54:08 -0000	1.5
--- genshof.c	9 Jun 2006 20:43:17 -0000	1.6
***************
*** 58,70 ****
  				&& GET_GAME_STATE (MAIDENS_ON_SHIP))))
  		{
! 			BYTE b0, b1, b2, b3;
! 
! 			b0 = GET_GAME_STATE (SHOFIXTI_GRPOFFS0);
! 			b1 = GET_GAME_STATE (SHOFIXTI_GRPOFFS1);
! 			b2 = GET_GAME_STATE (SHOFIXTI_GRPOFFS2);
! 			b3 = GET_GAME_STATE (SHOFIXTI_GRPOFFS3);
! 			GLOBAL (BattleGroupRef) = MAKE_DWORD (
! 					MAKE_WORD (b0, b1), MAKE_WORD (b2, b3)
! 					);
  			if (GLOBAL (BattleGroupRef) == 0
  					|| !GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP))
--- 58,62 ----
  				&& GET_GAME_STATE (MAIDENS_ON_SHIP))))
  		{
! 			GLOBAL (BattleGroupRef) = GET_GAME_STATE_32 (SHOFIXTI_GRPOFFS0);
  			if (GLOBAL (BattleGroupRef) == 0
  					|| !GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP))
***************
*** 78,89 ****
  				GLOBAL (BattleGroupRef) = PutGroupInfo (
  						GLOBAL (BattleGroupRef), 1);
! 				b0 = LOBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 				b1 = HIBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 				b2 = LOBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 				b3 = HIBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 				SET_GAME_STATE (SHOFIXTI_GRPOFFS0, b0);
! 				SET_GAME_STATE (SHOFIXTI_GRPOFFS1, b1);
! 				SET_GAME_STATE (SHOFIXTI_GRPOFFS2, b2);
! 				SET_GAME_STATE (SHOFIXTI_GRPOFFS3, b3);
  			}
  		}
--- 70,75 ----
  				GLOBAL (BattleGroupRef) = PutGroupInfo (
  						GLOBAL (BattleGroupRef), 1);
! 				SET_GAME_STATE_32 (SHOFIXTI_GRPOFFS0,
! 						GLOBAL (BattleGroupRef));
  			}
  		}

Index: gensol.c
===================================================================
RCS file: /cvsroot/sc2/sc2/src/sc2code/planets/gensol.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gensol.c	9 Jun 2006 14:21:40 -0000	1.12
--- gensol.c	9 Jun 2006 20:43:17 -0000	1.13
***************
*** 31,63 ****
  
  
- static DWORD
- GetProbeRef (void)
- {
- 	BYTE b0, b1, b2, b3;
- 
- 	b0 = GET_GAME_STATE (URQUAN_PROBE_GRPOFFS0);
- 	b1 = GET_GAME_STATE (URQUAN_PROBE_GRPOFFS1);
- 	b2 = GET_GAME_STATE (URQUAN_PROBE_GRPOFFS2);
- 	b3 = GET_GAME_STATE (URQUAN_PROBE_GRPOFFS3);
- 
- 	return (MAKE_DWORD (MAKE_WORD (b0, b1), MAKE_WORD (b2, b3)));
- }
- 
- static void
- SetProbeRef (DWORD Ref)
- {
- 	BYTE b0, b1, b2, b3;
- 
- 	b0 = LOBYTE (LOWORD (Ref));
- 	b1 = HIBYTE (LOWORD (Ref));
- 	b2 = LOBYTE (HIWORD (Ref));
- 	b3 = HIBYTE (HIWORD (Ref));
- 
- 	SET_GAME_STATE (URQUAN_PROBE_GRPOFFS0, b0);
- 	SET_GAME_STATE (URQUAN_PROBE_GRPOFFS1, b1);
- 	SET_GAME_STATE (URQUAN_PROBE_GRPOFFS2, b2);
- 	SET_GAME_STATE (URQUAN_PROBE_GRPOFFS3, b3);
- }
- 
  static int
  init_probe (void)
--- 31,34 ----
***************
*** 434,438 ****
  	{
  		case INIT_NPCS:
! 			GLOBAL (BattleGroupRef) = GetProbeRef ();
  			if (GLOBAL (BattleGroupRef) == 0)
  			{
--- 405,410 ----
  	{
  		case INIT_NPCS:
! 			GLOBAL (BattleGroupRef) =
! 					GET_GAME_STATE_32 (URQUAN_PROBE_GRPOFFS0);
  			if (GLOBAL (BattleGroupRef) == 0)
  			{
***************
*** 441,445 ****
  
  				GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 				SetProbeRef (GLOBAL (BattleGroupRef));
  			}
  			if (!init_probe ())
--- 413,418 ----
  
  				GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 				SET_GAME_STATE_32 (URQUAN_PROBE_GRPOFFS0,
! 						GLOBAL (BattleGroupRef));
  			}
  			if (!init_probe ())

Index: genzoq.c
===================================================================
RCS file: /cvsroot/sc2/sc2/src/sc2code/planets/genzoq.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** genzoq.c	9 Jun 2006 03:54:09 -0000	1.7
--- genzoq.c	9 Jun 2006 20:43:17 -0000	1.8
***************
*** 64,90 ****
  			if (!GET_GAME_STATE (MET_ZOQFOT))
  			{
! 				BYTE b0, b1, b2, b3;
! 
! 				b0 = GET_GAME_STATE (ZOQFOT_GRPOFFS0);
! 				b1 = GET_GAME_STATE (ZOQFOT_GRPOFFS1);
! 				b2 = GET_GAME_STATE (ZOQFOT_GRPOFFS2);
! 				b3 = GET_GAME_STATE (ZOQFOT_GRPOFFS3);
! 				GLOBAL (BattleGroupRef) = MAKE_DWORD (
! 							MAKE_WORD (b0, b1), MAKE_WORD (b2, b3)
! 							);
  				if (GLOBAL (BattleGroupRef) == 0)
  				{
! 						CloneShipFragment (ZOQFOTPIK_SHIP,
! 								&GLOBAL (npc_built_ship_q), 0);
  
! 						GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 						b0 = LOBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 						b1 = HIBYTE (LOWORD (GLOBAL (BattleGroupRef)));
! 						b2 = LOBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 						b3 = HIBYTE (HIWORD (GLOBAL (BattleGroupRef)));
! 						SET_GAME_STATE (ZOQFOT_GRPOFFS0, b0);
! 						SET_GAME_STATE (ZOQFOT_GRPOFFS1, b1);
! 						SET_GAME_STATE (ZOQFOT_GRPOFFS2, b2);
! 						SET_GAME_STATE (ZOQFOT_GRPOFFS3, b3);
  				}
  			}
--- 64,76 ----
  			if (!GET_GAME_STATE (MET_ZOQFOT))
  			{
! 				GLOBAL (BattleGroupRef) = GET_GAME_STATE_32 (ZOQFOT_GRPOFFS0);
  				if (GLOBAL (BattleGroupRef) == 0)
  				{
! 					CloneShipFragment (ZOQFOTPIK_SHIP,
! 							&GLOBAL (npc_built_ship_q), 0);
  
! 					GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
! 					SET_GAME_STATE_32 (ZOQFOT_GRPOFFS0,
! 							GLOBAL (BattleGroupRef));
  				}
  			}