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

Cleanups.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2945 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2008-03-01 22:25:31 +00:00
parent 7d84a332f9
commit 785c67bdf9
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/controls.h
+4 -2
View File
@@ -94,7 +94,8 @@ typedef BATTLE_INPUT_STATE (*battle_summary_func) (COUNT player,
extern battle_summary_func ComputerInput, HumanInput[], NetworkInput; extern battle_summary_func ComputerInput, HumanInput[], NetworkInput;
extern battle_summary_func PlayerInput[]; 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 volatile CONTROLLER_INPUT_STATE ImmediateInputState;
extern CONTROL_TEMPLATE PlayerControls[]; extern CONTROL_TEMPLATE PlayerControls[];
@@ -115,7 +116,8 @@ void DoInput (void *pInputState, BOOLEAN resetInput);
BATTLE_INPUT_STATE combat_summary (COUNT player, STARSHIP *StarShipPtr); 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; typedef struct joy_char joy_char_t;
sc2/src/sc2code/gameinp.c
+7 -6
View File
@@ -105,7 +105,8 @@ ResetKeyRepeat (void)
} }
static 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) if (*cached && *old)
{ {
@@ -327,7 +328,8 @@ MenuKeysToSoundFlags (const CONTROLLER_INPUT_STATE *state)
void void
DoInput (void *pInputState, BOOLEAN resetInput) 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) if (resetInput)
TFB_ResetControls (); TFB_ResetControls ();
@@ -374,12 +376,9 @@ DoInput (void *pInputState, BOOLEAN resetInput)
} while (((INPUT_STATE_DESC*)pInputState)->InputFunc (pInputState)); } while (((INPUT_STATE_DESC*)pInputState)->InputFunc (pInputState));
if (resetInput) if (resetInput)
{
TFB_ResetControls (); TFB_ResetControls ();
} }
}
void void
SetMenuSounds (MENU_SOUND_FLAGS s0, MENU_SOUND_FLAGS s1) SetMenuSounds (MENU_SOUND_FLAGS s0, MENU_SOUND_FLAGS s1)
{ {
@@ -462,6 +461,8 @@ ConfirmExit (void)
result = DoConfirmExit (); 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; return result;
} }