Change power accruing rate, with N droids or structures wanting to use power, from 5*FPS/(N+1) to 25/second.

Previous code was insane, despite some previous attempts at improving the indentation of the code, and meant that players with better graphics cards could build, produce and research 5x-10x faster.

Changelog: Construction, production and research speeds are no longer linearly dependent on framerate on high oil maps.

Author: Cyp

lib/gamelib/gtime.h

@@ -29,7 +29,7 @@
 
 /** The maximum time for one frame (stops the clock running away when debugging)
  * changed to /6 by ajl. if this needs to go back to ticks/10 then tell me. */
-#define GTIME_MAXFRAME (GAME_TICKS_PER_SEC/6)
+#define GTIME_MAXFRAME (GAME_TICKS_PER_SEC/4)
 
 /** The current time in the game world. */
 extern UDWORD gameTime;

src/droid.c

@@ -384,9 +384,6 @@ void	removeDroidBase(DROID *psDel)
 
 	CHECK_DROID(psDel);
 
-	//tell the power system its gone
-	powerDestroyObject((BASE_OBJECT *)psDel);
-
 	if (isDead((BASE_OBJECT *)psDel))
 	{
 		// droid has already been killed, quit
@@ -571,9 +568,6 @@ BOOL droidRemove(DROID *psDroid, DROID *pList[MAX_PLAYERS])
 
 	driveDroidKilled(psDroid);	// Tell the driver system it's gone.
 
-	//tell the power system its gone
-	powerDestroyObject((BASE_OBJECT *)psDroid);
-
 	if (isDead((BASE_OBJECT *) psDroid))
 	{
 		// droid has already been killed, quit
@@ -605,9 +599,6 @@ BOOL droidRemove(DROID *psDroid, DROID *pList[MAX_PLAYERS])
 
 	removeDroid(psDroid, pList);
 
-	// tell the power system it is gone
-	powerDestroyObject((BASE_OBJECT *)psDroid);
-
 	if (psDroid->player == selectedPlayer)
 	{
 		intRefreshScreen();
@@ -818,18 +809,7 @@ void droidUpdate(DROID *psDroid)
 	// May need power
 	if (droidUsesPower(psDroid))
 	{
-		if (checkPower(psDroid->player, POWER_PER_CYCLE))
-		{
-			// Check if this droid is due some power
-			if (getLastPowered((BASE_OBJECT *)psDroid))
-			{
-				// Get some power if necessary
-				if (accruePower((BASE_OBJECT *)psDroid))
-				{
-					updateLastPowered((BASE_OBJECT *)psDroid, psDroid->player);
-				}
-			}
-		}
+		accruePower((BASE_OBJECT *)psDroid);
 	}
 
 	// ai update droid

src/loop.c

@@ -282,9 +282,6 @@ GAMECODE gameLoop(void)
 				//update the current power available for a player
 				updatePlayerPower(i);
 
-				//this is a check cos there is a problem with the power but not sure where!!
-				powerCheck(true, (UBYTE)i);
-
 				//set the flag for each player
 				setHQExists(false, i);
 				setSatUplinkExists(false, i);
@@ -435,8 +432,6 @@ GAMECODE gameLoop(void)
 						setLasSatExists(true, i);
 					}
 				}
-				//this is a check cos there is a problem with the power but not sure where!!
-				powerCheck(false, (UBYTE)i);
 			}
 
 			missionTimerUpdate();

src/mission.c

@@ -900,8 +900,6 @@ void restoreMissionData(void)
 		apsFlagPosLists[inc] = mission.apsFlagPosLists[inc];
 		mission.apsFlagPosLists[inc] = NULL;
 		//asPower[inc].usedPower = mission.usedPower[inc];
-		//init the next structure to be powered
-		asPower[inc].psLastPowered = NULL;
 	}
 	apsSensorList[0] = mission.apsSensorList[0];
 	mission.apsSensorList[0] = NULL;
@@ -1685,19 +1683,8 @@ void aiUpdateMissionStructure(STRUCTURE *psStructure)
 	}
 
 	//check if any power available
-	if ((asPower[psStructure->player].currentPower > POWER_PER_CYCLE) ||
-		(!powerCalculated))
-	{
-		//check if this structure is due some power
-		if (getLastPowered((BASE_OBJECT *)psStructure))
-		{
-			//get some power if necessary
-			if (accruePower((BASE_OBJECT *)psStructure))
-			{
-				updateLastPowered((BASE_OBJECT *)psStructure, psStructure->player);
-			}
-		}
-	}
+	//check if this structure is due some power
+	accruePower((BASE_OBJECT *)psStructure);
 	//determine the Subject
 	switch (psStructure->pStructureType->type)
 	{