[Sc2-cvs] SF.net SVN: sc2:[3421] trunk/sc2/src/uqm

[<av...@us...>]

Revision: 3421
          http://sc2.svn.sourceforge.net/sc2/?rev=3421&view=rev
Author:   avolkov
Date:     2009-12-10 21:44:21 +0000 (Thu, 10 Dec 2009)

Log Message:
-----------
Cleanup: remove MENU_STATE.flash_task completely

Modified Paths:
--------------
    trunk/sc2/src/uqm/menustat.h
    trunk/sc2/src/uqm/pickship.c
    trunk/sc2/src/uqm/planets/scan.c
    trunk/sc2/src/uqm/starbase.c

Modified: trunk/sc2/src/uqm/menustat.h
===================================================================
--- trunk/sc2/src/uqm/menustat.h	2009-12-10 21:34:12 UTC (rev 3420)
+++ trunk/sc2/src/uqm/menustat.h	2009-12-10 21:44:21 UTC (rev 3421)
@@ -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 @@
 	SIZE delta_item;
 
 	FRAME ModuleFrame;
-	Task flash_task;
 	RECT flash_rect0, flash_rect1;
 	FRAME flash_frame0, flash_frame1;
 	FlashContext *flashContext;

Modified: trunk/sc2/src/uqm/pickship.c
===================================================================
--- trunk/sc2/src/uqm/pickship.c	2009-12-10 21:34:12 UTC (rev 3420)
+++ trunk/sc2/src/uqm/pickship.c	2009-12-10 21:44:21 UTC (rev 3421)
@@ -273,7 +273,6 @@
 		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;

Modified: trunk/sc2/src/uqm/planets/scan.c
===================================================================
--- trunk/sc2/src/uqm/planets/scan.c	2009-12-10 21:34:12 UTC (rev 3420)
+++ trunk/sc2/src/uqm/planets/scan.c	2009-12-10 21:44:21 UTC (rev 3421)
@@ -1207,9 +1207,9 @@
 {
 	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)

Modified: trunk/sc2/src/uqm/starbase.c
===================================================================
--- trunk/sc2/src/uqm/starbase.c	2009-12-10 21:34:12 UTC (rev 3420)
+++ trunk/sc2/src/uqm/starbase.c	2009-12-10 21:44:21 UTC (rev 3421)
@@ -317,12 +317,6 @@
 			pMS->hMusic = 0;
 		}
 
-		if (pMS->flash_task)
-		{
-			Task_SetState (pMS->flash_task, TASK_EXIT);
-			pMS->flash_task = 0;
-		}
-
 		pMS->Initialized = TRUE;
 		UnlockMutex (GraphicsLock);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.