Cleanup: remove MENU_STATE.flash_task completely
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3421 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
|
||||
#include "libs/gfxlib.h"
|
||||
#include "libs/sndlib.h"
|
||||
#include "libs/tasklib.h"
|
||||
#include "flash.h"
|
||||
|
||||
typedef struct menu_state
|
||||
@@ -38,7 +37,6 @@ typedef struct menu_state
|
||||
SIZE delta_item;
|
||||
|
||||
FRAME ModuleFrame;
|
||||
Task flash_task;
|
||||
RECT flash_rect0, flash_rect1;
|
||||
FRAME flash_frame0, flash_frame1;
|
||||
FlashContext *flashContext;
|
||||
|
||||
@@ -273,7 +273,6 @@ OldContext = SetContext (SpaceContext);
|
||||
MenuState.Initialized = FALSE;
|
||||
MenuState.first_item.x = NUM_PICK_SHIP_COLUMNS >> 1;
|
||||
MenuState.first_item.y = 0;
|
||||
MenuState.flash_task = 0;
|
||||
MenuState.CurFrame = 0;
|
||||
MenuState.flash_rect1.corner = pick_r.corner;
|
||||
MenuState.flash_rect1.extent.width = 0;
|
||||
|
||||
@@ -1207,9 +1207,9 @@ ScanSystem (void)
|
||||
{
|
||||
MENU_STATE MenuState;
|
||||
|
||||
memset (&MenuState, 0, sizeof MenuState);
|
||||
|
||||
MenuState.InputFunc = DoScan;
|
||||
MenuState.Initialized = FALSE;
|
||||
MenuState.flash_task = 0;
|
||||
|
||||
if (optWhichMenu == OPT_3DO &&
|
||||
((pSolarSysState->pOrbitalDesc->data_index & PLANET_SHIELDED)
|
||||
|
||||
@@ -317,12 +317,6 @@ DoStarBase (MENU_STATE *pMS)
|
||||
pMS->hMusic = 0;
|
||||
}
|
||||
|
||||
if (pMS->flash_task)
|
||||
{
|
||||
Task_SetState (pMS->flash_task, TASK_EXIT);
|
||||
pMS->flash_task = 0;
|
||||
}
|
||||
|
||||
pMS->Initialized = TRUE;
|
||||
UnlockMutex (GraphicsLock);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user