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

Cleanup.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3300 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2009-11-14 17:06:12 +00:00
parent 0eace3420b
commit 9ef52bdc9f
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/planets/solarsys.c
+29 -22
View File
@@ -1571,9 +1571,35 @@ endInterPlanetary (void)
}
}
// Find the closest planet to a point, in interplanetary.
static PLANET_DESC *
closestPlanetInterPlanetary (void) {
closestPlanetInterPlanetary (const POINT *point) {
BYTE i;
BYTE numPlanets;
DWORD bestDistSquared;
PLANET_DESC *bestPlanet = NULL;
assert(pSolarSysState != NULL);
numPlanets = pSolarSysState->SunDesc[0].NumPlanets;
bestDistSquared = (DWORD) -1; // Maximum value of DWORD.
for (i = 0; i < numPlanets; i++)
{
PLANET_DESC *planet = &pSolarSysState->PlanetDesc[i];
SIZE dx = point->x - planet->image.origin.x;
SIZE dy = point->y - planet->image.origin.y;
DWORD distSquared = (DWORD) ((long) dx * dx + (long) dy * dy);
if (distSquared < bestDistSquared)
{
bestDistSquared = distSquared;
bestPlanet = planet;
}
}
return bestPlanet;
}
static void
@@ -1597,27 +1623,8 @@ UninitSolarSys (void)
if (GLOBAL (ip_planet) == 0)
{
BYTE i;
DWORD best_dist;
PLANET_DESC *pCurDesc;
best_dist = ~0L;
for (i = 0, pCurDesc = pSolarSysState->PlanetDesc;
i < pSolarSysState->SunDesc[0].NumPlanets;
++i, ++pCurDesc)
{
SIZE dx, dy;
DWORD dist;
dx = GLOBAL (ShipStamp.origin.x) - pCurDesc->image.origin.x;
dy = GLOBAL (ShipStamp.origin.y) - pCurDesc->image.origin.y;
dist = (DWORD) ((long) dx * dx + (long) dy * dy);
if (dist < best_dist)
{
best_dist = dist;
pSolarSysState->pBaseDesc = pCurDesc;
}
}
pSolarSysState->pBaseDesc =
closestPlanetInterPlanetary (&GLOBAL (ShipStamp.origin));
(*pSolarSysState->GenFunc) (GENERATE_NAME);
}