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

Removed an ugly Tanaka/Katana captain name hack

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2774 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2007-06-19 04:20:13 +00:00
parent 83ac19c8e1
commit eab047d9ba
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/grpinfo.c
-14
View File
@@ -651,20 +651,6 @@ GetGroupInfo (DWORD offset, BYTE which_group)
#ifdef DEBUG_GROUPS #ifdef DEBUG_GROUPS
log_add (log_Debug, "\n"); log_add (log_Debug, "\n");
#endif /* DEBUG_GROUPS */ #endif /* DEBUG_GROUPS */
if (RaceType == SHOFIXTI_SHIP
&& which_group != GROUP_LIST
&& !GET_GAME_STATE (SHOFIXTI_RECRUITED))
{
BYTE captains_name_index;
if (!GET_GAME_STATE (SHOFIXTI_KIA))
captains_name_index =
NAME_OFFSET + NUM_CAPTAINS_NAMES;
else
captains_name_index =
NAME_OFFSET + NUM_CAPTAINS_NAMES + 1;
OwnStarShip (FragPtr, BAD_GUY, captains_name_index);
}
UnlockStarShip (&GLOBAL (npc_built_ship_q), hStarShip); UnlockStarShip (&GLOBAL (npc_built_ship_q), hStarShip);
} }
else else
sc2/src/sc2code/planets/genshof.c
+12 -1
View File
@@ -61,11 +61,22 @@ GenerateShofixti (BYTE control)
if (GLOBAL (BattleGroupRef) == 0 if (GLOBAL (BattleGroupRef) == 0
|| !GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP)) || !GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP))
{ {
HSTARSHIP hStarShip;
if (GLOBAL (BattleGroupRef) == 0) if (GLOBAL (BattleGroupRef) == 0)
GLOBAL (BattleGroupRef) = ~0L; GLOBAL (BattleGroupRef) = ~0L;
CloneShipFragment (SHOFIXTI_SHIP, hStarShip = CloneShipFragment (SHOFIXTI_SHIP,
&GLOBAL (npc_built_ship_q), 1); &GLOBAL (npc_built_ship_q), 1);
if (hStarShip)
{ /* Set old Shofixti name; his brother if Tanaka died */
SHIP_FRAGMENT *FragPtr = (SHIP_FRAGMENT *) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip);
OwnStarShip (FragPtr, BAD_GUY, NAME_OFFSET +
NUM_CAPTAINS_NAMES +
(GET_GAME_STATE (SHOFIXTI_KIA) & 1));
UnlockStarShip (&GLOBAL (npc_built_ship_q), hStarShip);
}
GLOBAL (BattleGroupRef) = PutGroupInfo ( GLOBAL (BattleGroupRef) = PutGroupInfo (
GLOBAL (BattleGroupRef), 1); GLOBAL (BattleGroupRef), 1);