Menu
▾
▴
[Sc2-cvs] SF.net SVN: sc2:[3577] trunk/sc2/src/uqm
|
From: <av...@us...> - 2011-04-20 18:54:33
|
Revision: 3577
http://sc2.svn.sourceforge.net/sc2/?rev=3577&view=rev
Author: avolkov
Date: 2011-04-20 18:54:27 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Removed SOLARSYS_STATE.CurNode; uniform usage of callGenerateForScanType()
Modified Paths:
--------------
trunk/sc2/src/uqm/planets/lander.c
trunk/sc2/src/uqm/planets/planets.h
trunk/sc2/src/uqm/planets/scan.c
trunk/sc2/src/uqm/uqmdebug.c
Modified: trunk/sc2/src/uqm/planets/lander.c
===================================================================
--- trunk/sc2/src/uqm/planets/lander.c 2011-04-20 18:23:17 UTC (rev 3576)
+++ trunk/sc2/src/uqm/planets/lander.c 2011-04-20 18:54:27 UTC (rev 3577)
@@ -718,6 +718,7 @@
{
COUNT scan, NumRetrieved;
SIZE which_node;
+ COUNT allNodes;
scan = LOBYTE (ElementPtr->scan_node);
if (pLanderPrim == 0)
@@ -859,10 +860,10 @@
which_node = HIBYTE (ElementPtr->scan_node) - 1;
pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[scan] |=
(1L << which_node);
- pSolarSysState->CurNode = (COUNT)~0;
+ allNodes = (COUNT)~0;
callGenerateForScanType (pSolarSysState,
pSolarSysState->pOrbitalDesc,
- &pSolarSysState->CurNode, scan);
+ &allNodes, scan);
if (!(pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[scan] &
(1L << which_node)))
Modified: trunk/sc2/src/uqm/planets/planets.h
===================================================================
--- trunk/sc2/src/uqm/planets/planets.h 2011-04-20 18:23:17 UTC (rev 3576)
+++ trunk/sc2/src/uqm/planets/planets.h 2011-04-20 18:54:27 UTC (rev 3577)
@@ -204,7 +204,6 @@
SYSTEM_INFO SysInfo;
- COUNT CurNode;
const GenerateFunctions *genFuncs;
// Functions to call to fill in various parts of this structure.
// See generate.h, doc/devel/generate
Modified: trunk/sc2/src/uqm/planets/scan.c
===================================================================
--- trunk/sc2/src/uqm/planets/scan.c 2011-04-20 18:23:17 UTC (rev 3576)
+++ trunk/sc2/src/uqm/planets/scan.c 2011-04-20 18:54:27 UTC (rev 3577)
@@ -1337,15 +1337,15 @@
f = SetAbsFrameIndex (MiscDataFrame,
NUM_SCANDOT_TRANSITIONS * (scan - ENERGY_SCAN));
- pSolarSysState->CurNode = (COUNT)~0;
+ num_nodes = (COUNT)~0;
callGenerateForScanType (pSolarSysState,
- pSolarSysState->pOrbitalDesc, &pSolarSysState->CurNode, scan);
+ pSolarSysState->pOrbitalDesc, &num_nodes, scan);
- num_nodes = pSolarSysState->CurNode;
while (num_nodes--)
{
HELEMENT hNodeElement;
ELEMENT *NodeElementPtr;
+ COUNT whichNode;
if (isNodeRetrieved (&pSolarSysState->SysInfo.PlanetInfo,
scan, num_nodes))
@@ -1357,9 +1357,9 @@
LockElement (hNodeElement, &NodeElementPtr);
- pSolarSysState->CurNode = num_nodes;
+ whichNode = num_nodes;
callGenerateForScanType (pSolarSysState,
- pSolarSysState->pOrbitalDesc, &pSolarSysState->CurNode,
+ pSolarSysState->pOrbitalDesc, &whichNode,
scan);
NodeElementPtr->scan_node = MAKE_WORD (scan, num_nodes + 1);
Modified: trunk/sc2/src/uqm/uqmdebug.c
===================================================================
--- trunk/sc2/src/uqm/uqmdebug.c 2011-04-20 18:23:17 UTC (rev 3576)
+++ trunk/sc2/src/uqm/uqmdebug.c 2011-04-20 18:54:27 UTC (rev 3577)
@@ -31,6 +31,7 @@
#include "gendef.h"
#include "globdata.h"
#include "planets/lifeform.h"
+#include "planets/scan.h"
#include "races.h"
#include "setup.h"
#include "state.h"
@@ -1054,17 +1055,16 @@
assert (system->pOrbitalDesc == world);
- ((SOLARSYS_STATE *) system)->CurNode = (COUNT)~0;
- (*system->genFuncs->generateLife) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
- numBio = system->CurNode;
+ numBio = (COUNT)~0;
+ callGenerateForScanType ((SOLARSYS_STATE *) system, (PLANET_DESC *) world,
+ &numBio, BIOLOGICAL_SCAN);
result = 0;
for (i = 0; i < numBio; i++)
{
- ((SOLARSYS_STATE *) system)->CurNode = i;
- (*system->genFuncs->generateLife) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
+ COUNT whichNode = i;
+ callGenerateForScanType ((SOLARSYS_STATE *) system,
+ (PLANET_DESC *) world, &whichNode, BIOLOGICAL_SCAN);
result += BIO_CREDIT_VALUE * LONIBBLE (CreatureData[
system->SysInfo.PlanetInfo.CurType].ValueAndHitPoints);
}
@@ -1080,19 +1080,18 @@
assert (system->pOrbitalDesc == world);
- ((SOLARSYS_STATE *) system)->CurNode = (COUNT)~0;
- (*system->genFuncs->generateLife) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
- numBio = system->CurNode;
+ numBio = (COUNT)~0;
+ callGenerateForScanType ((SOLARSYS_STATE *) system, (PLANET_DESC *) world,
+ &numBio, BIOLOGICAL_SCAN);
for (i = 0; i < NUM_CREATURE_TYPES + NUM_SPECIAL_CREATURE_TYPES; i++)
bio[i] = 0;
for (i = 0; i < numBio; i++)
{
- ((SOLARSYS_STATE *) system)->CurNode = i;
- (*system->genFuncs->generateLife) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
+ COUNT whichNode = i;
+ callGenerateForScanType ((SOLARSYS_STATE *) system,
+ (PLANET_DESC *) world, &whichNode, BIOLOGICAL_SCAN);
bio[system->SysInfo.PlanetInfo.CurType]++;
}
}
@@ -1106,17 +1105,16 @@
assert (system->pOrbitalDesc == world);
- ((SOLARSYS_STATE *) system)->CurNode = (COUNT)~0;
- (*system->genFuncs->generateMinerals) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
- numDeposits = system->CurNode;
+ numDeposits = (COUNT)~0;
+ callGenerateForScanType ((SOLARSYS_STATE *) system, (PLANET_DESC *) world,
+ &numDeposits, MINERAL_SCAN);
result = 0;
for (i = 0; i < numDeposits; i++)
{
- ((SOLARSYS_STATE *) system)->CurNode = i;
- (*system->genFuncs->generateMinerals) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
+ COUNT whichNode = i;
+ callGenerateForScanType ((SOLARSYS_STATE *) system,
+ (PLANET_DESC *) world, &whichNode, MINERAL_SCAN);
result += HIBYTE (system->SysInfo.PlanetInfo.CurDensity) *
GLOBAL (ElementWorth[ElementCategory (
system->SysInfo.PlanetInfo.CurType)]);
@@ -1133,19 +1131,18 @@
assert (system->pOrbitalDesc == world);
- ((SOLARSYS_STATE *) system)->CurNode = (COUNT)~0;
- (*system->genFuncs->generateMinerals) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
- numDeposits = system->CurNode;
+ numDeposits = (COUNT)~0;
+ callGenerateForScanType ((SOLARSYS_STATE *) system, (PLANET_DESC *) world,
+ &numDeposits, MINERAL_SCAN);
for (i = 0; i < NUM_ELEMENT_CATEGORIES; i++)
minerals[i] = 0;
for (i = 0; i < numDeposits; i++)
{
- ((SOLARSYS_STATE *) system)->CurNode = i;
- (*system->genFuncs->generateMinerals) ((SOLARSYS_STATE *) system,
- (PLANET_DESC *) world, &((SOLARSYS_STATE *) system)->CurNode);
+ COUNT whichNode = i;
+ callGenerateForScanType ((SOLARSYS_STATE *) system,
+ (PLANET_DESC *) world, &whichNode, MINERAL_SCAN);
minerals[ElementCategory(system->SysInfo.PlanetInfo.CurType)] +=
HIBYTE (system->SysInfo.PlanetInfo.CurDensity);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
