Menu
▾
▴
[Sc2-cvs] SF.net SVN: sc2:[3419] trunk/sc2/src/uqm
|
From: <av...@us...> - 2009-12-10 21:01:13
|
Revision: 3419
http://sc2.svn.sourceforge.net/sc2/?rev=3419&view=rev
Author: avolkov
Date: 2009-12-10 21:01:05 +0000 (Thu, 10 Dec 2009)
Log Message:
-----------
Dead variable MENU_STATE.MenuRepeatDelay removed
Modified Paths:
--------------
trunk/sc2/src/uqm/battle.c
trunk/sc2/src/uqm/battle.h
trunk/sc2/src/uqm/cnctdlg.c
trunk/sc2/src/uqm/comm.c
trunk/sc2/src/uqm/confirm.c
trunk/sc2/src/uqm/controls.h
trunk/sc2/src/uqm/credits.c
trunk/sc2/src/uqm/gameinp.c
trunk/sc2/src/uqm/gameopt.c
trunk/sc2/src/uqm/intro.c
trunk/sc2/src/uqm/melee.c
trunk/sc2/src/uqm/melee.h
trunk/sc2/src/uqm/menustat.h
trunk/sc2/src/uqm/netplay/netmelee.c
trunk/sc2/src/uqm/pickmele.h
trunk/sc2/src/uqm/planets/lander.c
trunk/sc2/src/uqm/planets/pstarmap.c
trunk/sc2/src/uqm/setupmenu.c
trunk/sc2/src/uqm/uqmdebug.c
Modified: trunk/sc2/src/uqm/battle.c
===================================================================
--- trunk/sc2/src/uqm/battle.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/battle.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -266,7 +266,6 @@
RECT r;
BYTE battle_speed;
- bs->MenuRepeatDelay = 0;
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
#if defined (NETPLAY) && defined (NETPLAY_CHECKSUM)
Modified: trunk/sc2/src/uqm/battle.h
===================================================================
--- trunk/sc2/src/uqm/battle.h 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/battle.h 2009-12-10 21:01:05 UTC (rev 3419)
@@ -33,7 +33,6 @@
typedef struct battlestate_struct {
BOOLEAN (*InputFunc) (struct battlestate_struct *pInputState);
- COUNT MenuRepeatDelay;
BOOLEAN first_time;
DWORD NextTime;
BattleFrameCallback *frame_cb;
Modified: trunk/sc2/src/uqm/cnctdlg.c
===================================================================
--- trunk/sc2/src/uqm/cnctdlg.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/cnctdlg.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -37,7 +37,6 @@
typedef struct connect_dialog_state
{
BOOLEAN (*InputFunc) (struct connect_dialog_state *pInputState);
- COUNT MenuRepeatDelay;
DWORD NextTime;
BOOLEAN Initialized;
@@ -355,7 +354,6 @@
// text entry setup
tes.Initialized = FALSE;
- tes.MenuRepeatDelay = 0;
tes.NextTime = GetTimeCounter () + MENU_FRAME_RATE;
tes.BaseStr = widget->value;
tes.MaxSize = widget->maxlen;
Modified: trunk/sc2/src/uqm/comm.c
===================================================================
--- trunk/sc2/src/uqm/comm.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/comm.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -82,7 +82,6 @@
typedef struct encounter_state
{
BOOLEAN (*InputFunc) (struct encounter_state *pES);
- COUNT MenuRepeatDelay;
COUNT Initialized;
TimeCount NextTime; // framerate control
@@ -561,7 +560,6 @@
{
// Fields required by DoInput()
BOOLEAN (*InputFunc) (struct talking_state *);
- COUNT MenuRepeatDelay;
TimeCount NextTime; // framerate control
COUNT waitTrack;
@@ -803,7 +801,6 @@
{
// standard state required by DoInput
BOOLEAN (*InputFunc) (struct summary_state *pSS);
- COUNT MenuRepeatDelay;
// extended state
BOOLEAN Initialized;
@@ -825,7 +822,6 @@
pSS->PrintNext = TRUE;
pSS->NextSub = GetFirstTrackSubtitle ();
pSS->LeftOver = NULL;
- pSS->MenuRepeatDelay = 0;
pSS->InputFunc = DoConvSummary;
pSS->Initialized = TRUE;
DoInput (pSS, FALSE);
@@ -1079,7 +1075,6 @@
{
// Fields required by DoInput()
BOOLEAN (*InputFunc) (struct last_replay_state *);
- COUNT MenuRepeatDelay;
TimeCount NextTime; // framerate control
TimeCount TimeOut;
Modified: trunk/sc2/src/uqm/confirm.c
===================================================================
--- trunk/sc2/src/uqm/confirm.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/confirm.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -173,7 +173,6 @@
{
// standard state required by DoInput
BOOLEAN (*InputFunc) (struct popup_state *self);
- COUNT MenuRepeatDelay;
} POPUP_STATE;
static BOOLEAN
Modified: trunk/sc2/src/uqm/controls.h
===================================================================
--- trunk/sc2/src/uqm/controls.h 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/controls.h 2009-12-10 21:01:05 UTC (rev 3419)
@@ -131,7 +131,6 @@
{
// standard state required by DoInput
BOOLEAN (*InputFunc) (struct textentry_state *pTES);
- COUNT MenuRepeatDelay;
// these are semi-private read-only
BOOLEAN Initialized;
Modified: trunk/sc2/src/uqm/credits.c
===================================================================
--- trunk/sc2/src/uqm/credits.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/credits.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -691,7 +691,6 @@
{
// standard state required by DoInput
BOOLEAN (*InputFunc) (void *pInputState);
- COUNT MenuRepeatDelay;
BOOLEAN AllowCancel;
BOOLEAN AllowSpeedChange;
@@ -825,7 +824,6 @@
// nothing to do now but wait until credits
// are done or canceled by user
- cis.MenuRepeatDelay = 0;
cis.InputFunc = DoCreditsInput;
cis.AllowCancel = !WithOuttakes;
cis.CloseWhenDone = !WithOuttakes;
Modified: trunk/sc2/src/uqm/gameinp.c
===================================================================
--- trunk/sc2/src/uqm/gameinp.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/gameinp.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -40,7 +40,6 @@
typedef struct
{
BOOLEAN (*InputFunc) (void *pInputState);
- COUNT MenuRepeatDelay;
} INPUT_STATE_DESC;
/* These static variables are the values that are set by the controllers. */
Modified: trunk/sc2/src/uqm/gameopt.c
===================================================================
--- trunk/sc2/src/uqm/gameopt.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/gameopt.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -337,7 +337,6 @@
// text entry setup
tes.Initialized = FALSE;
- tes.MenuRepeatDelay = 0;
tes.BaseStr = buf;
tes.CursorPos = 0;
tes.CbParam = pMS;
Modified: trunk/sc2/src/uqm/intro.c
===================================================================
--- trunk/sc2/src/uqm/intro.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/intro.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -41,7 +41,6 @@
{
/* standard state required by DoInput */
BOOLEAN (*InputFunc) (void *pInputState);
- COUNT MenuRepeatDelay;
/* Presentation state */
TimeCount StartTime;
@@ -79,7 +78,6 @@
typedef struct {
/* standard state required by DoInput */
BOOLEAN (*InputFunc) (void *pInputState);
- COUNT MenuRepeatDelay;
/* Spinanim state */
STAMP anim;
@@ -91,7 +89,6 @@
{
// standard state required by DoInput
BOOLEAN (*InputFunc) (void *pInputState);
- COUNT MenuRepeatDelay;
LEGACY_VIDEO_REF CurVideo;
@@ -778,7 +775,6 @@
UnlockMutex (GraphicsLock);
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
- pis.MenuRepeatDelay = 0;
pis.InputFunc = DoPresentation;
pis.LastDrawKind = -1;
pis.TextVPos = 'B';
@@ -874,7 +870,6 @@
if (!ref)
return FALSE;
- vis.MenuRepeatDelay = 0;
vis.InputFunc = DoVideoInput;
vis.CurVideo = ref;
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
Modified: trunk/sc2/src/uqm/melee.c
===================================================================
--- trunk/sc2/src/uqm/melee.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/melee.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -1128,7 +1128,6 @@
UnlockMutex (GraphicsLock);
tes.Initialized = FALSE;
- tes.MenuRepeatDelay = 0;
tes.BaseStr = pMS->SideState[pMS->side].TeamImage.TeamName;
tes.CursorPos = 0;
tes.MaxSize = MAX_TEAM_CHARS + 1;
Modified: trunk/sc2/src/uqm/melee.h
===================================================================
--- trunk/sc2/src/uqm/melee.h 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/melee.h 2009-12-10 21:01:05 UTC (rev 3419)
@@ -103,7 +103,6 @@
struct melee_state
{
BOOLEAN (*InputFunc) (struct melee_state *pInputState);
- COUNT MenuRepeatDelay;
BOOLEAN Initialized;
MELEE_OPTIONS MeleeOption;
Modified: trunk/sc2/src/uqm/menustat.h
===================================================================
--- trunk/sc2/src/uqm/menustat.h 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/menustat.h 2009-12-10 21:01:05 UTC (rev 3419)
@@ -26,8 +26,8 @@
typedef struct menu_state
{
+ // Standard field required by DoInput()
BOOLEAN (*InputFunc) (struct menu_state *pMS);
- COUNT MenuRepeatDelay;
SIZE Initialized;
Modified: trunk/sc2/src/uqm/netplay/netmelee.c
===================================================================
--- trunk/sc2/src/uqm/netplay/netmelee.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/netplay/netmelee.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -550,7 +550,6 @@
// Common fields of INPUT_STATE_DESC, from which this structure
// "inherits".
BOOLEAN(*InputFunc)(void *pInputState);
- COUNT MenuRepeatDelay;
NetConnection *conn;
NetState nextState;
@@ -593,7 +592,6 @@
negotiateReady(NetConnection *conn, bool notifyRemote, NetState nextState) {
NegotiateReadyState state;
state.InputFunc = (BOOLEAN(*)(void *)) negotiateReadyInputFunc;
- state.MenuRepeatDelay = 0;
state.conn = conn;
state.nextState = nextState;
state.done = false;
@@ -639,7 +637,6 @@
// Common fields of INPUT_STATE_DESC, from which this structure
// "inherits".
BOOLEAN(*InputFunc)(void *pInputState);
- COUNT MenuRepeatDelay;
NetConnection *conn;
NetConnection_ReadyCallback readyCallback;
@@ -677,7 +674,6 @@
waitReady(NetConnection *conn) {
WaitReadyState state;
state.InputFunc =(BOOLEAN(*)(void *)) waitReadyInputFunc;
- state.MenuRepeatDelay = 0;
state.conn = conn;
state.readyCallback = NetConnection_getReadyCallback(conn);
state.readyCallbackArg = NetConnection_getReadyCallbackArg(conn);
@@ -698,7 +694,6 @@
// Common fields of INPUT_STATE_DESC, from which this structure
// "inherits".
BOOLEAN(*InputFunc)(void *pInputState);
- COUNT MenuRepeatDelay;
NetConnection *conn;
NetState nextState;
@@ -743,7 +738,6 @@
waitReset(NetConnection *conn, NetState nextState) {
WaitResetState state;
state.InputFunc = (BOOLEAN(*)(void *)) waitResetInputFunc;
- state.MenuRepeatDelay = 0;
state.conn = conn;
state.nextState = nextState;
state.done = false;
Modified: trunk/sc2/src/uqm/pickmele.h
===================================================================
--- trunk/sc2/src/uqm/pickmele.h 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/pickmele.h 2009-12-10 21:01:05 UTC (rev 3419)
@@ -45,7 +45,7 @@
struct getmelee_struct {
BOOLEAN (*InputFunc) (struct getmelee_struct *pInputState);
- COUNT MenuRepeatDelay;
+
BOOLEAN Initialized;
struct {
Modified: trunk/sc2/src/uqm/planets/lander.c
===================================================================
--- trunk/sc2/src/uqm/planets/lander.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/planets/lander.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -56,7 +56,6 @@
struct LanderInputState {
// Fields required by DoInput()
BOOLEAN (*InputFunc) (LanderInputState *pMS);
- COUNT MenuRepeatDelay;
BOOLEAN Initialized;
TimeCount NextTime;
@@ -1614,7 +1613,6 @@
if (GLOBAL (CurrentActivity) & CHECK_ABORT)
return (FALSE);
- pMS->MenuRepeatDelay = 0;
if (!pMS->Initialized)
{
COUNT landerSpeedNumer;
Modified: trunk/sc2/src/uqm/planets/pstarmap.c
===================================================================
--- trunk/sc2/src/uqm/planets/pstarmap.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/planets/pstarmap.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -1209,7 +1209,6 @@
// text entry setup
tes.Initialized = FALSE;
- tes.MenuRepeatDelay = 0;
tes.BaseStr = pss->Text;
tes.MaxSize = sizeof (pss->Text);
tes.CursorPos = 0;
Modified: trunk/sc2/src/uqm/setupmenu.c
===================================================================
--- trunk/sc2/src/uqm/setupmenu.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/setupmenu.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -42,7 +42,7 @@
typedef struct setup_menu_state {
BOOLEAN (*InputFunc) (struct setup_menu_state *pInputState);
- COUNT MenuRepeatDelay;
+
BOOLEAN initialized;
int anim_frame_count;
DWORD NextTime;
@@ -550,7 +550,6 @@
// text entry setup
tes.Initialized = FALSE;
- tes.MenuRepeatDelay = 0;
tes.NextTime = GetTimeCounter () + MENU_FRAME_RATE;
tes.BaseStr = widget->value;
tes.MaxSize = widget->maxlen;
Modified: trunk/sc2/src/uqm/uqmdebug.c
===================================================================
--- trunk/sc2/src/uqm/uqmdebug.c 2009-12-10 20:52:20 UTC (rev 3418)
+++ trunk/sc2/src/uqm/uqmdebug.c 2009-12-10 21:01:05 UTC (rev 3419)
@@ -1838,7 +1838,6 @@
{
// standard state required by DoInput
BOOLEAN (*InputFunc) (struct wait_state *self);
- COUNT MenuRepeatDelay;
} WAIT_STATE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
