From 0919ab84fee16ccd01db584d54070dad1b3e3f12 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Thu, 29 Oct 2009 22:32:22 +0000
Subject: [PATCH] Battle & ship code cleanup: Removed the now invariant var
 CyborgDescPtr

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3263 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/uqm/battle.c | 18 ++++++++----------
 sc2/src/uqm/cyborg.c |  2 --
 sc2/src/uqm/intel.h  |  1 -
 sc2/src/uqm/ship.c   |  1 -
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/sc2/src/uqm/battle.c b/sc2/src/uqm/battle.c
index 722ed239d..7d6a254a5 100644
--- a/sc2/src/uqm/battle.c
+++ b/sc2/src/uqm/battle.c
@@ -99,7 +99,7 @@ DoRunAway (STARSHIP *StarShipPtr)
 				BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2E));
 		SetPrimType (&DisplayArray[ElementPtr->PrimIndex], STAMPFILL_PRIM);
 	
-		CyborgDescPtr->ship_input_state = 0;
+		StarShipPtr->ship_input_state = 0;
 	}
 	UnlockElement (StarShipPtr->hShip);
 }
@@ -170,8 +170,6 @@ ProcessInput (void)
 
 			if (StarShipPtr->hShip)
 			{
-				CyborgDescPtr = StarShipPtr;
-
 				InputState = PlayerInput[cur_player]->handlers->frameInput (
 						PlayerInput[cur_player], StarShipPtr);
 
@@ -192,19 +190,19 @@ ProcessInput (void)
 				}
 #endif
 
-				CyborgDescPtr->ship_input_state = 0;
-				if (CyborgDescPtr->RaceDescPtr->ship_info.crew_level)
+				StarShipPtr->ship_input_state = 0;
+				if (StarShipPtr->RaceDescPtr->ship_info.crew_level)
 				{
 					if (InputState & BATTLE_LEFT)
-						CyborgDescPtr->ship_input_state |= LEFT;
+						StarShipPtr->ship_input_state |= LEFT;
 					else if (InputState & BATTLE_RIGHT)
-						CyborgDescPtr->ship_input_state |= RIGHT;
+						StarShipPtr->ship_input_state |= RIGHT;
 					if (InputState & BATTLE_THRUST)
-						CyborgDescPtr->ship_input_state |= THRUST;
+						StarShipPtr->ship_input_state |= THRUST;
 					if (InputState & BATTLE_WEAPON)
-						CyborgDescPtr->ship_input_state |= WEAPON;
+						StarShipPtr->ship_input_state |= WEAPON;
 					if (InputState & BATTLE_SPECIAL)
-						CyborgDescPtr->ship_input_state |= SPECIAL;
+						StarShipPtr->ship_input_state |= SPECIAL;
 
 					if (CanRunAway && cur_player == 0 &&
 							(InputState & BATTLE_ESCAPE))
diff --git a/sc2/src/uqm/cyborg.c b/sc2/src/uqm/cyborg.c
index f8fc5ba23..45128a7a2 100644
--- a/sc2/src/uqm/cyborg.c
+++ b/sc2/src/uqm/cyborg.c
@@ -288,8 +288,6 @@ PlotIntercept (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1,
 	return (0);
 }
 
-STARSHIP *CyborgDescPtr;
-
 static void
 InitCyborg (STARSHIP *StarShipPtr)
 {
diff --git a/sc2/src/uqm/intel.h b/sc2/src/uqm/intel.h
index 2f16337a9..09a329f3e 100644
--- a/sc2/src/uqm/intel.h
+++ b/sc2/src/uqm/intel.h
@@ -44,7 +44,6 @@ enum
 	FIRST_EMPTY_INDEX
 };
 
-extern STARSHIP *CyborgDescPtr;
 extern SIZE cur_player;
 
 extern BATTLE_INPUT_STATE computer_intelligence (
diff --git a/sc2/src/uqm/ship.c b/sc2/src/uqm/ship.c
index 09b865125..7aa480c0b 100644
--- a/sc2/src/uqm/ship.c
+++ b/sc2/src/uqm/ship.c
@@ -503,7 +503,6 @@ GetNextStarShip (STARSHIP *LastStarShipPtr, COUNT which_side)
 	HSTARSHIP hBattleShip;
 
 	cur_player = which_side;
-	CyborgDescPtr = 0;
 
 
 	hBattleShip = GetEncounterStarShip (LastStarShipPtr, which_side);