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

Cleanup: remove MENU_STATE.flash_task completely

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3421 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-12-10 21:44:21 +00:00
parent f6a1b6973b
commit c9d6ee1bda
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/menustat.h
-2
View File
@@ -21,7 +21,6 @@
#include "libs/gfxlib.h" #include "libs/gfxlib.h"
#include "libs/sndlib.h" #include "libs/sndlib.h"
#include "libs/tasklib.h"
#include "flash.h" #include "flash.h"
typedef struct menu_state typedef struct menu_state
@@ -38,7 +37,6 @@ typedef struct menu_state
SIZE delta_item; SIZE delta_item;
FRAME ModuleFrame; FRAME ModuleFrame;
Task flash_task;
RECT flash_rect0, flash_rect1; RECT flash_rect0, flash_rect1;
FRAME flash_frame0, flash_frame1; FRAME flash_frame0, flash_frame1;
FlashContext *flashContext; FlashContext *flashContext;
sc2/src/uqm/pickship.c
-1
View File
@@ -273,7 +273,6 @@ OldContext = SetContext (SpaceContext);
MenuState.Initialized = FALSE; MenuState.Initialized = FALSE;
MenuState.first_item.x = NUM_PICK_SHIP_COLUMNS >> 1; MenuState.first_item.x = NUM_PICK_SHIP_COLUMNS >> 1;
MenuState.first_item.y = 0; MenuState.first_item.y = 0;
MenuState.flash_task = 0;
MenuState.CurFrame = 0; MenuState.CurFrame = 0;
MenuState.flash_rect1.corner = pick_r.corner; MenuState.flash_rect1.corner = pick_r.corner;
MenuState.flash_rect1.extent.width = 0; MenuState.flash_rect1.extent.width = 0;
sc2/src/uqm/planets/scan.c
+2 -2
View File
@@ -1207,9 +1207,9 @@ ScanSystem (void)
{ {
MENU_STATE MenuState; MENU_STATE MenuState;
memset (&MenuState, 0, sizeof MenuState);
MenuState.InputFunc = DoScan; MenuState.InputFunc = DoScan;
MenuState.Initialized = FALSE;
MenuState.flash_task = 0;
if (optWhichMenu == OPT_3DO && if (optWhichMenu == OPT_3DO &&
((pSolarSysState->pOrbitalDesc->data_index & PLANET_SHIELDED) ((pSolarSysState->pOrbitalDesc->data_index & PLANET_SHIELDED)
sc2/src/uqm/starbase.c
-6
View File
@@ -317,12 +317,6 @@ DoStarBase (MENU_STATE *pMS)
pMS->hMusic = 0; pMS->hMusic = 0;
} }
if (pMS->flash_task)
{
Task_SetState (pMS->flash_task, TASK_EXIT);
pMS->flash_task = 0;
}
pMS->Initialized = TRUE; pMS->Initialized = TRUE;
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);