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 (CurStarDescPtr->Index == SOL_DEFINED)
{ {
if (pSolarSysState->pOrbitalDesc->pPrevDesc == &pSolarSysState->SunDesc[0]) if (pSolarSysState->pOrbitalDesc->pPrevDesc ==
&pSolarSysState->SunDesc[0])
wstrcpy (buf, GLOBAL_SIS (PlanetName)); wstrcpy (buf, GLOBAL_SIS (PlanetName));
else else
{ {
@@ -880,8 +881,7 @@ DrawScannedStuff (COUNT y, BYTE CurState)
OldColor = SetContextForeGroundColor (0); OldColor = SetContextForeGroundColor (0);
for (hElement = GetHeadElement (); for (hElement = GetHeadElement (); hElement; hElement = hNextElement)
hElement; hElement = hNextElement)
{ {
ELEMENTPTR ElementPtr; ELEMENTPTR ElementPtr;
//COLOR OldColor; //COLOR OldColor;
@@ -1041,10 +1041,14 @@ DoScan (PMENU_STATE pMS)
#ifndef SPIN_ON_SCAN #ifndef SPIN_ON_SCAN
pSolarSysState->PauseRotate = 1; pSolarSysState->PauseRotate = 1;
#endif #endif
if ((min_scan = pMS->CurState) != AUTO_SCAN) min_scan = pMS->CurState;
if (min_scan != AUTO_SCAN)
max_scan = min_scan; max_scan = min_scan;
else else
min_scan = MINERAL_SCAN, max_scan = BIOLOGICAL_SCAN; {
min_scan = MINERAL_SCAN;
max_scan = BIOLOGICAL_SCAN;
}
do do
{ {
@@ -1057,9 +1061,7 @@ DoScan (PMENU_STATE pMS)
t.CharCount = (COUNT)~0; t.CharCount = (COUNT)~0;
pSolarSysState->CurNode = (COUNT)~0; pSolarSysState->CurNode = (COUNT)~0;
(*pSolarSysState->GenFunc) ( (*pSolarSysState->GenFunc) ((BYTE)(min_scan + GENERATE_MINERAL));
(BYTE)(min_scan + GENERATE_MINERAL)
);
pMS->delta_item = (SIZE)pSolarSysState->CurNode; pMS->delta_item = (SIZE)pSolarSysState->CurNode;
t.pStr = GAME_STRING (SCAN_STRING_BASE + min_scan); t.pStr = GAME_STRING (SCAN_STRING_BASE + min_scan);
@@ -1076,18 +1078,15 @@ DoScan (PMENU_STATE pMS)
{ {
case MINERAL_SCAN: case MINERAL_SCAN:
SetContextForeGroundColor ( SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C) BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2C));
);
break; break;
case ENERGY_SCAN: case ENERGY_SCAN:
SetContextForeGroundColor ( SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0xC, 0xC, 0xC), 0x1C) BUILD_COLOR (MAKE_RGB15 (0xC, 0xC, 0xC), 0x1C));
);
break; break;
case BIOLOGICAL_SCAN: case BIOLOGICAL_SCAN:
SetContextForeGroundColor ( SetContextForeGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C) BUILD_COLOR (MAKE_RGB15 (0x00, 0xE, 0x00), 0x6C));
);
break; break;
} }
font_DrawText (&t); font_DrawText (&t);
@@ -1101,13 +1100,13 @@ DoScan (PMENU_STATE pMS)
switch (min_scan) switch (min_scan)
{ {
case MINERAL_SCAN: case MINERAL_SCAN:
rgb = 0x1f << 10; rgb = MAKE_RGB15 (0x1f, 0x00, 0x00);
break; break;
case ENERGY_SCAN: case ENERGY_SCAN:
rgb = (0x1f << 10) | (0x1f << 5) | 0x1f; rgb = MAKE_RGB15 (0x1f, 0x1f, 0x1f);
break; break;
case BIOLOGICAL_SCAN: case BIOLOGICAL_SCAN:
rgb = 0x1f << 5; rgb = MAKE_RGB15 (0x00, 0x1f, 0x00);
break; break;
} }
@@ -1156,7 +1155,8 @@ DoScan (PMENU_STATE pMS)
r.corner.x = 0; r.corner.x = 0;
r.corner.y = (SIS_SCREEN_HEIGHT - MAP_HEIGHT - 7) - 10; r.corner.y = (SIS_SCREEN_HEIGHT - MAP_HEIGHT - 7) - 10;
r.extent.width = SIS_SCREEN_WIDTH; 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); RepairBackRect (&r);
SetContext (ScanContext); SetContext (ScanContext);
@@ -1166,7 +1166,8 @@ DoScan (PMENU_STATE pMS)
DrawScannedObjects (FALSE); DrawScannedObjects (FALSE);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
DrawMenuStateStrings (PM_MIN_SCAN, pMS->CurState = DISPATCH_SHUTTLE); pMS->CurState = DISPATCH_SHUTTLE;
DrawMenuStateStrings (PM_MIN_SCAN, pMS->CurState);
} }
else else
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
@@ -1220,8 +1221,10 @@ ScanSystem (void)
else else
{ {
MenuState.CurState = AUTO_SCAN; MenuState.CurState = AUTO_SCAN;
pSolarSysState->MenuState.first_item.x = (MAP_WIDTH >> 1) << MAG_SHIFT; pSolarSysState->MenuState.first_item.x =
pSolarSysState->MenuState.first_item.y = (MAP_HEIGHT >> 1) << MAG_SHIFT; (MAP_WIDTH >> 1) << MAG_SHIFT;
pSolarSysState->MenuState.first_item.y =
(MAP_HEIGHT >> 1) << MAG_SHIFT;
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
ScanContext = CaptureContext (CreateContext ()); ScanContext = CaptureContext (CreateContext ());
@@ -1230,8 +1233,7 @@ ScanSystem (void)
MenuState.flash_rect0.extent.height = FLASH_HEIGHT; MenuState.flash_rect0.extent.height = FLASH_HEIGHT;
MenuState.flash_frame0 = CaptureDrawable ( MenuState.flash_frame0 = CaptureDrawable (
CreateDrawable (WANT_PIXMAP | MAPPED_TO_DISPLAY, CreateDrawable (WANT_PIXMAP | MAPPED_TO_DISPLAY,
FLASH_WIDTH, FLASH_HEIGHT, 1) FLASH_WIDTH, FLASH_HEIGHT, 1));
);
SetContextFGFrame (Screen); SetContextFGFrame (Screen);
r.corner.x = (SIS_ORG_X + SIS_SCREEN_WIDTH) - MAP_WIDTH; r.corner.x = (SIS_ORG_X + SIS_SCREEN_WIDTH) - MAP_WIDTH;
r.corner.y = (SIS_ORG_Y + SIS_SCREEN_HEIGHT) - MAP_HEIGHT; r.corner.y = (SIS_ORG_Y + SIS_SCREEN_HEIGHT) - MAP_HEIGHT;
@@ -1281,34 +1283,30 @@ GeneratePlanetSide (void)
COUNT num_nodes; COUNT num_nodes;
FRAME f; FRAME f;
f = SetAbsFrameIndex ( f = SetAbsFrameIndex (misc_data,
misc_data, NUM_SCANDOT_TRANSITIONS * (scan - ENERGY_SCAN));
NUM_SCANDOT_TRANSITIONS * (scan - ENERGY_SCAN)
);
pSolarSysState->CurNode = (COUNT)~0; pSolarSysState->CurNode = (COUNT)~0;
(*pSolarSysState->GenFunc) ( (*pSolarSysState->GenFunc) ((BYTE)(scan + GENERATE_MINERAL));
(BYTE)(scan + GENERATE_MINERAL)
);
num_nodes = pSolarSysState->CurNode; num_nodes = pSolarSysState->CurNode;
if (num_nodes)
{
while (num_nodes--) while (num_nodes--)
{ {
HELEMENT hNodeElement; HELEMENT hNodeElement;
if (!(pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[scan]
& (1L << num_nodes))
&& (hNodeElement = AllocElement ()))
{
ELEMENTPTR NodeElementPtr; ELEMENTPTR NodeElementPtr;
if (pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[scan]
& (1L << num_nodes))
continue;
hNodeElement = AllocElement ();
if (!hNodeElement)
continue;
LockElement (hNodeElement, &NodeElementPtr); LockElement (hNodeElement, &NodeElementPtr);
pSolarSysState->CurNode = num_nodes; pSolarSysState->CurNode = num_nodes;
(*pSolarSysState->GenFunc) ( (*pSolarSysState->GenFunc) ((BYTE)(scan + GENERATE_MINERAL));
(BYTE)(scan + GENERATE_MINERAL)
);
NodeElementPtr->life_span = MAKE_WORD (scan, num_nodes + 1); NodeElementPtr->life_span = MAKE_WORD (scan, num_nodes + 1);
NodeElementPtr->state_flags = BAD_GUY; NodeElementPtr->state_flags = BAD_GUY;
@@ -1324,40 +1322,24 @@ GeneratePlanetSide (void)
EType = pSolarSysState->SysInfo.PlanetInfo.CurType; EType = pSolarSysState->SysInfo.PlanetInfo.CurType;
NodeElementPtr->turn_wait = (BYTE)EType; NodeElementPtr->turn_wait = (BYTE)EType;
NodeElementPtr->mass_points = NodeElementPtr->mass_points = HIBYTE (
HIBYTE ( pSolarSysState->SysInfo.PlanetInfo.CurDensity);
pSolarSysState->SysInfo.PlanetInfo.CurDensity NodeElementPtr->current.image.frame = SetAbsFrameIndex (
); misc_data, (NUM_SCANDOT_TRANSITIONS << 1)
NodeElementPtr->current.image.frame = + ElementCategory (EType) * 5);
SetAbsFrameIndex ( NodeElementPtr->next.image.frame = SetRelFrameIndex (
misc_data, NodeElementPtr->current.image.frame, LOBYTE (
(NUM_SCANDOT_TRANSITIONS << 1) pSolarSysState->SysInfo.PlanetInfo.CurDensity) + 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 = DisplayArray[NodeElementPtr->PrimIndex].Object.Stamp.frame =
IncFrameIndex ( IncFrameIndex (NodeElementPtr->next.image.frame);
NodeElementPtr->next.image.frame
);
} }
else else
{ {
extern void extern void object_animation (PELEMENT ElementPtr);
object_animation
(PELEMENT
ElementPtr);
NodeElementPtr->current.image.frame = f; NodeElementPtr->current.image.frame = f;
NodeElementPtr->next.image.frame = NodeElementPtr->next.image.frame = SetRelFrameIndex (
SetRelFrameIndex ( f, NUM_SCANDOT_TRANSITIONS - 1);
f, NUM_SCANDOT_TRANSITIONS - 1
);
NodeElementPtr->turn_wait = MAKE_BYTE (4, 4); NodeElementPtr->turn_wait = MAKE_BYTE (4, 4);
NodeElementPtr->preprocess_func = object_animation; NodeElementPtr->preprocess_func = object_animation;
if (scan == ENERGY_SCAN) if (scan == ENERGY_SCAN)
@@ -1389,14 +1371,14 @@ GeneratePlanetSide (void)
if (pSolarSysState->PlanetSideFrame[0] == 0) if (pSolarSysState->PlanetSideFrame[0] == 0)
pSolarSysState->PlanetSideFrame[0] = pSolarSysState->PlanetSideFrame[0] =
CaptureDrawable (LoadGraphic ( CaptureDrawable (LoadGraphic (
CANNISTER_MASK_PMAP_ANIM CANNISTER_MASK_PMAP_ANIM));
));
for (i = 0; i < MAX_LIFE_VARIATION for (i = 0; i < MAX_LIFE_VARIATION
&& life_init_tab[i] != (BYTE)(which_node + 1); && life_init_tab[i] != (BYTE)(which_node + 1);
++i) ++i)
{ {
if (life_init_tab[i] == 0) if (life_init_tab[i] != 0)
{ continue;
life_init_tab[i] = (BYTE)which_node + 1; life_init_tab[i] = (BYTE)which_node + 1;
pSolarSysState->PlanetSideFrame[i + 3] = pSolarSysState->PlanetSideFrame[i + 3] =
@@ -1409,17 +1391,14 @@ GeneratePlanetSide (void)
break; break;
} }
}
NodeElementPtr->mass_points = (BYTE)which_node; NodeElementPtr->mass_points = (BYTE)which_node;
NodeElementPtr->hit_points = HINIBBLE ( NodeElementPtr->hit_points = HINIBBLE (
CreatureData[which_node].ValueAndHitPoints CreatureData[which_node].ValueAndHitPoints);
); DisplayArray[NodeElementPtr->PrimIndex].
DisplayArray[NodeElementPtr->PrimIndex].Object.Stamp.frame = Object.Stamp.frame = SetAbsFrameIndex (
SetAbsFrameIndex (
pSolarSysState->PlanetSideFrame[i + 3], pSolarSysState->PlanetSideFrame[i + 3],
(COUNT)TFB_Random () (COUNT)TFB_Random ());
);
} }
} }
@@ -1433,6 +1412,5 @@ GeneratePlanetSide (void)
} }
} }
} }
}
}