From 785c67bdf97eead821a06abc76c1a16b2ba4c1d6 Mon Sep 17 00:00:00 2001
From: Meep-Eep <Meep-Eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 1 Mar 2008 22:25:31 +0000
Subject: [PATCH] Cleanups.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2945 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/controls.h |  6 ++++--
 sc2/src/sc2code/gameinp.c  | 13 +++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sc2/src/sc2code/controls.h b/sc2/src/sc2code/controls.h
index 3d9110897..0b088357f 100644
--- a/sc2/src/sc2code/controls.h
+++ b/sc2/src/sc2code/controls.h
@@ -94,7 +94,8 @@ typedef BATTLE_INPUT_STATE (*battle_summary_func) (COUNT player,
 extern battle_summary_func ComputerInput, HumanInput[], NetworkInput;
 extern battle_summary_func PlayerInput[];
 
-extern CONTROLLER_INPUT_STATE CurrentInputState, PulsedInputState;
+extern CONTROLLER_INPUT_STATE CurrentInputState;
+extern CONTROLLER_INPUT_STATE PulsedInputState;
 extern volatile CONTROLLER_INPUT_STATE ImmediateInputState;
 extern CONTROL_TEMPLATE PlayerControls[];
 
@@ -115,7 +116,8 @@ void DoInput (void *pInputState, BOOLEAN resetInput);
 
 BATTLE_INPUT_STATE combat_summary (COUNT player, STARSHIP *StarShipPtr);
 
-extern volatile BOOLEAN GamePaused, ExitRequested;
+extern volatile BOOLEAN GamePaused;
+extern volatile BOOLEAN ExitRequested;
 
 typedef struct joy_char joy_char_t;
 
diff --git a/sc2/src/sc2code/gameinp.c b/sc2/src/sc2code/gameinp.c
index f209b024e..e0e8c003c 100644
--- a/sc2/src/sc2code/gameinp.c
+++ b/sc2/src/sc2code/gameinp.c
@@ -105,7 +105,8 @@ ResetKeyRepeat (void)
 }
 
 static void
-_check_for_pulse (int *current, int *cached, int *old, DWORD *accel, DWORD *newtime, DWORD *oldtime)
+_check_for_pulse (int *current, int *cached, int *old, DWORD *accel,
+		DWORD *newtime, DWORD *oldtime)
 {
 	if (*cached && *old)
 	{
@@ -327,7 +328,8 @@ MenuKeysToSoundFlags (const CONTROLLER_INPUT_STATE *state)
 void
 DoInput (void *pInputState, BOOLEAN resetInput)
 {
-	SetMenuRepeatDelay (ACCELERATION_INCREMENT, MENU_REPEAT_DELAY, ACCELERATION_INCREMENT, FALSE);
+	SetMenuRepeatDelay (ACCELERATION_INCREMENT, MENU_REPEAT_DELAY,
+			ACCELERATION_INCREMENT, FALSE);
 	if (resetInput)
 		TFB_ResetControls ();
 
@@ -374,10 +376,7 @@ DoInput (void *pInputState, BOOLEAN resetInput)
 	} while (((INPUT_STATE_DESC*)pInputState)->InputFunc (pInputState));
 
 	if (resetInput)
-	{
 		TFB_ResetControls ();
-	}
-
 }
 
 void
@@ -462,6 +461,8 @@ ConfirmExit (void)
 		
 	result = DoConfirmExit ();
 	
-	SetMenuRepeatDelay (old_min_accel, old_max_accel, old_step_accel, old_gestalt_keys);
+	SetMenuRepeatDelay (old_min_accel, old_max_accel, old_step_accel,
+			old_gestalt_keys);
 	return result;
 }
+