Menu
▾
▴
[Sc2-cvs] SF.net SVN: sc2:[3388] trunk/sc2/src/uqm
|
From: <av...@us...> - 2009-12-04 00:42:48
|
Revision: 3388
http://sc2.svn.sourceforge.net/sc2/?rev=3388&view=rev
Author: avolkov
Date: 2009-12-04 00:12:12 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Cleanup of key repeat set functions usage
Modified Paths:
--------------
trunk/sc2/src/uqm/gameinp.c
trunk/sc2/src/uqm/hyper.c
trunk/sc2/src/uqm/pickmele.c
trunk/sc2/src/uqm/planets/planets.c
trunk/sc2/src/uqm/planets/pstarmap.c
trunk/sc2/src/uqm/planets/scan.c
trunk/sc2/src/uqm/planets/solarsys.c
trunk/sc2/src/uqm/restart.c
Modified: trunk/sc2/src/uqm/gameinp.c
===================================================================
--- trunk/sc2/src/uqm/gameinp.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/gameinp.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -34,7 +34,7 @@
#define ACCELERATION_INCREMENT (ONE_SECOND / 12)
-#define MENU_REPEAT_DELAY (ONE_SECOND >> 1)
+#define MENU_REPEAT_DELAY (ONE_SECOND / 2)
typedef struct
@@ -283,18 +283,18 @@
_max_accel = max;
_step_accel = step;
_gestalt_keys = gestalt;
- _clear_menu_state ();
+ //_clear_menu_state ();
ResetKeyRepeat ();
}
void
-SetDefaultMenuRepeatDelay ()
+SetDefaultMenuRepeatDelay (void)
{
_min_accel = ACCELERATION_INCREMENT;
_max_accel = MENU_REPEAT_DELAY;
_step_accel = ACCELERATION_INCREMENT;
_gestalt_keys = FALSE;
- _clear_menu_state ();
+ //_clear_menu_state ();
ResetKeyRepeat ();
}
@@ -340,8 +340,6 @@
void
DoInput (void *pInputState, BOOLEAN resetInput)
{
- SetMenuRepeatDelay (ACCELERATION_INCREMENT, MENU_REPEAT_DELAY,
- ACCELERATION_INCREMENT, FALSE);
if (resetInput)
FlushInput ();
Modified: trunk/sc2/src/uqm/hyper.c
===================================================================
--- trunk/sc2/src/uqm/hyper.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/hyper.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -1655,7 +1655,6 @@
break;
case STARMAP:
StarMap ();
- SetDefaultMenuRepeatDelay ();
return FALSE;
case NAVIGATION:
return FALSE;
Modified: trunk/sc2/src/uqm/pickmele.c
===================================================================
--- trunk/sc2/src/uqm/pickmele.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/pickmele.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -618,7 +618,7 @@
SetContext (OffScreenContext);
UnlockMutex (GraphicsLock);
- ResetKeyRepeat ();
+
DoInput (&gmstate, FALSE);
WaitForSoundEnd (0);
Modified: trunk/sc2/src/uqm/planets/planets.c
===================================================================
--- trunk/sc2/src/uqm/planets/planets.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/planets/planets.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -424,7 +424,6 @@
TaskSwitch ();
AutoPilotSet = StarMap ();
- SetDefaultMenuRepeatDelay ();
if (GLOBAL (CurrentActivity) & CHECK_ABORT)
return FALSE;
Modified: trunk/sc2/src/uqm/planets/pstarmap.c
===================================================================
--- trunk/sc2/src/uqm/planets/pstarmap.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/planets/pstarmap.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -1216,6 +1216,7 @@
tes.FrameCallback = OnStarNameFrame;
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
+ SetDefaultMenuRepeatDelay ();
success = DoTextEntry (&tes);
LockMutex (GraphicsLock);
@@ -1243,9 +1244,6 @@
pMS->Initialized = TRUE;
pMS->InputFunc = DoMoveCursor;
- SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
- SetMenuRepeatDelay (MIN_ACCEL_DELAY, MAX_ACCEL_DELAY, STEP_ACCEL_DELAY, TRUE);
-
if (LOBYTE (GLOBAL (CurrentActivity)) != IN_HYPERSPACE)
universe = CurStarDescPtr->star_pt;
else
@@ -1636,8 +1634,12 @@
UnbatchGraphics ();
UnlockMutex (GraphicsLock);
+ SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
+ SetMenuRepeatDelay (MIN_ACCEL_DELAY, MAX_ACCEL_DELAY, STEP_ACCEL_DELAY,
+ TRUE);
DoInput (&MenuState, FALSE);
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
+ SetDefaultMenuRepeatDelay ();
LockMutex (GraphicsLock);
DrawHyperCoords (universe);
Modified: trunk/sc2/src/uqm/planets/scan.c
===================================================================
--- trunk/sc2/src/uqm/planets/scan.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/planets/scan.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -656,7 +656,6 @@
if (!pMS->Initialized)
{
pMS->InputFunc = PickPlanetSide;
- SetMenuRepeatDelay (0, 0, 0, FALSE);
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
if (!select)
{
@@ -756,7 +755,6 @@
pMS->InputFunc = DoScan;
pMS->CurState = DISPATCH_SHUTTLE;
- SetDefaultMenuRepeatDelay ();
}
else
{
@@ -766,13 +764,13 @@
new_pt = planetLoc;
- if (PulsedInputState.menu[KEY_MENU_LEFT])
+ if (CurrentInputState.menu[KEY_MENU_LEFT])
dx = -1;
- if (PulsedInputState.menu[KEY_MENU_RIGHT])
+ if (CurrentInputState.menu[KEY_MENU_RIGHT])
dx = 1;
- if (PulsedInputState.menu[KEY_MENU_UP])
+ if (CurrentInputState.menu[KEY_MENU_UP])
dy = -1;
- if (PulsedInputState.menu[KEY_MENU_DOWN])
+ if (CurrentInputState.menu[KEY_MENU_DOWN])
dy = 1;
LockMutex (GraphicsLock);
Modified: trunk/sc2/src/uqm/planets/solarsys.c
===================================================================
--- trunk/sc2/src/uqm/planets/solarsys.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/planets/solarsys.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -1960,8 +1960,6 @@
break;
case STARMAP:
StarMap ();
- SetDefaultMenuRepeatDelay ();
-
if (GLOBAL (CurrentActivity) & CHECK_ABORT)
return FALSE;
Modified: trunk/sc2/src/uqm/restart.c
===================================================================
--- trunk/sc2/src/uqm/restart.c 2009-12-03 22:38:07 UTC (rev 3387)
+++ trunk/sc2/src/uqm/restart.c 2009-12-04 00:12:12 UTC (rev 3388)
@@ -318,6 +318,7 @@
DrawRestartMenuGraphic (pMS);
GLOBAL (CurrentActivity) &= ~CHECK_ABORT;
SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT);
+ SetDefaultMenuRepeatDelay ();
DoInput (pMS, TRUE);
StopMusic ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
