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

Battle & ship code cleanup: Removed the now invariant var CyborgDescPtr

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3263 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-10-29 22:32:22 +00:00
parent 60d320f09b
commit 0919ab84fe
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/battle.c
+8 -10
View File
@@ -99,7 +99,7 @@ DoRunAway (STARSHIP *StarShipPtr)
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2E)); BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2E));
SetPrimType (&DisplayArray[ElementPtr->PrimIndex], STAMPFILL_PRIM); SetPrimType (&DisplayArray[ElementPtr->PrimIndex], STAMPFILL_PRIM);
CyborgDescPtr->ship_input_state = 0; StarShipPtr->ship_input_state = 0;
} }
UnlockElement (StarShipPtr->hShip); UnlockElement (StarShipPtr->hShip);
} }
@@ -170,8 +170,6 @@ ProcessInput (void)
if (StarShipPtr->hShip) if (StarShipPtr->hShip)
{ {
CyborgDescPtr = StarShipPtr;
InputState = PlayerInput[cur_player]->handlers->frameInput ( InputState = PlayerInput[cur_player]->handlers->frameInput (
PlayerInput[cur_player], StarShipPtr); PlayerInput[cur_player], StarShipPtr);
@@ -192,19 +190,19 @@ ProcessInput (void)
} }
#endif #endif
CyborgDescPtr->ship_input_state = 0; StarShipPtr->ship_input_state = 0;
if (CyborgDescPtr->RaceDescPtr->ship_info.crew_level) if (StarShipPtr->RaceDescPtr->ship_info.crew_level)
{ {
if (InputState & BATTLE_LEFT) if (InputState & BATTLE_LEFT)
CyborgDescPtr->ship_input_state |= LEFT; StarShipPtr->ship_input_state |= LEFT;
else if (InputState & BATTLE_RIGHT) else if (InputState & BATTLE_RIGHT)
CyborgDescPtr->ship_input_state |= RIGHT; StarShipPtr->ship_input_state |= RIGHT;
if (InputState & BATTLE_THRUST) if (InputState & BATTLE_THRUST)
CyborgDescPtr->ship_input_state |= THRUST; StarShipPtr->ship_input_state |= THRUST;
if (InputState & BATTLE_WEAPON) if (InputState & BATTLE_WEAPON)
CyborgDescPtr->ship_input_state |= WEAPON; StarShipPtr->ship_input_state |= WEAPON;
if (InputState & BATTLE_SPECIAL) if (InputState & BATTLE_SPECIAL)
CyborgDescPtr->ship_input_state |= SPECIAL; StarShipPtr->ship_input_state |= SPECIAL;
if (CanRunAway && cur_player == 0 && if (CanRunAway && cur_player == 0 &&
(InputState & BATTLE_ESCAPE)) (InputState & BATTLE_ESCAPE))
sc2/src/uqm/cyborg.c
-2
View File
@@ -288,8 +288,6 @@ PlotIntercept (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1,
return (0); return (0);
} }
STARSHIP *CyborgDescPtr;
static void static void
InitCyborg (STARSHIP *StarShipPtr) InitCyborg (STARSHIP *StarShipPtr)
{ {
sc2/src/uqm/intel.h
-1
View File
@@ -44,7 +44,6 @@ enum
FIRST_EMPTY_INDEX FIRST_EMPTY_INDEX
}; };
extern STARSHIP *CyborgDescPtr;
extern SIZE cur_player; extern SIZE cur_player;
extern BATTLE_INPUT_STATE computer_intelligence ( extern BATTLE_INPUT_STATE computer_intelligence (
sc2/src/uqm/ship.c
-1
View File
@@ -503,7 +503,6 @@ GetNextStarShip (STARSHIP *LastStarShipPtr, COUNT which_side)
HSTARSHIP hBattleShip; HSTARSHIP hBattleShip;
cur_player = which_side; cur_player = which_side;
CyborgDescPtr = 0;
hBattleShip = GetEncounterStarShip (LastStarShipPtr, which_side); hBattleShip = GetEncounterStarShip (LastStarShipPtr, which_side);