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

More DoModifyShips() cleanups.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3730 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2012-01-01 16:41:38 +00:00
parent 751427d909
commit 010f3507d0
1 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/shipyard.c
+40 -20
View File
@@ -931,6 +931,36 @@ DMS_AddEscortShip (MENU_STATE *pMS, BOOLEAN select, BOOLEAN cancel,
} }
} }
// Helper function for DoModifyShips(), called when the player presses
// 'select' or 'cancel' after selling all the crew.
static void
DMS_ScrapEscortShip (MENU_STATE *pMS, HSHIPFRAG hStarShip)
{
RECT r;
SHIP_FRAGMENT *StarShipPtr =
LockShipFrag (&GLOBAL (built_ship_q), hStarShip);
SetFlashRect (NULL);
UnlockMutex (GraphicsLock);
ShowCombatShip (pMS, pMS->CurState, StarShipPtr);
LockMutex (GraphicsLock);
UnlockShipFrag (&GLOBAL (built_ship_q), hStarShip);
RemoveQueue (&GLOBAL (built_ship_q), hStarShip);
FreeShipFrag (&GLOBAL (built_ship_q), hStarShip);
// refresh SIS display
DeltaSISGauges (UNDEFINED_DELTA, UNDEFINED_DELTA, UNDEFINED_DELTA);
r.corner.x = pMS->flash_rect0.corner.x;
r.corner.y = pMS->flash_rect0.corner.y;
r.extent.width = SHIP_WIN_WIDTH;
r.extent.height = SHIP_WIN_HEIGHT;
SetContext (SpaceContext);
SetFlashRect (&r);
}
/* in this routine, the least significant byte of pMS->CurState is used /* in this routine, the least significant byte of pMS->CurState is used
* to store the current selected ship index * to store the current selected ship index
* a special case for the row is hi-nibble == -1 (0xf), which specifies * a special case for the row is hi-nibble == -1 (0xf), which specifies
@@ -1076,32 +1106,22 @@ DoModifyShips (MENU_STATE *pMS)
if ((pMS->delta_item & MODIFY_CREW_FLAG) if ((pMS->delta_item & MODIFY_CREW_FLAG)
&& hStarShip != 0) && hStarShip != 0)
{ {
// Pressing the select or cancel button in crew edit
// mode for an escort ship.
SHIP_FRAGMENT *StarShipPtr = LockShipFrag ( SHIP_FRAGMENT *StarShipPtr = LockShipFrag (
&GLOBAL (built_ship_q), hStarShip); &GLOBAL (built_ship_q), hStarShip);
if (StarShipPtr->crew_level == 0) COUNT crew_level = StarShipPtr->crew_level;
UnlockShipFrag (&GLOBAL (built_ship_q), hStarShip);
if (crew_level == 0)
{ {
SetFlashRect (NULL); // Scrap escort ship, then exiting crew edit
UnlockMutex (GraphicsLock); // mode.
ShowCombatShip (pMS, pMS->CurState, StarShipPtr); DMS_ScrapEscortShip (pMS, hStarShip);
LockMutex (GraphicsLock);
UnlockShipFrag (&GLOBAL (built_ship_q),
hStarShip);
RemoveQueue (&GLOBAL (built_ship_q), hStarShip);
FreeShipFrag (&GLOBAL (built_ship_q), hStarShip);
// refresh SIS display
DeltaSISGauges (UNDEFINED_DELTA, UNDEFINED_DELTA,
UNDEFINED_DELTA);
r.corner.x = pMS->flash_rect0.corner.x;
r.corner.y = pMS->flash_rect0.corner.y;
r.extent.width = SHIP_WIN_WIDTH;
r.extent.height = SHIP_WIN_HEIGHT;
SetContext (SpaceContext);
SetFlashRect (&r);
} }
else else
{ {
UnlockShipFrag (&GLOBAL (built_ship_q), // Just exiting escort ship crew edit mode.
hStarShip);
} }
} }