Cleanup: decoupled input timeout vars between Melee menu and Main menu

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2513 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/sc2code/melee.c

@@ -187,7 +187,7 @@ FRAME PickMeleeFrame;
 static FRAME MeleeFrame;
 static FRAME BuildPickFrame;
 extern QUEUE master_q;
-extern DWORD InTime;
+DWORD InTime;
 PMELEE_STATE volatile pMeleeState;
 
 static BOOLEAN DoMelee (PMELEE_STATE pMS);
@@ -2862,7 +2862,7 @@ Melee (void)
 		MenuState.InputFunc = DoMelee;
 		MenuState.Initialized = FALSE;
 
-#ifdef NETMELE
+#ifdef NETPLAY
 		{
 			COUNT player;
 			for (player = 0; player < NUM_PLAYERS; player++)

sc2/src/sc2code/restart.c

@@ -106,11 +106,11 @@ DrawRestartMenu (BYTE OldState, BYTE NewState, FRAME f)
 	(void) OldState;  /* Satisfying compiler (unused parameter) */
 }
 
-DWORD InTime;
 
 static BOOLEAN
 DoRestart (PMENU_STATE pMS)
 {
+	static DWORD InTime;
 	static DWORD InactTimeOut;
 
 	/* Cancel any presses of the Pause key. */
@@ -240,14 +240,12 @@ else if (InputState & DEVICE_EXIT) return (FALSE);
 		UnlockMutex (GraphicsLock);
 		MouseError ();
 		SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT);	
-		InTime = GetTimeCounter ();
 		SetTransitionSource (NULL);
 		BatchGraphics ();
 		DrawRestartMenuGraphic (pMS);
 		DrawRestartMenu ((BYTE)~0, pMS->CurState, pMS->CurFrame);
 		ScreenTransition (3, NULL);
 		UnbatchGraphics ();
-		return TRUE;
 	}
 
 	InTime = GetTimeCounter ();