[Sc2-cvs] SF.net SVN: sc2:[3263] trunk/sc2/src/uqm

[<av...@us...>]

Revision: 3263
          http://sc2.svn.sourceforge.net/sc2/?rev=3263&view=rev
Author:   avolkov
Date:     2009-10-29 22:32:22 +0000 (Thu, 29 Oct 2009)

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

Modified Paths:
--------------
    trunk/sc2/src/uqm/battle.c
    trunk/sc2/src/uqm/cyborg.c
    trunk/sc2/src/uqm/intel.h
    trunk/sc2/src/uqm/ship.c

Modified: trunk/sc2/src/uqm/battle.c
===================================================================
--- trunk/sc2/src/uqm/battle.c	2009-10-29 00:40:35 UTC (rev 3262)
+++ trunk/sc2/src/uqm/battle.c	2009-10-29 22:32:22 UTC (rev 3263)
@@ -99,7 +99,7 @@
 				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 @@
 
 			if (StarShipPtr->hShip)
 			{
-				CyborgDescPtr = StarShipPtr;
-
 				InputState = PlayerInput[cur_player]->handlers->frameInput (
 						PlayerInput[cur_player], StarShipPtr);
 
@@ -192,19 +190,19 @@
 				}
 #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))

Modified: trunk/sc2/src/uqm/cyborg.c
===================================================================
--- trunk/sc2/src/uqm/cyborg.c	2009-10-29 00:40:35 UTC (rev 3262)
+++ trunk/sc2/src/uqm/cyborg.c	2009-10-29 22:32:22 UTC (rev 3263)
@@ -288,8 +288,6 @@
 	return (0);
 }
 
-STARSHIP *CyborgDescPtr;
-
 static void
 InitCyborg (STARSHIP *StarShipPtr)
 {

Modified: trunk/sc2/src/uqm/intel.h
===================================================================
--- trunk/sc2/src/uqm/intel.h	2009-10-29 00:40:35 UTC (rev 3262)
+++ trunk/sc2/src/uqm/intel.h	2009-10-29 22:32:22 UTC (rev 3263)
@@ -44,7 +44,6 @@
 	FIRST_EMPTY_INDEX
 };
 
-extern STARSHIP *CyborgDescPtr;
 extern SIZE cur_player;
 
 extern BATTLE_INPUT_STATE computer_intelligence (

Modified: trunk/sc2/src/uqm/ship.c
===================================================================
--- trunk/sc2/src/uqm/ship.c	2009-10-29 00:40:35 UTC (rev 3262)
+++ trunk/sc2/src/uqm/ship.c	2009-10-29 22:32:22 UTC (rev 3263)
@@ -503,7 +503,6 @@
 	HSTARSHIP hBattleShip;
 
 	cur_player = which_side;
-	CyborgDescPtr = 0;
 
 
 	hBattleShip = GetEncounterStarShip (LastStarShipPtr, which_side);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.