From: <av...@us...> - 2007-06-19 04:20:18
|
Revision: 2774 http://sc2.svn.sourceforge.net/sc2/?rev=2774&view=rev Author: avolkov Date: 2007-06-18 21:20:13 -0700 (Mon, 18 Jun 2007) Log Message: ----------- Removed an ugly Tanaka/Katana captain name hack Modified Paths: -------------- trunk/sc2/src/sc2code/grpinfo.c trunk/sc2/src/sc2code/planets/genshof.c Modified: trunk/sc2/src/sc2code/grpinfo.c =================================================================== --- trunk/sc2/src/sc2code/grpinfo.c 2007-06-18 19:50:18 UTC (rev 2773) +++ trunk/sc2/src/sc2code/grpinfo.c 2007-06-19 04:20:13 UTC (rev 2774) @@ -651,20 +651,6 @@ #ifdef DEBUG_GROUPS log_add (log_Debug, "\n"); #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); } else Modified: trunk/sc2/src/sc2code/planets/genshof.c =================================================================== --- trunk/sc2/src/sc2code/planets/genshof.c 2007-06-18 19:50:18 UTC (rev 2773) +++ trunk/sc2/src/sc2code/planets/genshof.c 2007-06-19 04:20:13 UTC (rev 2774) @@ -61,11 +61,22 @@ if (GLOBAL (BattleGroupRef) == 0 || !GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP)) { + HSTARSHIP hStarShip; + if (GLOBAL (BattleGroupRef) == 0) GLOBAL (BattleGroupRef) = ~0L; - CloneShipFragment (SHOFIXTI_SHIP, + hStarShip = CloneShipFragment (SHOFIXTI_SHIP, &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), 1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |