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

Cleaning up some commonly used FRAMEs

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2039 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-12-07 17:03:11 +00:00
parent 687b83dd5f
commit 8a4a8c484e
14 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/cleanup.c
+1 -3
View File
@@ -76,14 +76,12 @@ UninitContexts (void)
static void static void
UninitKernel (BOOLEAN ships) UninitKernel (BOOLEAN ships)
{ {
extern FRAME status;
UninitSpace (); UninitSpace ();
DestroySound (ReleaseSound (MenuSounds)); DestroySound (ReleaseSound (MenuSounds));
DestroyFont (ReleaseFont (MicroFont)); DestroyFont (ReleaseFont (MicroFont));
DestroyStringTable (ReleaseStringTable (GameStrings)); DestroyStringTable (ReleaseStringTable (GameStrings));
DestroyDrawable (ReleaseDrawable (status)); DestroyDrawable (ReleaseDrawable (StatusFrame));
DestroyDrawable (ReleaseDrawable (ActivityFrame)); DestroyDrawable (ReleaseDrawable (ActivityFrame));
DestroyFont (ReleaseFont (TinyFont)); DestroyFont (ReleaseFont (TinyFont));
DestroyFont (ReleaseFont (StarConFont)); DestroyFont (ReleaseFont (StarConFont));
sc2/src/sc2code/gameopt.c
+2 -5
View File
@@ -633,7 +633,6 @@ DrawCargo (COUNT redraw_state)
{ {
BYTE i; BYTE i;
RECT r; RECT r;
extern FRAME misc_data;
SetContext (SpaceContext); SetContext (SpaceContext);
if (redraw_state) if (redraw_state)
@@ -683,7 +682,7 @@ DrawCargo (COUNT redraw_state)
} }
s.frame = SetAbsFrameIndex ( s.frame = SetAbsFrameIndex (
misc_data, MiscDataFrame,
(NUM_SCANDOT_TRANSITIONS << 1) + 3 (NUM_SCANDOT_TRANSITIONS << 1) + 3
); );
if (redraw_state == 2 if (redraw_state == 2
@@ -841,10 +840,8 @@ ShowSummary (SUMMARY_DESC *pSD)
} }
else else
{ {
extern FRAME misc_data;
s.frame = SetAbsFrameIndex ( s.frame = SetAbsFrameIndex (
misc_data, 77 + pSD->DeviceList[(i << 2) + j] MiscDataFrame, 77 + pSD->DeviceList[(i << 2) + j]
); );
DrawStamp (&s); DrawStamp (&s);
} }
sc2/src/sc2code/globdata.c
+9 -10
View File
@@ -40,7 +40,6 @@ FRAME PlayFrame;
GLOBDATA GlobData; GLOBDATA GlobData;
extern FRAME flagship_status, misc_data;
BOOLEAN initedSIS = 0; BOOLEAN initedSIS = 0;
@@ -102,20 +101,20 @@ CreateRadar (void)
BOOLEAN BOOLEAN
LoadSC2Data (void) LoadSC2Data (void)
{ {
if (flagship_status == 0) if (FlagStatFrame == 0)
{ {
MEM_HANDLE hOldIndex; MEM_HANDLE hOldIndex;
hOldIndex = SetResourceIndex (hResIndex); hOldIndex = SetResourceIndex (hResIndex);
flagship_status = CaptureDrawable ( FlagStatFrame = CaptureDrawable (
LoadGraphic (FLAGSTAT_MASK_PMAP_ANIM)); LoadGraphic (FLAGSTAT_MASK_PMAP_ANIM));
if (flagship_status == NULL) if (FlagStatFrame == NULL)
return FALSE; return FALSE;
misc_data = CaptureDrawable ( MiscDataFrame = CaptureDrawable (
LoadGraphic (MISCDATA_MASK_PMAP_ANIM)); LoadGraphic (MISCDATA_MASK_PMAP_ANIM));
if (misc_data == NULL) if (MiscDataFrame == NULL)
return FALSE; return FALSE;
SetResourceIndex (hOldIndex); SetResourceIndex (hOldIndex);
@@ -312,10 +311,10 @@ FreeSC2Data (void)
{ {
DestroyContext (ReleaseContext (RadarContext)); DestroyContext (ReleaseContext (RadarContext));
RadarContext = 0; RadarContext = 0;
DestroyDrawable (ReleaseDrawable (misc_data)); DestroyDrawable (ReleaseDrawable (MiscDataFrame));
misc_data = 0; MiscDataFrame = 0;
DestroyDrawable (ReleaseDrawable (flagship_status)); DestroyDrawable (ReleaseDrawable (FlagStatFrame));
flagship_status = 0; FlagStatFrame = 0;
} }
void void
sc2/src/sc2code/pickmele.c
+1 -3
View File
@@ -237,8 +237,6 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player)
StarShipPtr = LockStarShip (&race_q[which_player], hBattleShip); StarShipPtr = LockStarShip (&race_q[which_player], hBattleShip);
if (StarShipPtr == LastStarShipPtr) if (StarShipPtr == LastStarShipPtr)
{ {
extern FRAME status;
LastStarShipPtr->RaceResIndex = 0; LastStarShipPtr->RaceResIndex = 0;
gmstate.col = LastStarShipPtr->ShipFacing; gmstate.col = LastStarShipPtr->ShipFacing;
@@ -246,7 +244,7 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player)
+ ((ICON_WIDTH + 2) * (gmstate.col % NUM_MELEE_COLS_ORIG)); + ((ICON_WIDTH + 2) * (gmstate.col % NUM_MELEE_COLS_ORIG));
s.origin.y = 9 s.origin.y = 9
+ ((ICON_HEIGHT + 2) * (gmstate.col / NUM_MELEE_COLS_ORIG)); + ((ICON_HEIGHT + 2) * (gmstate.col / NUM_MELEE_COLS_ORIG));
s.frame = SetAbsFrameIndex (status, 3); s.frame = SetAbsFrameIndex (StatusFrame, 3);
DrawStamp (&s); DrawStamp (&s);
s.frame = SetAbsFrameIndex (PickMeleeFrame, which_player); s.frame = SetAbsFrameIndex (PickMeleeFrame, which_player);
} }
sc2/src/sc2code/pickship.c
+1 -3
View File
@@ -507,11 +507,9 @@ SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x12, 0x12, 0x12), 0x17));
DrawStamp (&s); DrawStamp (&s);
if (StarShipPtr->RaceResIndex == 0) if (StarShipPtr->RaceResIndex == 0)
{ {
extern FRAME status;
/* Dead ship - mark with an X. */ /* Dead ship - mark with an X. */
s.origin.x -= 1; s.origin.x -= 1;
s.frame = SetAbsFrameIndex (status, 3); s.frame = SetAbsFrameIndex (StatusFrame, 3);
DrawStamp (&s); DrawStamp (&s);
} }
} }
sc2/src/sc2code/planets/cargo.c
+1 -2
View File
@@ -84,7 +84,6 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
if (OldElement > NUM_ELEMENT_CATEGORIES) if (OldElement > NUM_ELEMENT_CATEGORIES)
{ {
STAMP s; STAMP s;
extern FRAME misc_data;
r.corner.x = 2; r.corner.x = 2;
r.extent.width = FIELD_WIDTH + 1; r.extent.width = FIELD_WIDTH + 1;
@@ -118,7 +117,7 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement)
s.origin.x = r.corner.x + (r.extent.width >> 1); s.origin.x = r.corner.x + (r.extent.width >> 1);
s.frame = SetAbsFrameIndex ( s.frame = SetAbsFrameIndex (
misc_data, MiscDataFrame,
(NUM_SCANDOT_TRANSITIONS << 1) + 3 (NUM_SCANDOT_TRANSITIONS << 1) + 3
); );
cy = y; cy = y;
sc2/src/sc2code/planets/devices.c
+1 -2
View File
@@ -70,7 +70,6 @@ DrawDevices (PMENU_STATE pMS, BYTE OldDevice, BYTE NewDevice)
|| NewDevice >= (BYTE)(pMS->first_item.y + MAX_VIS_DEVICES)))) || NewDevice >= (BYTE)(pMS->first_item.y + MAX_VIS_DEVICES))))
{ {
STAMP s; STAMP s;
extern FRAME misc_data;
r.corner.x = 2; r.corner.x = 2;
r.extent.width = FIELD_WIDTH + 1; r.extent.width = FIELD_WIDTH + 1;
@@ -124,7 +123,7 @@ DrawDevices (PMENU_STATE pMS, BYTE OldDevice, BYTE NewDevice)
++OldDevice) ++OldDevice)
{ {
s.frame = SetAbsFrameIndex ( s.frame = SetAbsFrameIndex (
misc_data, 77 + pDeviceMap[OldDevice] MiscDataFrame, 77 + pDeviceMap[OldDevice]
); );
DrawStamp (&s); DrawStamp (&s);
sc2/src/sc2code/planets/lander.c
+1 -2
View File
@@ -1196,10 +1196,9 @@ RepairScan (void)
{ {
#define FLASH_INDEX 105 #define FLASH_INDEX 105
STAMP s; STAMP s;
extern FRAME misc_data;
s.origin = pMenuState->flash_rect0.corner; s.origin = pMenuState->flash_rect0.corner;
s.frame = SetAbsFrameIndex (misc_data, FLASH_INDEX); s.frame = SetAbsFrameIndex (MiscDataFrame, FLASH_INDEX);
DrawStamp (&s); DrawStamp (&s);
} }
UnbatchGraphics (); UnbatchGraphics ();
sc2/src/sc2code/planets/pstarmap.c
+1 -2
View File
@@ -1107,14 +1107,13 @@ DoStarMap (void)
//FRAME OldFrame; //FRAME OldFrame;
RECT clip_r; RECT clip_r;
CONTEXT OldContext; CONTEXT OldContext;
extern FRAME misc_data;
pMenuState = &MenuState; pMenuState = &MenuState;
memset (pMenuState, 0, sizeof (*pMenuState)); memset (pMenuState, 0, sizeof (*pMenuState));
MenuState.flash_rect1.corner.x = MAX_X_UNIVERSE >> 1; MenuState.flash_rect1.corner.x = MAX_X_UNIVERSE >> 1;
MenuState.flash_rect1.corner.y = MAX_Y_UNIVERSE >> 1; MenuState.flash_rect1.corner.y = MAX_Y_UNIVERSE >> 1;
MenuState.CurFrame = SetAbsFrameIndex (misc_data, 48); MenuState.CurFrame = SetAbsFrameIndex (MiscDataFrame, 48);
MenuState.delta_item = 0; MenuState.delta_item = 0;
if (LOBYTE (GLOBAL (CurrentActivity)) != IN_HYPERSPACE) if (LOBYTE (GLOBAL (CurrentActivity)) != IN_HYPERSPACE)
sc2/src/sc2code/planets/scan.c
+4 -5
View File
@@ -49,7 +49,6 @@ void WaitForNoInput (SIZE Duration);
#define FLASH_INDEX 105 #define FLASH_INDEX 105
#define FLASH_WIDTH 9 #define FLASH_WIDTH 9
#define FLASH_HEIGHT 9 #define FLASH_HEIGHT 9
extern FRAME misc_data;
extern void DrawScannedObjects (BOOLEAN Reversed); extern void DrawScannedObjects (BOOLEAN Reversed);
@@ -627,7 +626,7 @@ flash_planet_loc_func(void *data)
SetPrimNextLink (&p, END_OF_LIST); SetPrimNextLink (&p, END_OF_LIST);
p.Object.Stamp.origin.x = p.Object.Stamp.origin.y = -1; p.Object.Stamp.origin.x = p.Object.Stamp.origin.y = -1;
p.Object.Stamp.frame = SetAbsFrameIndex (misc_data, FLASH_INDEX); p.Object.Stamp.frame = SetAbsFrameIndex (MiscDataFrame, FLASH_INDEX);
c = 0x00; c = 0x00;
val = -0x02; val = -0x02;
TimeIn = 0; TimeIn = 0;
@@ -761,7 +760,7 @@ PickPlanetSide (PMENU_STATE pMS)
DeltaSISGauges (0, -(SIZE)fuel_required, 0); DeltaSISGauges (0, -(SIZE)fuel_required, 0);
SetContext (ScanContext); SetContext (ScanContext);
s.origin = pMenuState->flash_rect0.corner; s.origin = pMenuState->flash_rect0.corner;
s.frame = SetAbsFrameIndex (misc_data, FLASH_INDEX); s.frame = SetAbsFrameIndex (MiscDataFrame, FLASH_INDEX);
DrawStamp (&s); DrawStamp (&s);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
@@ -1283,7 +1282,7 @@ GeneratePlanetSide (void)
COUNT num_nodes; COUNT num_nodes;
FRAME f; FRAME f;
f = SetAbsFrameIndex (misc_data, f = SetAbsFrameIndex (MiscDataFrame,
NUM_SCANDOT_TRANSITIONS * (scan - ENERGY_SCAN)); NUM_SCANDOT_TRANSITIONS * (scan - ENERGY_SCAN));
pSolarSysState->CurNode = (COUNT)~0; pSolarSysState->CurNode = (COUNT)~0;
@@ -1325,7 +1324,7 @@ GeneratePlanetSide (void)
NodeElementPtr->mass_points = HIBYTE ( NodeElementPtr->mass_points = HIBYTE (
pSolarSysState->SysInfo.PlanetInfo.CurDensity); pSolarSysState->SysInfo.PlanetInfo.CurDensity);
NodeElementPtr->current.image.frame = SetAbsFrameIndex ( NodeElementPtr->current.image.frame = SetAbsFrameIndex (
misc_data, (NUM_SCANDOT_TRANSITIONS << 1) MiscDataFrame, (NUM_SCANDOT_TRANSITIONS << 1)
+ ElementCategory (EType) * 5); + ElementCategory (EType) * 5);
NodeElementPtr->next.image.frame = SetRelFrameIndex ( NodeElementPtr->next.image.frame = SetRelFrameIndex (
NodeElementPtr->current.image.frame, LOBYTE ( NodeElementPtr->current.image.frame, LOBYTE (
sc2/src/sc2code/setup.c
+6 -3
View File
@@ -59,7 +59,10 @@ FONT StarConFont;
FONT MicroFont; FONT MicroFont;
FONT TinyFont; FONT TinyFont;
QUEUE race_q[NUM_PLAYERS]; QUEUE race_q[NUM_PLAYERS];
FRAME ActivityFrame, status, flagship_status, misc_data; FRAME ActivityFrame;
FRAME StatusFrame;
FRAME FlagStatFrame;
FRAME MiscDataFrame;
Mutex GraphicsLock; Mutex GraphicsLock;
STRING GameStrings; STRING GameStrings;
@@ -175,8 +178,8 @@ InitKernel (void)
if (ActivityFrame == NULL) if (ActivityFrame == NULL)
return FALSE; return FALSE;
status = CaptureDrawable (LoadGraphic (STATUS_MASK_PMAP_ANIM)); StatusFrame = CaptureDrawable (LoadGraphic (STATUS_MASK_PMAP_ANIM));
if (status == NULL) if (StatusFrame == NULL)
return FALSE; return FALSE;
GameStrings = CaptureStringTable (LoadStringTableInstance ( GameStrings = CaptureStringTable (LoadStringTableInstance (
sc2/src/sc2code/setup.h
+3
View File
@@ -28,6 +28,9 @@ extern MEM_HANDLE hResIndex;
extern FRAME Screen; extern FRAME Screen;
extern FRAME ActivityFrame; extern FRAME ActivityFrame;
extern FRAME StatusFrame;
extern FRAME FlagStatFrame;
extern FRAME MiscDataFrame;
extern CONTEXT OffScreenContext; extern CONTEXT OffScreenContext;
extern CONTEXT ScreenContext; extern CONTEXT ScreenContext;
sc2/src/sc2code/shipstat.c
+4 -5
View File
@@ -28,24 +28,23 @@ void
DrawCrewFuelString (COORD y, SIZE state) DrawCrewFuelString (COORD y, SIZE state)
{ {
STAMP Stamp; STAMP Stamp;
extern FRAME status;
Stamp.origin.y = y + GAUGE_YOFFS + STARCON_TEXT_HEIGHT; Stamp.origin.y = y + GAUGE_YOFFS + STARCON_TEXT_HEIGHT;
if (state == 0) if (state == 0)
{ {
Stamp.origin.x = CREW_XOFFS + (STAT_WIDTH >> 1) + 6; Stamp.origin.x = CREW_XOFFS + (STAT_WIDTH >> 1) + 6;
if (optWhichMenu == OPT_PC) if (optWhichMenu == OPT_PC)
Stamp.frame = SetAbsFrameIndex (status, 4); Stamp.frame = SetAbsFrameIndex (StatusFrame, 4);
else else
Stamp.frame = SetAbsFrameIndex (status, 0); Stamp.frame = SetAbsFrameIndex (StatusFrame, 0);
DrawStamp (&Stamp); DrawStamp (&Stamp);
} }
Stamp.origin.x = ENERGY_XOFFS + (STAT_WIDTH >> 1) - 5; Stamp.origin.x = ENERGY_XOFFS + (STAT_WIDTH >> 1) - 5;
if (optWhichMenu == OPT_PC) if (optWhichMenu == OPT_PC)
Stamp.frame = SetAbsFrameIndex (status, 5); Stamp.frame = SetAbsFrameIndex (StatusFrame, 5);
else else
Stamp.frame = SetAbsFrameIndex (status, 1); Stamp.frame = SetAbsFrameIndex (StatusFrame, 1);
if (state >= 0) if (state >= 0)
DrawStamp (&Stamp); DrawStamp (&Stamp);
else else
sc2/src/sc2code/sis.c
+5 -7
View File
@@ -583,11 +583,10 @@ DrawLanders (void)
RECT r; RECT r;
STAMP s; STAMP s;
CONTEXT OldContext; CONTEXT OldContext;
extern FRAME flagship_status;
OldContext = SetContext (StatusContext); OldContext = SetContext (StatusContext);
s.frame = IncFrameIndex (flagship_status); s.frame = IncFrameIndex (FlagStatFrame);
GetFrameRect (s.frame, &r); GetFrameRect (s.frame, &r);
i = GLOBAL_SIS (NumLanders); i = GLOBAL_SIS (NumLanders);
@@ -757,10 +756,9 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta)
if (crew_delta == UNDEFINED_DELTA) if (crew_delta == UNDEFINED_DELTA)
{ {
COUNT i; COUNT i;
extern FRAME flagship_status;
s.origin.x = s.origin.y = 0; s.origin.x = s.origin.y = 0;
s.frame = flagship_status; s.frame = FlagStatFrame;
DrawStamp (&s); DrawStamp (&s);
if (optWhichFonts == OPT_PC) if (optWhichFonts == OPT_PC)
DrawPC_SIS(); DrawPC_SIS();
@@ -775,7 +773,7 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta)
GLOBAL_SIS (DriveSlots[i])) < EMPTY_SLOT) GLOBAL_SIS (DriveSlots[i])) < EMPTY_SLOT)
{ {
s.frame = SetAbsFrameIndex ( s.frame = SetAbsFrameIndex (
flagship_status, which_piece + 1 + 0 FlagStatFrame, which_piece + 1 + 0
); );
DrawStamp (&s); DrawStamp (&s);
s.frame = IncFrameIndex (s.frame); s.frame = IncFrameIndex (s.frame);
@@ -793,7 +791,7 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta)
GLOBAL_SIS (JetSlots[i])) < EMPTY_SLOT) GLOBAL_SIS (JetSlots[i])) < EMPTY_SLOT)
{ {
s.frame = SetAbsFrameIndex ( s.frame = SetAbsFrameIndex (
flagship_status, which_piece + 1 + 1 FlagStatFrame, which_piece + 1 + 1
); );
DrawStamp (&s); DrawStamp (&s);
s.frame = IncFrameIndex (s.frame); s.frame = IncFrameIndex (s.frame);
@@ -812,7 +810,7 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta)
GLOBAL_SIS (ModuleSlots[i])) < EMPTY_SLOT) GLOBAL_SIS (ModuleSlots[i])) < EMPTY_SLOT)
{ {
s.frame = SetAbsFrameIndex ( s.frame = SetAbsFrameIndex (
flagship_status, which_piece + 1 + 2 FlagStatFrame, which_piece + 1 + 2
); );
DrawStamp (&s); DrawStamp (&s);
} }