zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename menu functions to what I consider to be more sane names. No other changes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5923 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-11-01 01:35:32 +00:00
parent 1139c58e27
commit 54b22b182a
9 changed files with 451 additions and 451 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
polymer/eduke32/source/demo.c
View file

@ -55,9 +55,9 @@ static int32_t demo_synccompress=1, demorec_seeds=1, demo_hasseeds;
static void Demo_RestoreModes(int32_t menu)
{
if (menu)
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
else
M_CloseMenu(myconnectindex);
Menu_Close(myconnectindex);
g_player[myconnectindex].ps->gm &= ~MODE_GAME;
g_player[myconnectindex].ps->gm |= MODE_DEMO;
@ -565,7 +565,7 @@ RECHECK:
{
FX_StopAllSounds();
S_ClearSoundLocks();
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
}
ready2send = 0;
@ -706,7 +706,7 @@ RECHECK:
corrupt:
OSD_Printf(OSD_ERROR "Demo %d is corrupt (code %d).\n", g_whichDemo-1, corruptcode);
nextdemo:
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
nextdemo_nomenu:
foundemo = 0;
ud.reccnt = 0;
@ -922,8 +922,8 @@ nextdemo_nomenu:
I_EscapeTriggerClear();
FX_StopAllSounds();
S_ClearSoundLocks();
M_OpenMenu(myconnectindex);
M_ChangeMenu(MENU_MAIN);
Menu_Open(myconnectindex);
Menu_Change(MENU_MAIN);
S_MenuSound();
}
@ -939,7 +939,7 @@ nextdemo_nomenu:
if ((g_player[myconnectindex].ps->gm&MODE_TYPE) != MODE_TYPE)
{
g_player[myconnectindex].ps->gm = 0;
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
}
}
else
@ -947,7 +947,7 @@ nextdemo_nomenu:
if (ud.recstat != 2)
M_DisplayMenus();
if ((g_netServer || ud.multimode > 1) && !M_IsTextInput(m_currentMenu))
if ((g_netServer || ud.multimode > 1) && !Menu_IsTextInput(m_currentMenu))
{
ControlInfo noshareinfo;
CONTROL_GetInput(&noshareinfo);

36
polymer/eduke32/source/game.c
View file

@ -4718,9 +4718,9 @@ void G_HandleLocalKeys(void)
{
KB_ClearKeyDown(sc_F1);
M_ChangeMenu(MENU_STORY);
Menu_Change(MENU_STORY);
S_PauseSounds(1);
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
if ((!g_netServer && ud.multimode < 2))
{
@ -4743,14 +4743,14 @@ FAKE_F2:
return;
}
M_ChangeMenu(MENU_SAVE);
Menu_Change(MENU_SAVE);
g_screenCapture = 1;
G_DrawRooms(myconnectindex,65536);
g_screenCapture = 0;
S_PauseSounds(1);
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
if ((!g_netServer && ud.multimode < 2))
{
@ -4765,9 +4765,9 @@ FAKE_F2:
KB_ClearKeyDown(sc_F3);
FAKE_F3:
M_ChangeMenu(MENU_LOAD);
Menu_Change(MENU_LOAD);
S_PauseSounds(1);
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
if ((!g_netServer && ud.multimode < 2) && ud.recstat != 2)
{
@ -4784,7 +4784,7 @@ FAKE_F3:
KB_ClearKeyDown(sc_F4);
S_PauseSounds(1);
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
if ((!g_netServer && ud.multimode < 2) && ud.recstat != 2)
{
@ -4792,7 +4792,7 @@ FAKE_F3:
totalclock = ototalclock;
}
M_ChangeMenu(MENU_SOUND_INGAME);
Menu_Change(MENU_SOUND_INGAME);
}
if (KB_UnBoundKeyPressed(sc_F5) && ud.config.MusicToggle)
@ -4887,9 +4887,9 @@ FAKE_F3:
{
KB_ClearKeyDown(sc_F10);
M_ChangeMenu(MENU_QUIT_INGAME);
Menu_Change(MENU_QUIT_INGAME);
S_PauseSounds(1);
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
if ((!g_netServer && ud.multimode < 2) && ud.recstat != 2)
{
@ -4902,9 +4902,9 @@ FAKE_F3:
{
KB_ClearKeyDown(sc_F11);
M_ChangeMenu(MENU_COLCORR_INGAME);
Menu_Change(MENU_COLCORR_INGAME);
S_PauseSounds(1);
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
if ((!g_netServer && ud.multimode < 2) && ud.recstat != 2)
{
@ -5934,8 +5934,8 @@ void G_BackToMenu(void)
if (ud.recstat == 1) G_CloseDemoWrite();
ud.warp_on = 0;
g_player[myconnectindex].ps->gm = 0;
M_OpenMenu(myconnectindex);
M_ChangeMenu(MENU_MAIN);
Menu_Open(myconnectindex);
Menu_Change(MENU_MAIN);
KB_FlushKeyboardQueue();
G_UpdateAppTitle();
}
@ -5971,8 +5971,8 @@ static int G_EndOfLevel(void)
if (!VOLUMEALL)
G_DoOrderScreen();
g_player[myconnectindex].ps->gm = 0;
M_OpenMenu(myconnectindex);
M_ChangeMenu(MENU_MAIN);
Menu_Open(myconnectindex);
Menu_Change(MENU_MAIN);
return 2;
}
else
@ -6458,7 +6458,7 @@ int app_main(int argc, char const * const * argv)
OSD_Exec("autoexec.cfg");
M_Init();
Menu_Init();
if (ud.warp_on > 1 && (!g_netServer && ud.multimode < 2))
{
@ -6486,7 +6486,7 @@ MAIN_LOOP_RESTART:
g_player[myconnectindex].ps->fta = 0;
M_ChangeMenu(MENU_MAIN);
Menu_Change(MENU_MAIN);
if (g_networkMode != NET_DEDICATED_SERVER)
{

6
polymer/eduke32/source/gameexec.c
View file

@ -1024,10 +1024,10 @@ static int32_t VM_ResetPlayer(int playerNum, int32_t vmFlags, int32_t resetFlags
{
if (g_lastSaveSlot >= 0 && ud.recstat != 2 && !(resetFlags & 1))
{
M_OpenMenu(playerNum);
Menu_Open(playerNum);
KB_ClearKeyDown(sc_Space);
I_AdvanceTriggerClear();
M_ChangeMenu(MENU_RESETPLAYER);
Menu_Change(MENU_RESETPLAYER);
}
else g_player[playerNum].ps->gm = MODE_RESTART;
#if !defined LUNATIC
@ -2741,7 +2741,7 @@ nullquote:
case CON_CMENU:
insptr++;
M_ChangeMenu(Gv_GetVarX(*insptr++));
Menu_Change(Gv_GetVarX(*insptr++));
continue;
case CON_SOUNDVAR:

4
polymer/eduke32/source/gamestructures.c
View file

@ -698,9 +698,9 @@ void __fastcall VM_SetPlayer(register int32_t const playerNum, register int32_t
case PLAYER_SCREAM_VOICE: ps->scream_voice = iSet; break;
case PLAYER_GM:
if (!(ps->gm & MODE_MENU) && (iSet & MODE_MENU))
M_OpenMenu(playerNum);
Menu_Open(playerNum);
else if ((ps->gm & MODE_MENU) && !(iSet & MODE_MENU))
M_CloseMenu(playerNum);
Menu_Close(playerNum);
ps->gm = iSet;
break;
case PLAYER_ON_WARPING_SECTOR: ps->on_warping_sector = iSet; break;

810
polymer/eduke32/source/menus.c
View file

File diff suppressed because it is too large Load diff

12
polymer/eduke32/source/menus.h
View file

@ -432,13 +432,13 @@ extern int32_t g_lastSaveSlot;
extern int32_t g_quitDeadline;
extern int32_t voting;
int32_t menutext_(int32_t x,int32_t y,int32_t s,int32_t p,char const *t,int32_t bits);
int M_ChangeMenu(int32_t cm);
void M_ChangeMenuAnimate(int32_t cm, MenuAnimationType_t animtype);
int32_t M_IsTextInput(Menu_t *cm);
int Menu_Change(int32_t cm);
void Menu_AnimateChange(int32_t cm, MenuAnimationType_t animtype);
int32_t Menu_IsTextInput(Menu_t *cm);
void G_CheckPlayerColor(int32_t *color,int32_t prev_color);
void M_Init(void);
void M_OpenMenu(size_t playerID);
void M_CloseMenu(size_t playerID);
void Menu_Init(void);
void Menu_Open(size_t playerID);
void Menu_Close(size_t playerID);
void M_DisplayMenus(void);
#define M_MOUSETIMEOUT 210

6
polymer/eduke32/source/osdcmds.c
View file

@ -124,7 +124,7 @@ static int32_t osdcmd_changelevel(const osdfuncparm_t *parm)
ud.m_noexits = 0;
M_OpenMenu(myconnectindex);
M_ChangeMenu(MENU_NETWAITVOTES);
Menu_Change(MENU_NETWAITVOTES);
}
*/
return OSDCMD_OK;
@ -261,7 +261,7 @@ static int32_t osdcmd_map(const osdfuncparm_t *parm)
ud.m_noexits = 0;
M_OpenMenu(myconnectindex);
M_ChangeMenu(MENU_NETWAITVOTES);
Menu_Change(MENU_NETWAITVOTES);
}
*/
return OSDCMD_OK;
@ -722,7 +722,7 @@ static int32_t osdcmd_cmenu(const osdfuncparm_t *parm)
}
else
{
M_ChangeMenu(Batol(parm->parms[0]));
Menu_Change(Batol(parm->parms[0]));
}
return OSDCMD_OK;

4
polymer/eduke32/source/premap.c
View file

@ -1411,7 +1411,7 @@ end_vol4a:
pPlayer->zoom = 768;
#endif
pPlayer->gm = 0;
M_CloseMenu(0);
Menu_Close(0);
#if !defined LUNATIC
//AddLog("Newgame");
@ -1917,7 +1917,7 @@ int G_EnterLevel(int gameMode)
for (TRAVERSE_CONNECT(i))
{
g_player[i].ps->gm = MODE_GAME;
M_CloseMenu(i);
Menu_Close(i);
}
}
else if (gameMode & MODE_RESTART)

8
polymer/eduke32/source/screens.c
View file

@ -1093,7 +1093,7 @@ void G_DisplayRest(int32_t smoothratio)
{
I_EscapeTriggerClear();
S_PlaySound(EXITMENUSOUND);
M_ChangeMenu(MENU_CLOSE);
Menu_Change(MENU_CLOSE);
if (!ud.pause_on)
S_PauseSounds(0);
}
@ -1104,12 +1104,12 @@ void G_DisplayRest(int32_t smoothratio)
I_EscapeTriggerClear();
S_PauseSounds(1);
M_OpenMenu(myconnectindex);
Menu_Open(myconnectindex);
if ((!g_netServer && ud.multimode < 2) && ud.recstat != 2) ready2send = 0;
if (g_player[myconnectindex].ps->gm&MODE_GAME) M_ChangeMenu(MENU_MAIN_INGAME);
else M_ChangeMenu(MENU_MAIN);
if (g_player[myconnectindex].ps->gm&MODE_GAME) Menu_Change(MENU_MAIN_INGAME);
else Menu_Change(MENU_MAIN);
screenpeek = myconnectindex;
S_MenuSound();