adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: clean up the queue after done generating defined groups

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2804 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2007-07-11 23:11:32 +00:00
parent 40fc446cd6
commit 40b3a639aa
7 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/gencol.c
+1 -1
View File
@@ -37,8 +37,8 @@ GenerateColony (BYTE control)
{ {
CloneShipFragment (URQUAN_SHIP, CloneShipFragment (URQUAN_SHIP,
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1); GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
ReinitQueue (&GLOBAL (npc_built_ship_q));
SET_GAME_STATE_32 (COLONY_GRPOFFS0, GLOBAL (BattleGroupRef)); SET_GAME_STATE_32 (COLONY_GRPOFFS0, GLOBAL (BattleGroupRef));
} }
sc2/src/sc2code/planets/genmel.c
+1
View File
@@ -102,6 +102,7 @@ GenerateMelnorme (BYTE control)
CloneShipFragment (MELNORME_SHIP, CloneShipFragment (MELNORME_SHIP,
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1); GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
ReinitQueue (&GLOBAL (npc_built_ship_q));
SetMelnormeRef (GLOBAL (BattleGroupRef)); SetMelnormeRef (GLOBAL (BattleGroupRef));
} }
GenerateRandomIP (INIT_NPCS); GenerateRandomIP (INIT_NPCS);
sc2/src/sc2code/planets/gensam.c
+2
View File
@@ -66,6 +66,8 @@ BuildUrquanGuard (void)
for (b0 = 1; b0 <= NUM_URQUAN_GUARDS1; ++b0) for (b0 = 1; b0 <= NUM_URQUAN_GUARDS1; ++b0)
PutGroupInfo (GLOBAL (BattleGroupRef), (BYTE)(NUM_URQUAN_GUARDS0 + b0)); PutGroupInfo (GLOBAL (BattleGroupRef), (BYTE)(NUM_URQUAN_GUARDS0 + b0));
ReinitQueue (&GLOBAL (npc_built_ship_q));
GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP); GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP);
XFormIPLoc (&pSolarSysState->PlanetDesc[4].image.origin, XFormIPLoc (&pSolarSysState->PlanetDesc[4].image.origin,
sc2/src/sc2code/planets/genshof.c
+1
View File
@@ -79,6 +79,7 @@ GenerateShofixti (BYTE control)
GLOBAL (BattleGroupRef) = PutGroupInfo ( GLOBAL (BattleGroupRef) = PutGroupInfo (
GLOBAL (BattleGroupRef), 1); GLOBAL (BattleGroupRef), 1);
ReinitQueue (&GLOBAL (npc_built_ship_q));
SET_GAME_STATE_32 (SHOFIXTI_GRPOFFS0, SET_GAME_STATE_32 (SHOFIXTI_GRPOFFS0,
GLOBAL (BattleGroupRef)); GLOBAL (BattleGroupRef));
} }
sc2/src/sc2code/planets/gensol.c
+1 -1
View File
@@ -415,8 +415,8 @@ GenerateSOL (BYTE control)
{ {
CloneShipFragment (URQUAN_PROBE_SHIP, CloneShipFragment (URQUAN_PROBE_SHIP,
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1); GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
ReinitQueue (&GLOBAL (npc_built_ship_q));
SET_GAME_STATE_32 (URQUAN_PROBE_GRPOFFS0, SET_GAME_STATE_32 (URQUAN_PROBE_GRPOFFS0,
GLOBAL (BattleGroupRef)); GLOBAL (BattleGroupRef));
} }
sc2/src/sc2code/planets/genzoq.c
+1 -1
View File
@@ -62,8 +62,8 @@ GenerateScout (BYTE control)
{ {
CloneShipFragment (ZOQFOTPIK_SHIP, CloneShipFragment (ZOQFOTPIK_SHIP,
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1); GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
ReinitQueue (&GLOBAL (npc_built_ship_q));
SET_GAME_STATE_32 (ZOQFOT_GRPOFFS0, SET_GAME_STATE_32 (ZOQFOT_GRPOFFS0,
GLOBAL (BattleGroupRef)); GLOBAL (BattleGroupRef));
} }
sc2/src/sc2code/planets/lander.c
+16 -8
View File
@@ -892,15 +892,23 @@ lightning_process (ELEMENT *ElementPtr)
else else
{ {
SIZE s; SIZE s;
#define NUM_CYCLES 8
static const COLOR color_tab[] =
{
BUILD_COLOR (MAKE_RGB15 (0x11, 0x11, 0x11), 0x18),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x13, 0x13), 0x17),
BUILD_COLOR (MAKE_RGB15 (0x15, 0x15, 0x15), 0x15),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x17, 0x17), 0x14),
BUILD_COLOR (MAKE_RGB15 (0x19, 0x19, 0x19), 0x13),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x1B, 0x1B), 0x12),
BUILD_COLOR (MAKE_RGB15 (0x1D, 0x1D, 0x1D), 0x10),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0f),
};
// XXX: Color cycling is largely unused, because the color s = ElementPtr->life_span;
// never actually changes RGB values (see MAKE_RGB15 below). if (s > NUM_CYCLES - 1)
// This did, however, work in DOS SC2 version (fade effect). s = NUM_CYCLES - 1;
s = 7 - ((SIZE)ElementPtr->cycle - (SIZE)ElementPtr->life_span); SetPrimColor (pPrim, color_tab[s]);
if (s < 0)
s = 0;
// XXX: Was 0x8000 the background flag on 3DO?
SetPrimColor (pPrim, BUILD_COLOR (0x8000 | MAKE_RGB15 (0x1F, 0x1F, 0x1F), s));
if (ElementPtr->mass_points == LIGHTNING_DISASTER) if (ElementPtr->mass_points == LIGHTNING_DISASTER)
{ {