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

Removal of unused DRAW_PLANETS and DRAW_ORBITS flags

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3381 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-12-01 20:52:44 +00:00
parent e90739a1d2
commit d7e628a7c2
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/planets/solarsys.c
+5 -18
View File
@@ -70,19 +70,17 @@ BYTE EncounterGroup;
#define DRAW_STARS (1 << 0) #define DRAW_STARS (1 << 0)
// only ever cleared by DrawSimpleSystem() which is currently disabled // only ever cleared by DrawSimpleSystem() which is currently disabled
#define DRAW_PLANETS (1 << 1) // Unused: #define DRAW_PLANETS (1 << 1)
// only ever cleared by DrawSimpleSystem() which is currently disabled // Unused: #define DRAW_ORBITS (1 << 2)
#define DRAW_ORBITS (1 << 2)
// only ever cleared by DrawSimpleSystem() which is currently disabled
#define DRAW_HYPER_COORDS (1 << 3) #define DRAW_HYPER_COORDS (1 << 3)
// only ever cleared by DrawSimpleSystem() which is currently disabled
#define UNBATCH_SYS (1 << 4) #define UNBATCH_SYS (1 << 4)
#define DRAW_REFRESH (1 << 5) #define DRAW_REFRESH (1 << 5)
// Unused: #define REPAIR_SCAN (1 << 6) // Unused: #define REPAIR_SCAN (1 << 6)
#define GRAB_BKGND (1 << 7) #define GRAB_BKGND (1 << 7)
static SIZE old_radius; static SIZE old_radius;
BYTE draw_sys_flags = DRAW_STARS | DRAW_PLANETS | DRAW_ORBITS BYTE draw_sys_flags = DRAW_STARS | DRAW_HYPER_COORDS | GRAB_BKGND;
| DRAW_HYPER_COORDS | GRAB_BKGND;
bool bool
@@ -637,9 +635,6 @@ DrawOrbit (PLANET_DESC *pPlanetDesc, COUNT xnumer, COUNT ynumer0,
COORD cx, cy; COORD cx, cy;
RECT r; RECT r;
if (!(draw_sys_flags & (DRAW_ORBITS | DRAW_PLANETS)))
return;
cx = pPlanetDesc->radius; cx = pPlanetDesc->radius;
cy = pPlanetDesc->radius; cy = pPlanetDesc->radius;
if (xnumer > (COUNT)DISPLAY_FACTOR) if (xnumer > (COUNT)DISPLAY_FACTOR)
@@ -649,19 +644,13 @@ if (!(draw_sys_flags & (DRAW_ORBITS | DRAW_PLANETS)))
} }
GetOrbitRect (&r, cx, cy, pPlanetDesc->radius, xnumer, ynumer0, denom); GetOrbitRect (&r, cx, cy, pPlanetDesc->radius, xnumer, ynumer0, denom);
if (draw_sys_flags & DRAW_ORBITS)
{
// XXX: ValidateOrbits() sets pBaseDesc=0 // XXX: ValidateOrbits() sets pBaseDesc=0
if (pSolarSysState->pBaseDesc) if (pSolarSysState->pBaseDesc)
{ {
SetContextForeGroundColor (pPlanetDesc->temp_color); SetContextForeGroundColor (pPlanetDesc->temp_color);
DrawOval (&r, 1); DrawOval (&r, 1);
} }
}
if (!(draw_sys_flags & DRAW_PLANETS))
return;
r.corner.x += (r.extent.width >> 1); r.corner.x += (r.extent.width >> 1);
r.corner.y += (r.extent.height >> 1); r.corner.y += (r.extent.height >> 1);
r.corner.x = r.corner.x r.corner.x = r.corner.x
@@ -1580,8 +1569,7 @@ DrawSystem (SIZE radius, BOOLEAN IsInnerSystem)
pCurDesc->image.frame = SetRelFrameIndex (SunFrame, index); pCurDesc->image.frame = SetRelFrameIndex (SunFrame, index);
index = pSolarSysState->FirstPlanetIndex; index = pSolarSysState->FirstPlanetIndex;
if (draw_sys_flags & DRAW_PLANETS)
{
for (;;) for (;;)
{ {
pCurDesc = &pSolarSysState->PlanetDesc[index]; pCurDesc = &pSolarSysState->PlanetDesc[index];
@@ -1605,7 +1593,6 @@ DrawSystem (SIZE radius, BOOLEAN IsInnerSystem)
break; break;
index = pCurDesc->NextIndex; index = pCurDesc->NextIndex;
} }
}
if (!playerInInnerSystem ()) if (!playerInInnerSystem ())
XFormIPLoc (&GLOBAL (ip_location), XFormIPLoc (&GLOBAL (ip_location),