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

Cleanups.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1833 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-07-08 22:29:08 +00:00
parent e3998ad530
commit db2ec77dcf
1 changed files with 221 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/scan.c
+59 -81
View File
@@ -132,7 +132,8 @@ PrintCoarseScanPC (void)
if (CurStarDescPtr->Index == SOL_DEFINED)
{
if (pSolarSysState->pOrbitalDesc->pPrevDesc == &pSolarSysState->SunDesc[0])
if (pSolarSysState->pOrbitalDesc->pPrevDesc ==
&pSolarSysState->SunDesc[0])
wstrcpy (buf, GLOBAL_SIS (PlanetName));
else
{
@@ -880,8 +881,7 @@ DrawScannedStuff (COUNT y, BYTE CurState)
OldColor = SetContextForeGroundColor (0);
for (hElement = GetHeadElement ();
hElement; hElement = hNextElement)
for (hElement = GetHeadElement (); hElement; hElement = hNextElement)
{
ELEMENTPTR ElementPtr;
//COLOR OldColor;
@@ -1041,10 +1041,14 @@ DoScan (PMENU_STATE pMS)
#ifndef SPIN_ON_SCAN
pSolarSysState->PauseRotate = 1;
#endif
if ((min_scan = pMS->CurState) != AUTO_SCAN)
min_scan = pMS->CurState;
if (min_scan != AUTO_SCAN)
max_scan = min_scan;
else
min_scan = MINERAL_SCAN, max_scan = BIOLOGICAL_SCAN;
{
min_scan = MINERAL_SCAN;
max_scan = BIOLOGICAL_SCAN;
}
do
{
@@ -1057,9 +1061,7 @@ DoScan (PMENU_STATE pMS)
t.CharCount = (COUNT)~0;
pSolarSysState->CurNode = (COUNT)~0;
(*pSolarSysState->GenFunc) (
(BYTE)(min_scan + GENERATE_MINERAL)
);
(*pSolarSysState->GenFunc) ((BYTE)(min_scan + GENERATE_MINERAL));
pMS->delta_item = (SIZE)pSolarSysState->CurNode;
t.pStr = GAME_STRING (SCAN_STRING_BASE + min_scan);
@@ -1076,18 +1078,15 @@ DoScan (PMENU_STATE pMS)
{
case MINERAL_SCAN:
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C)
);
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C));
break;
case ENERGY_SCAN:
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xC, 0xC, 0xC), 0x1C)
);
BUILD_COLOR (MAKE_RGB15 (0xC, 0xC, 0xC), 0x1C));
break;
case BIOLOGICAL_SCAN:
SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C)
);
BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C));
break;
}
font_DrawText (&t);
@@ -1101,13 +1100,13 @@ DoScan (PMENU_STATE pMS)
switch (min_scan)
{
case MINERAL_SCAN:
rgb = 0x1f << 10;
rgb = MAKE_RGB15 (0x1f, 0x00, 0x00);
break;
case ENERGY_SCAN:
rgb = (0x1f << 10) | (0x1f << 5) | 0x1f;
rgb = MAKE_RGB15 (0x1f, 0x1f, 0x1f);
break;
case BIOLOGICAL_SCAN:
rgb = 0x1f << 5;
rgb = MAKE_RGB15 (0x00, 0x1f, 0x00);
break;
}
@@ -1156,7 +1155,8 @@ DoScan (PMENU_STATE pMS)
r.corner.x = 0;
r.corner.y = (SIS_SCREEN_HEIGHT - MAP_HEIGHT - 7) - 10;
r.extent.width = SIS_SCREEN_WIDTH;
r.extent.height = (SIS_SCREEN_HEIGHT - MAP_HEIGHT - 7) - r.corner.y + 1;
r.extent.height = (SIS_SCREEN_HEIGHT - MAP_HEIGHT - 7)
- r.corner.y + 1;
RepairBackRect (&r);
SetContext (ScanContext);
@@ -1166,7 +1166,8 @@ DoScan (PMENU_STATE pMS)
DrawScannedObjects (FALSE);
UnlockMutex (GraphicsLock);
DrawMenuStateStrings (PM_MIN_SCAN, pMS->CurState = DISPATCH_SHUTTLE);
pMS->CurState = DISPATCH_SHUTTLE;
DrawMenuStateStrings (PM_MIN_SCAN, pMS->CurState);
}
else
UnlockMutex (GraphicsLock);
@@ -1220,8 +1221,10 @@ ScanSystem (void)
else
{
MenuState.CurState = AUTO_SCAN;
pSolarSysState->MenuState.first_item.x = (MAP_WIDTH >> 1) << MAG_SHIFT;
pSolarSysState->MenuState.first_item.y = (MAP_HEIGHT >> 1) << MAG_SHIFT;
pSolarSysState->MenuState.first_item.x =
(MAP_WIDTH >> 1) << MAG_SHIFT;
pSolarSysState->MenuState.first_item.y =
(MAP_HEIGHT >> 1) << MAG_SHIFT;
LockMutex (GraphicsLock);
ScanContext = CaptureContext (CreateContext ());
@@ -1230,8 +1233,7 @@ ScanSystem (void)
MenuState.flash_rect0.extent.height = FLASH_HEIGHT;
MenuState.flash_frame0 = CaptureDrawable (
CreateDrawable (WANT_PIXMAP | MAPPED_TO_DISPLAY,
FLASH_WIDTH, FLASH_HEIGHT, 1)
);
FLASH_WIDTH, FLASH_HEIGHT, 1));
SetContextFGFrame (Screen);
r.corner.x = (SIS_ORG_X + SIS_SCREEN_WIDTH) - MAP_WIDTH;
r.corner.y = (SIS_ORG_Y + SIS_SCREEN_HEIGHT) - MAP_HEIGHT;
@@ -1281,34 +1283,30 @@ GeneratePlanetSide (void)
COUNT num_nodes;
FRAME f;
f = SetAbsFrameIndex (
misc_data,
NUM_SCANDOT_TRANSITIONS * (scan - ENERGY_SCAN)
);
f = SetAbsFrameIndex (misc_data,
NUM_SCANDOT_TRANSITIONS * (scan - ENERGY_SCAN));
pSolarSysState->CurNode = (COUNT)~0;
(*pSolarSysState->GenFunc) (
(BYTE)(scan + GENERATE_MINERAL)
);
(*pSolarSysState->GenFunc) ((BYTE)(scan + GENERATE_MINERAL));
num_nodes = pSolarSysState->CurNode;
if (num_nodes)
{
while (num_nodes--)
{
HELEMENT hNodeElement;
if (!(pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[scan]
& (1L << num_nodes))
&& (hNodeElement = AllocElement ()))
{
ELEMENTPTR NodeElementPtr;
if (pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[scan]
& (1L << num_nodes))
continue;
hNodeElement = AllocElement ();
if (!hNodeElement)
continue;
LockElement (hNodeElement, &NodeElementPtr);
pSolarSysState->CurNode = num_nodes;
(*pSolarSysState->GenFunc) (
(BYTE)(scan + GENERATE_MINERAL)
);
(*pSolarSysState->GenFunc) ((BYTE)(scan + GENERATE_MINERAL));
NodeElementPtr->life_span = MAKE_WORD (scan, num_nodes + 1);
NodeElementPtr->state_flags = BAD_GUY;
@@ -1324,40 +1322,24 @@ GeneratePlanetSide (void)
EType = pSolarSysState->SysInfo.PlanetInfo.CurType;
NodeElementPtr->turn_wait = (BYTE)EType;
NodeElementPtr->mass_points =
HIBYTE (
pSolarSysState->SysInfo.PlanetInfo.CurDensity
);
NodeElementPtr->current.image.frame =
SetAbsFrameIndex (
misc_data,
(NUM_SCANDOT_TRANSITIONS << 1)
+ ElementCategory (EType) * 5
);
NodeElementPtr->next.image.frame =
SetRelFrameIndex (
NodeElementPtr->current.image.frame,
LOBYTE (
pSolarSysState->SysInfo.PlanetInfo.CurDensity
) + 1
);
NodeElementPtr->mass_points = HIBYTE (
pSolarSysState->SysInfo.PlanetInfo.CurDensity);
NodeElementPtr->current.image.frame = SetAbsFrameIndex (
misc_data, (NUM_SCANDOT_TRANSITIONS << 1)
+ ElementCategory (EType) * 5);
NodeElementPtr->next.image.frame = SetRelFrameIndex (
NodeElementPtr->current.image.frame, LOBYTE (
pSolarSysState->SysInfo.PlanetInfo.CurDensity) + 1);
DisplayArray[NodeElementPtr->PrimIndex].Object.Stamp.frame =
IncFrameIndex (
NodeElementPtr->next.image.frame
);
IncFrameIndex (NodeElementPtr->next.image.frame);
}
else
{
extern void
object_animation
(PELEMENT
ElementPtr);
extern void object_animation (PELEMENT ElementPtr);
NodeElementPtr->current.image.frame = f;
NodeElementPtr->next.image.frame =
SetRelFrameIndex (
f, NUM_SCANDOT_TRANSITIONS - 1
);
NodeElementPtr->next.image.frame = SetRelFrameIndex (
f, NUM_SCANDOT_TRANSITIONS - 1);
NodeElementPtr->turn_wait = MAKE_BYTE (4, 4);
NodeElementPtr->preprocess_func = object_animation;
if (scan == ENERGY_SCAN)
@@ -1389,14 +1371,14 @@ GeneratePlanetSide (void)
if (pSolarSysState->PlanetSideFrame[0] == 0)
pSolarSysState->PlanetSideFrame[0] =
CaptureDrawable (LoadGraphic (
CANNISTER_MASK_PMAP_ANIM
));
CANNISTER_MASK_PMAP_ANIM));
for (i = 0; i < MAX_LIFE_VARIATION
&& life_init_tab[i] != (BYTE)(which_node + 1);
++i)
{
if (life_init_tab[i] == 0)
{
if (life_init_tab[i] != 0)
continue;
life_init_tab[i] = (BYTE)which_node + 1;
pSolarSysState->PlanetSideFrame[i + 3] =
@@ -1409,17 +1391,14 @@ GeneratePlanetSide (void)
break;
}
}
NodeElementPtr->mass_points = (BYTE)which_node;
NodeElementPtr->hit_points = HINIBBLE (
CreatureData[which_node].ValueAndHitPoints
);
DisplayArray[NodeElementPtr->PrimIndex].Object.Stamp.frame =
SetAbsFrameIndex (
CreatureData[which_node].ValueAndHitPoints);
DisplayArray[NodeElementPtr->PrimIndex].
Object.Stamp.frame = SetAbsFrameIndex (
pSolarSysState->PlanetSideFrame[i + 3],
(COUNT)TFB_Random ()
);
(COUNT)TFB_Random ());
}
}
@@ -1433,6 +1412,5 @@ GeneratePlanetSide (void)
}
}
}
}
}