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

Further lander cleanup: fully decoupled from scan's MENU_STATE

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3308 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-11-16 23:32:01 +00:00
parent 7cec3853ab
commit 0920380020
4 changed files with 117 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/planets/lander.c
+67 -95
View File
@@ -50,14 +50,17 @@
LanderInputState *pLanderInputState; LanderInputState *pLanderInputState;
// Temporary, to replace the references to pMenuState. // Temporary, to replace the references to pMenuState.
// Eventually, this should become a parameter to everything which // TODO: Many functions depend on pLanderInputState. In particular,
// needs it. // the ELEMENT property functions. Fields in LanderInputState
// should either be made static vars, or ELEMENT should carry
// something like an 'intptr_t private' field
FRAME LanderFrame[8]; FRAME LanderFrame[8];
static SOUND LanderSounds; static SOUND LanderSounds;
MUSIC_REF LanderMusic; MUSIC_REF LanderMusic;
#define NUM_ORBIT_THEMES 5 #define NUM_ORBIT_THEMES 5
static MUSIC_REF OrbitMusic[NUM_ORBIT_THEMES]; static MUSIC_REF OrbitMusic[NUM_ORBIT_THEMES];
const LIFEFORM_DESC CreatureData[] = const LIFEFORM_DESC CreatureData[] =
{ {
{SPEED_MOTIONLESS | DANGER_HARMLESS, MAKE_BYTE (1, 1)}, {SPEED_MOTIONLESS | DANGER_HARMLESS, MAKE_BYTE (1, 1)},
@@ -139,6 +142,7 @@ extern PRIM_LINKS DisplayLinks;
#define LANDER_SPEED_DENOM 10 #define LANDER_SPEED_DENOM 10
static BYTE lander_flags; static BYTE lander_flags;
static POINT curLanderLoc;
#define NUM_LANDING_DELTAS 11 #define NUM_LANDING_DELTAS 11
#define ON_THE_GROUND -1 #define ON_THE_GROUND -1
@@ -187,8 +191,8 @@ DamageColorCycle (COLOR c, COUNT i)
return (c); return (c);
} }
#define MAGNIFICATION (1 << MAG_SHIFT) // XXX: This function used to erase a moving object by drawing a piece
// of surface over its previous location. Now it just moves the object
static BOOLEAN static BOOLEAN
RepairTopography (ELEMENT *ElementPtr) RepairTopography (ELEMENT *ElementPtr)
{ {
@@ -339,14 +343,12 @@ object_animation (ELEMENT *ElementPtr)
SIZE dx, dy; SIZE dx, dy;
COUNT old_angle; COUNT old_angle;
dx = pSolarSysState->MenuState.first_item.x dx = curLanderLoc.x - ElementPtr->next.location.x;
- ElementPtr->next.location.x;
if (dx < 0 && dx < -(MAP_WIDTH << (MAG_SHIFT - 1))) if (dx < 0 && dx < -(MAP_WIDTH << (MAG_SHIFT - 1)))
dx += MAP_WIDTH << MAG_SHIFT; dx += MAP_WIDTH << MAG_SHIFT;
else if (dx > (MAP_WIDTH << (MAG_SHIFT - 1))) else if (dx > (MAP_WIDTH << (MAG_SHIFT - 1)))
dx -= MAP_WIDTH << MAG_SHIFT; dx -= MAP_WIDTH << MAG_SHIFT;
dy = pSolarSysState->MenuState.first_item.y dy = curLanderLoc.y - ElementPtr->next.location.y;
- ElementPtr->next.location.y;
angle = ARCTAN (dx, dy); angle = ARCTAN (dx, dy);
if (dx < 0) if (dx < 0)
dx = -dx; dx = -dx;
@@ -942,8 +944,7 @@ lightning_process (ELEMENT *ElementPtr)
&& !pPSD->InTransit) && !pPSD->InTransit)
lander_flags |= KILL_CREW; lander_flags |= KILL_CREW;
ElementPtr->next.location = ElementPtr->next.location = curLanderLoc;
pSolarSysState->MenuState.first_item;
} }
pPrim->Object.Stamp.frame = pPrim->Object.Stamp.frame =
@@ -981,13 +982,11 @@ AddLightning (void)
rand_val = TFB_Random (); rand_val = TFB_Random ();
LightningElementPtr->life_span = 10 + (HIWORD (rand_val) % 10) + 1; LightningElementPtr->life_span = 10 + (HIWORD (rand_val) % 10) + 1;
LightningElementPtr->next.location.x = ( LightningElementPtr->next.location.x = (curLanderLoc.x
pSolarSysState->MenuState.first_item.x
+ ((MAP_WIDTH << MAG_SHIFT) - ((SURFACE_WIDTH >> 1) - 6)) + ((MAP_WIDTH << MAG_SHIFT) - ((SURFACE_WIDTH >> 1) - 6))
+ (LOBYTE (rand_val) % (SURFACE_WIDTH - 12)) + (LOBYTE (rand_val) % (SURFACE_WIDTH - 12))
) % (MAP_WIDTH << MAG_SHIFT); ) % (MAP_WIDTH << MAG_SHIFT);
LightningElementPtr->next.location.y = ( LightningElementPtr->next.location.y = (curLanderLoc.y
pSolarSysState->MenuState.first_item.y
+ ((MAP_HEIGHT << MAG_SHIFT) - ((SURFACE_HEIGHT >> 1) - 6)) + ((MAP_HEIGHT << MAG_SHIFT) - ((SURFACE_HEIGHT >> 1) - 6))
+ (HIBYTE (rand_val) % (SURFACE_HEIGHT - 12)) + (HIBYTE (rand_val) % (SURFACE_HEIGHT - 12))
) % (MAP_HEIGHT << MAG_SHIFT); ) % (MAP_HEIGHT << MAG_SHIFT);
@@ -1029,13 +1028,11 @@ AddGroundDisaster (COUNT which_disaster)
GroundDisasterElementPtr->preprocess_func = object_animation; GroundDisasterElementPtr->preprocess_func = object_animation;
rand_val = TFB_Random (); rand_val = TFB_Random ();
GroundDisasterElementPtr->next.location.x = ( GroundDisasterElementPtr->next.location.x = (curLanderLoc.x
pSolarSysState->MenuState.first_item.x
+ ((MAP_WIDTH << MAG_SHIFT) - (SURFACE_WIDTH * 3 / 8)) + ((MAP_WIDTH << MAG_SHIFT) - (SURFACE_WIDTH * 3 / 8))
+ (LOWORD (rand_val) % (SURFACE_WIDTH * 3 / 4)) + (LOWORD (rand_val) % (SURFACE_WIDTH * 3 / 4))
) % (MAP_WIDTH << MAG_SHIFT); ) % (MAP_WIDTH << MAG_SHIFT);
GroundDisasterElementPtr->next.location.y = ( GroundDisasterElementPtr->next.location.y = (curLanderLoc.y
pSolarSysState->MenuState.first_item.y
+ ((MAP_HEIGHT << MAG_SHIFT) - (SURFACE_HEIGHT * 3 / 8)) + ((MAP_HEIGHT << MAG_SHIFT) - (SURFACE_HEIGHT * 3 / 8))
+ (HIWORD (rand_val) % (SURFACE_HEIGHT * 3 / 4)) + (HIWORD (rand_val) % (SURFACE_HEIGHT * 3 / 4))
) % (MAP_HEIGHT << MAG_SHIFT); ) % (MAP_HEIGHT << MAG_SHIFT);
@@ -1067,6 +1064,10 @@ AddGroundDisaster (COUNT which_disaster)
return (hGroundDisasterElement); return (hGroundDisasterElement);
} }
// This function replaces the ELEMENT manipulations typically done by
// PreProcess() and PostProcess() in process.c. Lander code does not
// call RedrawQueue() & Co and thus does not reap the benefits (or curses,
// depending how you look at it) of automatic flags processing.
static void static void
BuildObjectList (void) BuildObjectList (void)
{ {
@@ -1094,7 +1095,7 @@ BuildObjectList (void)
if (LOBYTE (LOWORD (rand_val)) < pPSD->WeatherChance) if (LOBYTE (LOWORD (rand_val)) < pPSD->WeatherChance)
AddLightning (); AddLightning ();
org = pSolarSysState->MenuState.first_item; org = curLanderLoc;
for (hElement = GetHeadElement (); for (hElement = GetHeadElement ();
hElement; hElement = hNextElement) hElement; hElement = hNextElement)
{ {
@@ -1109,8 +1110,10 @@ BuildObjectList (void)
hNextElement = GetSuccElement (ElementPtr); hNextElement = GetSuccElement (ElementPtr);
UnlockElement (hElement); UnlockElement (hElement);
// XXX: Hack: APPEARING flag is set by scan.c for scanned blips
if (ElementPtr->state_flags & APPEARING) if (ElementPtr->state_flags & APPEARING)
{ {
// XXX: Hack: defer deletion of the element
ElementPtr->current.location.x |= 0x8000; ElementPtr->current.location.x |= 0x8000;
ElementPtr->current.location.y |= 0x8000; ElementPtr->current.location.y |= 0x8000;
} }
@@ -1130,9 +1133,7 @@ BuildObjectList (void)
if (ElementPtr->preprocess_func) if (ElementPtr->preprocess_func)
(*ElementPtr->preprocess_func) (ElementPtr); (*ElementPtr->preprocess_func) (ElementPtr);
GetNextVelocityComponents ( GetNextVelocityComponents (&ElementPtr->velocity, &dx, &dy, 1);
&ElementPtr->velocity, &dx, &dy, 1
);
if (dx || dy) if (dx || dy)
{ {
ElementPtr->next.location.x += dx; ElementPtr->next.location.x += dx;
@@ -1145,8 +1146,11 @@ BuildObjectList (void)
else if (ElementPtr->next.location.y >= (MAP_HEIGHT << MAG_SHIFT)) else if (ElementPtr->next.location.y >= (MAP_HEIGHT << MAG_SHIFT))
ElementPtr->next.location.y = (MAP_HEIGHT << MAG_SHIFT) - 1; ElementPtr->next.location.y = (MAP_HEIGHT << MAG_SHIFT) - 1;
} }
// XXX: Hack: APPEARING flag is set by scan.c for scanned blips
if (ElementPtr->state_flags & APPEARING) if (ElementPtr->state_flags & APPEARING)
{ // XXX: Hack: remove the element from display
ElementPtr->current.location.x |= 0x8000; ElementPtr->current.location.x |= 0x8000;
}
if (ElementPtr->next.location.x < 0) if (ElementPtr->next.location.x < 0)
ElementPtr->next.location.x += MAP_WIDTH << MAG_SHIFT; ElementPtr->next.location.x += MAP_WIDTH << MAG_SHIFT;
else else
@@ -1183,99 +1187,72 @@ BuildObjectList (void)
} }
static void static void
RepairScan (void) RepairScan (POINT newPlanetLoc)
{ {
CONTEXT OldContext;
HELEMENT hElement, hNextElement; HELEMENT hElement, hNextElement;
OldContext = SetContext (ScanContext);
for (hElement = GetHeadElement (); for (hElement = GetHeadElement ();
hElement; hElement = hNextElement) hElement; hElement = hNextElement)
{ {
ELEMENT *ElementPtr; ELEMENT *ElementPtr;
BOOLEAN remove = FALSE;
LockElement (hElement, &ElementPtr); LockElement (hElement, &ElementPtr);
hNextElement = GetSuccElement (ElementPtr); hNextElement = GetSuccElement (ElementPtr);
if (ElementPtr->current.location.x & 0x8000) if (ElementPtr->current.location.x & 0x8000)
{ { // XXX: element removed from display
BOOLEAN remove;
ElementPtr->current.location.x &= ~0x8000; ElementPtr->current.location.x &= ~0x8000;
if (ElementPtr->current.location.y & 0x8000) if (ElementPtr->current.location.y & 0x8000)
{ { // XXX: deletion of this element was defered
remove = TRUE; remove = TRUE;
ElementPtr->current.location.y &= ~0x8000; ElementPtr->current.location.y &= ~0x8000;
} }
else
remove = FALSE;
RepairTopography (ElementPtr); RepairTopography (ElementPtr);
if (remove)
{
UnlockElement (hElement);
RemoveElement (hElement);
FreeElement (hElement);
continue;
}
} }
UnlockElement (hElement); UnlockElement (hElement);
if (remove)
{
RemoveElement (hElement);
FreeElement (hElement);
}
} }
BatchGraphics (); RedrawSurfaceScan (&newPlanetLoc);
#if 1
DrawPlanet (0, 0, 0, 0);
#endif
DrawScannedObjects (TRUE);
drawPlanetCursor (pLanderInputState->scanInputState, FALSE);
UnbatchGraphics ();
SetContext (OldContext);
} }
static void static void
ScrollPlanetSide (SIZE dx, SIZE dy, int landingIndex) ScrollPlanetSide (SIZE dx, SIZE dy, int landingIndex)
{ {
POINT old_pt, new_pt; POINT new_pt;
STAMP lander_s, shadow_s, shield_s; STAMP lander_s, shadow_s, shield_s;
CONTEXT OldContext; CONTEXT OldContext;
MENU_STATE *scanInputState = &pSolarSysState->MenuState;
// TODO: Make a new structure ScanInputState, like
// LanderInputState, instead of using MENU_STATE.
old_pt.x = scanInputState->first_item.x - (SURFACE_WIDTH >> 1); new_pt.y = curLanderLoc.y + dy;
old_pt.y = scanInputState->first_item.y - (SURFACE_HEIGHT >> 1); if (new_pt.y < 0)
new_pt.y = old_pt.y + dy;
if (new_pt.y < -(SURFACE_HEIGHT >> 1))
{ {
new_pt.y = -(SURFACE_HEIGHT >> 1); new_pt.y = 0;
dy = new_pt.y - old_pt.y; dy = new_pt.y - curLanderLoc.y;
dx = 0; dx = 0;
ZeroVelocityComponents (&GLOBAL (velocity)); ZeroVelocityComponents (&GLOBAL (velocity));
} }
else if (new_pt.y > (MAP_HEIGHT << MAG_SHIFT) - (SURFACE_HEIGHT >> 1)) else if (new_pt.y > (MAP_HEIGHT << MAG_SHIFT) - 1)
{ {
new_pt.y = (MAP_HEIGHT << MAG_SHIFT) - (SURFACE_HEIGHT >> 1); new_pt.y = (MAP_HEIGHT << MAG_SHIFT) - 1;
dy = new_pt.y - old_pt.y; dy = new_pt.y - curLanderLoc.y;
dx = 0; dx = 0;
ZeroVelocityComponents (&GLOBAL (velocity)); ZeroVelocityComponents (&GLOBAL (velocity));
} }
new_pt.x = old_pt.x + dx; new_pt.x = curLanderLoc.x + dx;
if (new_pt.x < 0) if (new_pt.x < 0)
new_pt.x += MAP_WIDTH << MAG_SHIFT; new_pt.x += MAP_WIDTH << MAG_SHIFT;
else if (new_pt.x >= MAP_WIDTH << MAG_SHIFT) else if (new_pt.x >= MAP_WIDTH << MAG_SHIFT)
new_pt.x -= MAP_WIDTH << MAG_SHIFT; new_pt.x -= MAP_WIDTH << MAG_SHIFT;
new_pt.x = scanInputState->first_item.x + dx; curLanderLoc = new_pt;
if (new_pt.x < 0)
new_pt.x += MAP_WIDTH << MAG_SHIFT;
else if (new_pt.x >= MAP_WIDTH << MAG_SHIFT)
new_pt.x -= MAP_WIDTH << MAG_SHIFT;
new_pt.y = scanInputState->first_item.y + dy;
scanInputState->first_item = new_pt;
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
OldContext = SetContext (SpaceContext); OldContext = SetContext (SpaceContext);
@@ -1384,8 +1361,7 @@ ScrollPlanetSide (SIZE dx, SIZE dy, int landingIndex)
} }
} }
setPlanetCursorLoc (pLanderInputState->scanInputState, new_pt); RepairScan (new_pt);
RepairScan ();
if (lander_flags & KILL_CREW) if (lander_flags & KILL_CREW)
DeltaLanderCrew (-1, LIGHTNING_DISASTER); DeltaLanderCrew (-1, LIGHTNING_DISASTER);
@@ -1430,10 +1406,9 @@ AnimateLaunch (FRAME farray)
} }
static void static void
InitPlanetSide (void) InitPlanetSide (POINT pt)
{ {
SIZE num_crew; SIZE num_crew;
POINT pt;
STAMP s; STAMP s;
CONTEXT OldContext; CONTEXT OldContext;
DWORD Time; DWORD Time;
@@ -1527,10 +1502,9 @@ InitPlanetSide (void)
TaskSwitch (); TaskSwitch ();
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
#endif #endif
// Adjust pSolarSysState->MenuState.first_item by a random jitter.
#define RANDOM_MISS 64
pt = pSolarSysState->MenuState.first_item;
// Adjust landing location by a random jitter.
#define RANDOM_MISS 64
// Jitter the X landing point. // Jitter the X landing point.
pt.x -= RANDOM_MISS - (SIZE)(LOWORD (TFB_Random ()) % (RANDOM_MISS << 1)); pt.x -= RANDOM_MISS - (SIZE)(LOWORD (TFB_Random ()) % (RANDOM_MISS << 1));
if (pt.x < 0) if (pt.x < 0)
@@ -1545,8 +1519,8 @@ InitPlanetSide (void)
else if (pt.y >= (MAP_HEIGHT << MAG_SHIFT)) else if (pt.y >= (MAP_HEIGHT << MAG_SHIFT))
pt.y = (MAP_HEIGHT << MAG_SHIFT) - 1; pt.y = (MAP_HEIGHT << MAG_SHIFT) - 1;
// Set the planet location curLanderLoc = pt;
pSolarSysState->MenuState.first_item = pt;
SetContext (SpaceContext); SetContext (SpaceContext);
SetContextFont (TinyFont); SetContextFont (TinyFont);
@@ -1594,7 +1568,8 @@ InitPlanetSide (void)
} }
static void static void
LanderFire (LanderInputState *inputState, SIZE index) { LanderFire (LanderInputState *inputState, SIZE index)
{
#define SHUTTLE_FIRE_WAIT 15 #define SHUTTLE_FIRE_WAIT 15
HELEMENT hWeaponElement; HELEMENT hWeaponElement;
SIZE wdx, wdy; SIZE wdx, wdy;
@@ -1610,8 +1585,7 @@ LanderFire (LanderInputState *inputState, SIZE index) {
WeaponElementPtr->mass_points = 1; WeaponElementPtr->mass_points = 1;
WeaponElementPtr->life_span = 12; WeaponElementPtr->life_span = 12;
WeaponElementPtr->state_flags = FINITE_LIFE; WeaponElementPtr->state_flags = FINITE_LIFE;
WeaponElementPtr->next.location = WeaponElementPtr->next.location = curLanderLoc;
pSolarSysState->MenuState.first_item;
WeaponElementPtr->current.location.x = WeaponElementPtr->current.location.x =
WeaponElementPtr->next.location.x >> MAG_SHIFT; WeaponElementPtr->next.location.x >> MAG_SHIFT;
WeaponElementPtr->current.location.y = WeaponElementPtr->current.location.y =
@@ -1714,12 +1688,10 @@ landerSpeedNumer = WORLD_TO_VELOCITY (48);
ExplosionElementPtr->playerNr = PS_HUMAN_PLAYER; ExplosionElementPtr->playerNr = PS_HUMAN_PLAYER;
ExplosionElementPtr->mass_points = DEATH_EXPLOSION; ExplosionElementPtr->mass_points = DEATH_EXPLOSION;
ExplosionElementPtr->state_flags = FINITE_LIFE; ExplosionElementPtr->state_flags = FINITE_LIFE;
ExplosionElementPtr->next.location = ExplosionElementPtr->next.location = curLanderLoc;
pSolarSysState->MenuState.first_item;
ExplosionElementPtr->preprocess_func = object_animation; ExplosionElementPtr->preprocess_func = object_animation;
ExplosionElementPtr->turn_wait = MAKE_BYTE (2, 2); ExplosionElementPtr->turn_wait = MAKE_BYTE (2, 2);
ExplosionElementPtr->life_span = ExplosionElementPtr->life_span = EXPLOSION_LIFE
EXPLOSION_LIFE
* (LONIBBLE (ExplosionElementPtr->turn_wait) + 1); * (LONIBBLE (ExplosionElementPtr->turn_wait) + 1);
SetPrimType (&DisplayArray[ExplosionElementPtr->PrimIndex], SetPrimType (&DisplayArray[ExplosionElementPtr->PrimIndex],
@@ -1883,9 +1855,7 @@ ReturnToOrbit (RECT *pRect)
SetTransitionSource (pRect); SetTransitionSource (pRect);
BatchGraphics (); BatchGraphics ();
DrawStarBackGround (TRUE); DrawStarBackGround (TRUE);
SetContext (ScanContext); RedrawSurfaceScan (NULL);
DrawPlanet (0, 0, 0, 0);
DrawScannedObjects (TRUE);
ScreenTransition (3, pRect); ScreenTransition (3, pRect);
UnbatchGraphics (); UnbatchGraphics ();
@@ -1944,7 +1914,7 @@ LandingTakeoffSequence (LanderInputState *inputState, BOOLEAN landing)
} }
void void
PlanetSide (MENU_STATE *pMS) PlanetSide (POINT planetLoc)
{ {
SIZE index; SIZE index;
LanderInputState landerInputState; LanderInputState landerInputState;
@@ -2011,16 +1981,18 @@ PlanetSide (MENU_STATE *pMS)
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F); BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7F);
landerInputState.planetSideDesc = &PSD; landerInputState.planetSideDesc = &PSD;
// ScrollPlanetSide depends on this. Not just DoPlanetSide(). // TODO: Many functions depend on pLanderInputState. In particular,
// the ELEMENT property functions. Fields in LanderInputState
// should either be made static vars, or ELEMENT should carry
// something like an 'intptr_t private' field
pLanderInputState = &landerInputState; pLanderInputState = &landerInputState;
landerInputState.scanInputState = pMS;
index = NORMALIZE_FACING ((COUNT)TFB_Random ()); index = NORMALIZE_FACING ((COUNT)TFB_Random ());
LanderFrame[0] = SetAbsFrameIndex (LanderFrame[0], index); LanderFrame[0] = SetAbsFrameIndex (LanderFrame[0], index);
landerInputState.delta_item = 0; landerInputState.delta_item = 0;
pSolarSysState->MenuState.Initialized += 4; pSolarSysState->MenuState.Initialized += 4;
InitPlanetSide (); InitPlanetSide (planetLoc);
landerInputState.NextTime = GetTimeCounter () + PLANET_SIDE_RATE; landerInputState.NextTime = GetTimeCounter () + PLANET_SIDE_RATE;
LandingTakeoffSequence (&landerInputState, TRUE); LandingTakeoffSequence (&landerInputState, TRUE);
sc2/src/uqm/planets/lander.h
+9 -5
View File
@@ -23,7 +23,7 @@
#include "libs/compiler.h" #include "libs/compiler.h"
#include "libs/gfxlib.h" #include "libs/gfxlib.h"
#include "libs/sndlib.h" #include "libs/sndlib.h"
#include "../menustat.h" #include "libs/timelib.h"
#include "../element.h" #include "../element.h"
@@ -66,7 +66,6 @@ struct LanderInputState {
PLANETSIDE_DESC *planetSideDesc; PLANETSIDE_DESC *planetSideDesc;
SIZE Initialized; SIZE Initialized;
MENU_STATE *scanInputState;
TimeCount NextTime; TimeCount NextTime;
// Frame rate control // Frame rate control
@@ -82,14 +81,19 @@ struct LanderInputState {
extern LanderInputState *pLanderInputState; extern LanderInputState *pLanderInputState;
// Temporary, to replace the references to pMenuState. // Temporary, to replace the references to pMenuState.
// Eventually, this should become a parameter to everything which // TODO: Many functions depend on pLanderInputState. In particular,
// needs it. // the ELEMENT property functions. Fields in LanderInputState
// should either be made static vars, or ELEMENT should carry
// something like an 'intptr_t private' field
// TODO: Generation functions use pLanderInputState to locate
// the PLANETSIDE_DESC.InTransit. Make those instances into
// a function call instead.
extern CONTEXT ScanContext; extern CONTEXT ScanContext;
extern MUSIC_REF LanderMusic; extern MUSIC_REF LanderMusic;
extern void PlanetSide (MENU_STATE *pMS); extern void PlanetSide (POINT planetLoc);
extern void DoDiscoveryReport (SOUND ReadOutSounds); extern void DoDiscoveryReport (SOUND ReadOutSounds);
extern void SetPlanetMusic (BYTE planet_type); extern void SetPlanetMusic (BYTE planet_type);
extern void LoadLanderData (void); extern void LoadLanderData (void);
sc2/src/uqm/planets/scan.c
+40 -19
View File
@@ -45,11 +45,12 @@ extern FRAME SpaceJunkFrame;
#undef SPIN_ON_SCAN #undef SPIN_ON_SCAN
#define FLASH_INDEX 105 #define FLASH_INDEX 105
#define FLASH_WIDTH 9
#define FLASH_HEIGHT 9
// TODO: this will become static once genchmmr.c declares its own CONTEXT
CONTEXT ScanContext; CONTEXT ScanContext;
static POINT planetLoc;
void void
RepairBackRect (RECT *pRect) RepairBackRect (RECT *pRect)
{ {
@@ -537,7 +538,7 @@ restorePlanetLocationImage (MENU_STATE *pMS)
DrawStamp (&s); DrawStamp (&s);
} }
void static void
drawPlanetCursor (MENU_STATE *pMS, BOOLEAN filled) drawPlanetCursor (MENU_STATE *pMS, BOOLEAN filled)
{ {
STAMP s; STAMP s;
@@ -559,9 +560,9 @@ setPlanetCursorLoc (MENU_STATE *pMS, POINT new_pt)
} }
static void static void
SetPlanetLoc (MENU_STATE *pMS, POINT new_pt) setPlanetLoc (MENU_STATE *pMS, POINT new_pt)
{ {
pSolarSysState->MenuState.first_item = new_pt; planetLoc = new_pt;
// Set the new flash location // Set the new flash location
setPlanetCursorLoc (pMS, new_pt); setPlanetCursorLoc (pMS, new_pt);
@@ -613,6 +614,27 @@ flashPlanetLocation (MENU_STATE *pMS)
drawPlanetCursor (pMS, TRUE); drawPlanetCursor (pMS, TRUE);
} }
void
RedrawSurfaceScan (const POINT *newLoc)
{
CONTEXT OldContext;
OldContext = SetContext (ScanContext);
BatchGraphics ();
DrawPlanet (0, 0, 0, 0);
DrawScannedObjects (TRUE);
if (newLoc)
{
// TODO: Give scan its own STATE struct and pScanState (if needed)
setPlanetLoc (pMenuState, *newLoc);
drawPlanetCursor (pMenuState, FALSE);
}
UnbatchGraphics ();
SetContext (OldContext);
}
static BOOLEAN DoScan (MENU_STATE *pMS); static BOOLEAN DoScan (MENU_STATE *pMS);
static BOOLEAN static BOOLEAN
@@ -640,7 +662,7 @@ PickPlanetSide (MENU_STATE *pMS)
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetContext (ScanContext); SetContext (ScanContext);
// Set the current flash location // Set the current flash location
setPlanetCursorLoc (pMS, pSolarSysState->MenuState.first_item); setPlanetCursorLoc (pMS, planetLoc);
savePlanetLocationImage (pMS); savePlanetLocationImage (pMS);
SetFlashRect (NULL); SetFlashRect (NULL);
@@ -662,7 +684,7 @@ PickPlanetSide (MENU_STATE *pMS)
if (!select) if (!select)
{ // Bailing out { // Bailing out
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetPlanetLoc (pMS, pSolarSysState->MenuState.first_item); restorePlanetLocationImage (pMS);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
else else
@@ -682,7 +704,7 @@ PickPlanetSide (MENU_STATE *pMS)
drawPlanetCursor (pMS, FALSE); drawPlanetCursor (pMS, FALSE);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
PlanetSide (pMS); PlanetSide (planetLoc);
if (GLOBAL (CurrentActivity) & CHECK_ABORT) if (GLOBAL (CurrentActivity) & CHECK_ABORT)
goto ExitPlanetSide; goto ExitPlanetSide;
@@ -741,7 +763,7 @@ ExitPlanetSide:
SIZE dy = 0; SIZE dy = 0;
POINT new_pt; POINT new_pt;
new_pt = pSolarSysState->MenuState.first_item; new_pt = planetLoc;
if (PulsedInputState.menu[KEY_MENU_LEFT]) if (PulsedInputState.menu[KEY_MENU_LEFT])
dx = -1; dx = -1;
@@ -769,13 +791,13 @@ ExitPlanetSide:
{ {
new_pt.y += dy; new_pt.y += dy;
if (new_pt.y < 0 || new_pt.y >= (MAP_HEIGHT << MAG_SHIFT)) if (new_pt.y < 0 || new_pt.y >= (MAP_HEIGHT << MAG_SHIFT))
new_pt.y = pSolarSysState->MenuState.first_item.y; new_pt.y = planetLoc.y;
} }
if (new_pt.x != pSolarSysState->MenuState.first_item.x if (new_pt.x != planetLoc.x
|| new_pt.y != pSolarSysState->MenuState.first_item.y) || new_pt.y != planetLoc.y)
{ {
SetPlanetLoc (pMS, new_pt); setPlanetLoc (pMS, new_pt);
} }
flashPlanetLocation (pMS); flashPlanetLocation (pMS);
@@ -816,6 +838,7 @@ DrawScannedStuff (COUNT y, BYTE CurState)
//DWORD Time; //DWORD Time;
STAMP s; STAMP s;
// XXX: Hack: flag this as surface scan element
ElementPtr->state_flags |= APPEARING; ElementPtr->state_flags |= APPEARING;
s.origin = ElementPtr->current.location; s.origin = ElementPtr->current.location;
@@ -1152,15 +1175,13 @@ ScanSystem (void)
GAS_GIANT_ATMOSPHERE)) GAS_GIANT_ATMOSPHERE))
{ {
MenuState.CurState = EXIT_SCAN; MenuState.CurState = EXIT_SCAN;
ScanContext = 0; ScanContext = NULL;
} }
else else
{ {
MenuState.CurState = AUTO_SCAN; MenuState.CurState = AUTO_SCAN;
pSolarSysState->MenuState.first_item.x = planetLoc.x = (MAP_WIDTH >> 1) << MAG_SHIFT;
(MAP_WIDTH >> 1) << MAG_SHIFT; planetLoc.y = (MAP_HEIGHT >> 1) << MAG_SHIFT;
pSolarSysState->MenuState.first_item.y =
(MAP_HEIGHT >> 1) << MAG_SHIFT;
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
ScanContext = CreateContext ("ScanContext"); ScanContext = CreateContext ("ScanContext");
@@ -1196,7 +1217,7 @@ ScanSystem (void)
SetContext (SpaceContext); SetContext (SpaceContext);
DestroyDrawable (ReleaseDrawable (MenuState.flash_frame1)); DestroyDrawable (ReleaseDrawable (MenuState.flash_frame1));
DestroyContext (ScanContext); DestroyContext (ScanContext);
ScanContext = 0; ScanContext = NULL;
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
} }
sc2/src/uqm/planets/scan.h
+1 -2
View File
@@ -46,8 +46,7 @@ typedef struct
extern void RepairBackRect (RECT *pRect); extern void RepairBackRect (RECT *pRect);
extern void GeneratePlanetSide (void); extern void GeneratePlanetSide (void);
extern void drawPlanetCursor (MENU_STATE *pMS, BOOLEAN filled); extern void RedrawSurfaceScan (const POINT *newLoc);
extern void setPlanetCursorLoc (MENU_STATE *pMS, POINT new_pt);
#endif /* _SCAN_H */ #endif /* _SCAN_H */