diff --git a/sc2/src/uqm/menustat.h b/sc2/src/uqm/menustat.h index ed37d24ea..43f65894e 100644 --- a/sc2/src/uqm/menustat.h +++ b/sc2/src/uqm/menustat.h @@ -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; diff --git a/sc2/src/uqm/pickship.c b/sc2/src/uqm/pickship.c index c009dd256..2055346a3 100644 --- a/sc2/src/uqm/pickship.c +++ b/sc2/src/uqm/pickship.c @@ -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; diff --git a/sc2/src/uqm/planets/scan.c b/sc2/src/uqm/planets/scan.c index 29d183e6b..7233f1c31 100644 --- a/sc2/src/uqm/planets/scan.c +++ b/sc2/src/uqm/planets/scan.c @@ -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) diff --git a/sc2/src/uqm/starbase.c b/sc2/src/uqm/starbase.c index 2aaf8ed5f..c269bc46b 100644 --- a/sc2/src/uqm/starbase.c +++ b/sc2/src/uqm/starbase.c @@ -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);