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

Dead variable MENU_STATE.MenuRepeatDelay removed

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3419 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-12-10 21:01:05 +00:00
parent bce2dc0933
commit c0eb61d875
19 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/battle.c
-1
View File
@@ -266,7 +266,6 @@ DoBattle (BATTLE_STATE *bs)
RECT r; RECT r;
BYTE battle_speed; BYTE battle_speed;
bs->MenuRepeatDelay = 0;
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE); SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
#if defined (NETPLAY) && defined (NETPLAY_CHECKSUM) #if defined (NETPLAY) && defined (NETPLAY_CHECKSUM)
sc2/src/uqm/battle.h
-1
View File
@@ -33,7 +33,6 @@ typedef void (BattleFrameCallback) (void);
typedef struct battlestate_struct { typedef struct battlestate_struct {
BOOLEAN (*InputFunc) (struct battlestate_struct *pInputState); BOOLEAN (*InputFunc) (struct battlestate_struct *pInputState);
COUNT MenuRepeatDelay;
BOOLEAN first_time; BOOLEAN first_time;
DWORD NextTime; DWORD NextTime;
BattleFrameCallback *frame_cb; BattleFrameCallback *frame_cb;
sc2/src/uqm/cnctdlg.c
-2
View File
@@ -37,7 +37,6 @@
typedef struct connect_dialog_state typedef struct connect_dialog_state
{ {
BOOLEAN (*InputFunc) (struct connect_dialog_state *pInputState); BOOLEAN (*InputFunc) (struct connect_dialog_state *pInputState);
COUNT MenuRepeatDelay;
DWORD NextTime; DWORD NextTime;
BOOLEAN Initialized; BOOLEAN Initialized;
@@ -355,7 +354,6 @@ OnTextEntryEvent (WIDGET_TEXTENTRY *widget)
// text entry setup // text entry setup
tes.Initialized = FALSE; tes.Initialized = FALSE;
tes.MenuRepeatDelay = 0;
tes.NextTime = GetTimeCounter () + MENU_FRAME_RATE; tes.NextTime = GetTimeCounter () + MENU_FRAME_RATE;
tes.BaseStr = widget->value; tes.BaseStr = widget->value;
tes.MaxSize = widget->maxlen; tes.MaxSize = widget->maxlen;
sc2/src/uqm/comm.c
-5
View File
@@ -82,7 +82,6 @@ typedef struct response_entry
typedef struct encounter_state typedef struct encounter_state
{ {
BOOLEAN (*InputFunc) (struct encounter_state *pES); BOOLEAN (*InputFunc) (struct encounter_state *pES);
COUNT MenuRepeatDelay;
COUNT Initialized; COUNT Initialized;
TimeCount NextTime; // framerate control TimeCount NextTime; // framerate control
@@ -561,7 +560,6 @@ typedef struct talking_state
{ {
// Fields required by DoInput() // Fields required by DoInput()
BOOLEAN (*InputFunc) (struct talking_state *); BOOLEAN (*InputFunc) (struct talking_state *);
COUNT MenuRepeatDelay;
TimeCount NextTime; // framerate control TimeCount NextTime; // framerate control
COUNT waitTrack; COUNT waitTrack;
@@ -803,7 +801,6 @@ typedef struct summary_state
{ {
// standard state required by DoInput // standard state required by DoInput
BOOLEAN (*InputFunc) (struct summary_state *pSS); BOOLEAN (*InputFunc) (struct summary_state *pSS);
COUNT MenuRepeatDelay;
// extended state // extended state
BOOLEAN Initialized; BOOLEAN Initialized;
@@ -825,7 +822,6 @@ DoConvSummary (SUMMARY_STATE *pSS)
pSS->PrintNext = TRUE; pSS->PrintNext = TRUE;
pSS->NextSub = GetFirstTrackSubtitle (); pSS->NextSub = GetFirstTrackSubtitle ();
pSS->LeftOver = NULL; pSS->LeftOver = NULL;
pSS->MenuRepeatDelay = 0;
pSS->InputFunc = DoConvSummary; pSS->InputFunc = DoConvSummary;
pSS->Initialized = TRUE; pSS->Initialized = TRUE;
DoInput (pSS, FALSE); DoInput (pSS, FALSE);
@@ -1079,7 +1075,6 @@ typedef struct last_replay_state
{ {
// Fields required by DoInput() // Fields required by DoInput()
BOOLEAN (*InputFunc) (struct last_replay_state *); BOOLEAN (*InputFunc) (struct last_replay_state *);
COUNT MenuRepeatDelay;
TimeCount NextTime; // framerate control TimeCount NextTime; // framerate control
TimeCount TimeOut; TimeCount TimeOut;
sc2/src/uqm/confirm.c
-1
View File
@@ -173,7 +173,6 @@ typedef struct popup_state
{ {
// standard state required by DoInput // standard state required by DoInput
BOOLEAN (*InputFunc) (struct popup_state *self); BOOLEAN (*InputFunc) (struct popup_state *self);
COUNT MenuRepeatDelay;
} POPUP_STATE; } POPUP_STATE;
static BOOLEAN static BOOLEAN
sc2/src/uqm/controls.h
-1
View File
@@ -131,7 +131,6 @@ typedef struct textentry_state
{ {
// standard state required by DoInput // standard state required by DoInput
BOOLEAN (*InputFunc) (struct textentry_state *pTES); BOOLEAN (*InputFunc) (struct textentry_state *pTES);
COUNT MenuRepeatDelay;
// these are semi-private read-only // these are semi-private read-only
BOOLEAN Initialized; BOOLEAN Initialized;
sc2/src/uqm/credits.c
-2
View File
@@ -691,7 +691,6 @@ typedef struct
{ {
// standard state required by DoInput // standard state required by DoInput
BOOLEAN (*InputFunc) (void *pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay;
BOOLEAN AllowCancel; BOOLEAN AllowCancel;
BOOLEAN AllowSpeedChange; BOOLEAN AllowSpeedChange;
@@ -825,7 +824,6 @@ Credits (BOOLEAN WithOuttakes)
// nothing to do now but wait until credits // nothing to do now but wait until credits
// are done or canceled by user // are done or canceled by user
cis.MenuRepeatDelay = 0;
cis.InputFunc = DoCreditsInput; cis.InputFunc = DoCreditsInput;
cis.AllowCancel = !WithOuttakes; cis.AllowCancel = !WithOuttakes;
cis.CloseWhenDone = !WithOuttakes; cis.CloseWhenDone = !WithOuttakes;
sc2/src/uqm/gameinp.c
-1
View File
@@ -40,7 +40,6 @@
typedef struct typedef struct
{ {
BOOLEAN (*InputFunc) (void *pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay;
} INPUT_STATE_DESC; } INPUT_STATE_DESC;
/* These static variables are the values that are set by the controllers. */ /* These static variables are the values that are set by the controllers. */
sc2/src/uqm/gameopt.c
-1
View File
@@ -337,7 +337,6 @@ DoNaming (MENU_STATE *pMS)
// text entry setup // text entry setup
tes.Initialized = FALSE; tes.Initialized = FALSE;
tes.MenuRepeatDelay = 0;
tes.BaseStr = buf; tes.BaseStr = buf;
tes.CursorPos = 0; tes.CursorPos = 0;
tes.CbParam = pMS; tes.CbParam = pMS;
sc2/src/uqm/intro.c
-5
View File
@@ -41,7 +41,6 @@ typedef struct
{ {
/* standard state required by DoInput */ /* standard state required by DoInput */
BOOLEAN (*InputFunc) (void *pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay;
/* Presentation state */ /* Presentation state */
TimeCount StartTime; TimeCount StartTime;
@@ -79,7 +78,6 @@ typedef struct
typedef struct { typedef struct {
/* standard state required by DoInput */ /* standard state required by DoInput */
BOOLEAN (*InputFunc) (void *pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay;
/* Spinanim state */ /* Spinanim state */
STAMP anim; STAMP anim;
@@ -91,7 +89,6 @@ typedef struct
{ {
// standard state required by DoInput // standard state required by DoInput
BOOLEAN (*InputFunc) (void *pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay;
LEGACY_VIDEO_REF CurVideo; LEGACY_VIDEO_REF CurVideo;
@@ -778,7 +775,6 @@ ShowSlidePresentation (STRING PresStr)
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE); SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
pis.MenuRepeatDelay = 0;
pis.InputFunc = DoPresentation; pis.InputFunc = DoPresentation;
pis.LastDrawKind = -1; pis.LastDrawKind = -1;
pis.TextVPos = 'B'; pis.TextVPos = 'B';
@@ -874,7 +870,6 @@ ShowLegacyVideo (LEGACY_VIDEO vid)
if (!ref) if (!ref)
return FALSE; return FALSE;
vis.MenuRepeatDelay = 0;
vis.InputFunc = DoVideoInput; vis.InputFunc = DoVideoInput;
vis.CurVideo = ref; vis.CurVideo = ref;
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE); SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
sc2/src/uqm/melee.c
-1
View File
@@ -1128,7 +1128,6 @@ DoEdit (MELEE_STATE *pMS)
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
tes.Initialized = FALSE; tes.Initialized = FALSE;
tes.MenuRepeatDelay = 0;
tes.BaseStr = pMS->SideState[pMS->side].TeamImage.TeamName; tes.BaseStr = pMS->SideState[pMS->side].TeamImage.TeamName;
tes.CursorPos = 0; tes.CursorPos = 0;
tes.MaxSize = MAX_TEAM_CHARS + 1; tes.MaxSize = MAX_TEAM_CHARS + 1;
sc2/src/uqm/melee.h
-1
View File
@@ -103,7 +103,6 @@ struct melee_side_state
struct melee_state struct melee_state
{ {
BOOLEAN (*InputFunc) (struct melee_state *pInputState); BOOLEAN (*InputFunc) (struct melee_state *pInputState);
COUNT MenuRepeatDelay;
BOOLEAN Initialized; BOOLEAN Initialized;
MELEE_OPTIONS MeleeOption; MELEE_OPTIONS MeleeOption;
sc2/src/uqm/menustat.h
+1 -1
View File
@@ -26,8 +26,8 @@
typedef struct menu_state typedef struct menu_state
{ {
// Standard field required by DoInput()
BOOLEAN (*InputFunc) (struct menu_state *pMS); BOOLEAN (*InputFunc) (struct menu_state *pMS);
COUNT MenuRepeatDelay;
SIZE Initialized; SIZE Initialized;
sc2/src/uqm/netplay/netmelee.c
-6
View File
@@ -550,7 +550,6 @@ struct NegotiateReadyState {
// Common fields of INPUT_STATE_DESC, from which this structure // Common fields of INPUT_STATE_DESC, from which this structure
// "inherits". // "inherits".
BOOLEAN(*InputFunc)(void *pInputState); BOOLEAN(*InputFunc)(void *pInputState);
COUNT MenuRepeatDelay;
NetConnection *conn; NetConnection *conn;
NetState nextState; NetState nextState;
@@ -593,7 +592,6 @@ bool
negotiateReady(NetConnection *conn, bool notifyRemote, NetState nextState) { negotiateReady(NetConnection *conn, bool notifyRemote, NetState nextState) {
NegotiateReadyState state; NegotiateReadyState state;
state.InputFunc = (BOOLEAN(*)(void *)) negotiateReadyInputFunc; state.InputFunc = (BOOLEAN(*)(void *)) negotiateReadyInputFunc;
state.MenuRepeatDelay = 0;
state.conn = conn; state.conn = conn;
state.nextState = nextState; state.nextState = nextState;
state.done = false; state.done = false;
@@ -639,7 +637,6 @@ struct WaitReadyState {
// Common fields of INPUT_STATE_DESC, from which this structure // Common fields of INPUT_STATE_DESC, from which this structure
// "inherits". // "inherits".
BOOLEAN(*InputFunc)(void *pInputState); BOOLEAN(*InputFunc)(void *pInputState);
COUNT MenuRepeatDelay;
NetConnection *conn; NetConnection *conn;
NetConnection_ReadyCallback readyCallback; NetConnection_ReadyCallback readyCallback;
@@ -677,7 +674,6 @@ bool
waitReady(NetConnection *conn) { waitReady(NetConnection *conn) {
WaitReadyState state; WaitReadyState state;
state.InputFunc =(BOOLEAN(*)(void *)) waitReadyInputFunc; state.InputFunc =(BOOLEAN(*)(void *)) waitReadyInputFunc;
state.MenuRepeatDelay = 0;
state.conn = conn; state.conn = conn;
state.readyCallback = NetConnection_getReadyCallback(conn); state.readyCallback = NetConnection_getReadyCallback(conn);
state.readyCallbackArg = NetConnection_getReadyCallbackArg(conn); state.readyCallbackArg = NetConnection_getReadyCallbackArg(conn);
@@ -698,7 +694,6 @@ struct WaitResetState {
// Common fields of INPUT_STATE_DESC, from which this structure // Common fields of INPUT_STATE_DESC, from which this structure
// "inherits". // "inherits".
BOOLEAN(*InputFunc)(void *pInputState); BOOLEAN(*InputFunc)(void *pInputState);
COUNT MenuRepeatDelay;
NetConnection *conn; NetConnection *conn;
NetState nextState; NetState nextState;
@@ -743,7 +738,6 @@ bool
waitReset(NetConnection *conn, NetState nextState) { waitReset(NetConnection *conn, NetState nextState) {
WaitResetState state; WaitResetState state;
state.InputFunc = (BOOLEAN(*)(void *)) waitResetInputFunc; state.InputFunc = (BOOLEAN(*)(void *)) waitResetInputFunc;
state.MenuRepeatDelay = 0;
state.conn = conn; state.conn = conn;
state.nextState = nextState; state.nextState = nextState;
state.done = false; state.done = false;
sc2/src/uqm/pickmele.h
+1 -1
View File
@@ -45,7 +45,7 @@ BOOLEAN selectShipNetwork (NetworkInputContext *context, GETMELEE_STATE *gms);
struct getmelee_struct { struct getmelee_struct {
BOOLEAN (*InputFunc) (struct getmelee_struct *pInputState); BOOLEAN (*InputFunc) (struct getmelee_struct *pInputState);
COUNT MenuRepeatDelay;
BOOLEAN Initialized; BOOLEAN Initialized;
struct { struct {
sc2/src/uqm/planets/lander.c
-2
View File
@@ -56,7 +56,6 @@ typedef struct LanderInputState LanderInputState;
struct LanderInputState { struct LanderInputState {
// Fields required by DoInput() // Fields required by DoInput()
BOOLEAN (*InputFunc) (LanderInputState *pMS); BOOLEAN (*InputFunc) (LanderInputState *pMS);
COUNT MenuRepeatDelay;
BOOLEAN Initialized; BOOLEAN Initialized;
TimeCount NextTime; TimeCount NextTime;
@@ -1614,7 +1613,6 @@ DoPlanetSide (LanderInputState *pMS)
if (GLOBAL (CurrentActivity) & CHECK_ABORT) if (GLOBAL (CurrentActivity) & CHECK_ABORT)
return (FALSE); return (FALSE);
pMS->MenuRepeatDelay = 0;
if (!pMS->Initialized) if (!pMS->Initialized)
{ {
COUNT landerSpeedNumer; COUNT landerSpeedNumer;
sc2/src/uqm/planets/pstarmap.c
-1
View File
@@ -1209,7 +1209,6 @@ DoStarSearch (MENU_STATE *pMS)
// text entry setup // text entry setup
tes.Initialized = FALSE; tes.Initialized = FALSE;
tes.MenuRepeatDelay = 0;
tes.BaseStr = pss->Text; tes.BaseStr = pss->Text;
tes.MaxSize = sizeof (pss->Text); tes.MaxSize = sizeof (pss->Text);
tes.CursorPos = 0; tes.CursorPos = 0;
sc2/src/uqm/setupmenu.c
+1 -2
View File
@@ -42,7 +42,7 @@ static STRING SetupTab;
typedef struct setup_menu_state { typedef struct setup_menu_state {
BOOLEAN (*InputFunc) (struct setup_menu_state *pInputState); BOOLEAN (*InputFunc) (struct setup_menu_state *pInputState);
COUNT MenuRepeatDelay;
BOOLEAN initialized; BOOLEAN initialized;
int anim_frame_count; int anim_frame_count;
DWORD NextTime; DWORD NextTime;
@@ -550,7 +550,6 @@ OnTextEntryEvent (WIDGET_TEXTENTRY *widget)
// text entry setup // text entry setup
tes.Initialized = FALSE; tes.Initialized = FALSE;
tes.MenuRepeatDelay = 0;
tes.NextTime = GetTimeCounter () + MENU_FRAME_RATE; tes.NextTime = GetTimeCounter () + MENU_FRAME_RATE;
tes.BaseStr = widget->value; tes.BaseStr = widget->value;
tes.MaxSize = widget->maxlen; tes.MaxSize = widget->maxlen;
sc2/src/uqm/uqmdebug.c
-1
View File
@@ -1838,7 +1838,6 @@ typedef struct wait_state
{ {
// standard state required by DoInput // standard state required by DoInput
BOOLEAN (*InputFunc) (struct wait_state *self); BOOLEAN (*InputFunc) (struct wait_state *self);
COUNT MenuRepeatDelay;
} WAIT_STATE; } WAIT_STATE;