stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 05:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge retry and respawn into one command, respawn.

Browse source
This commit is contained in:
toaster 2019-10-16 11:38:09 +01:00
parent 360ae45994
commit 45e5f70eb8
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/d_netcmd.c
View file

@ -454,7 +454,7 @@ void D_RegisterServerCommands(void)
COM_AddCommand("map", Command_Map_f); COM_AddCommand("map", Command_Map_f);
COM_AddCommand("exitgame", Command_ExitGame_f); COM_AddCommand("exitgame", Command_ExitGame_f);
COM_AddCommand("retry", Command_Retry_f); //COM_AddCommand("retry", Command_Retry_f);
COM_AddCommand("exitlevel", Command_ExitLevel_f); COM_AddCommand("exitlevel", Command_ExitLevel_f);
COM_AddCommand("showmap", Command_Showmap_f); COM_AddCommand("showmap", Command_Showmap_f);
COM_AddCommand("mapmd5", Command_Mapmd5_f); COM_AddCommand("mapmd5", Command_Mapmd5_f);
@ -2034,8 +2034,6 @@ static void Command_Respawn(void)
UINT8 buf[4]; UINT8 buf[4];
UINT8 *cp = buf; UINT8 *cp = buf;
WRITEINT32(cp, consoleplayer);
if (!(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION)) if (!(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION))
{ {
CONS_Printf(M_GetText("You must be in a level to use this.\n")); CONS_Printf(M_GetText("You must be in a level to use this.\n"));
@ -2048,13 +2046,22 @@ static void Command_Respawn(void)
return; return;
} }
// Retry is quicker. Probably should force people to use it. // Retry is quicker.
if (!(netgame || multiplayer)) if (!(netgame || multiplayer))
{ {
CONS_Printf(M_GetText("You can't use this in Single Player! Use \"retry\" instead.\n")); if (!&players[consoleplayer] || players[consoleplayer].lives <= 1)
CONS_Printf(M_GetText("You can't use this without any lives remaining!\n"));
else if (G_IsSpecialStage(gamemap))
CONS_Printf(M_GetText("You can't retry special stages!\n"));
else
{
M_ClearMenus(true);
G_SetRetryFlag();
}
return; return;
} }
WRITEINT32(cp, consoleplayer);
SendNetXCmd(XD_RESPAWN, &buf, 4); SendNetXCmd(XD_RESPAWN, &buf, 4);
} }
@ -4119,6 +4126,8 @@ void Command_ExitGame_f(void)
D_StartTitle(); D_StartTitle();
} }
// see Command_Respawn()
#if 0
void Command_Retry_f(void) void Command_Retry_f(void)
{ {
if (!(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION)) if (!(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION))
@ -4135,6 +4144,7 @@ void Command_Retry_f(void)
G_SetRetryFlag(); G_SetRetryFlag();
} }
} }
#endif
#ifdef NETGAME_DEVMODE #ifdef NETGAME_DEVMODE
// Allow the use of devmode in netgames. // Allow the use of devmode in netgames.

2
src/d_netcmd.h
View file

@ -192,7 +192,7 @@ void D_RegisterServerCommands(void);
void D_RegisterClientCommands(void); void D_RegisterClientCommands(void);
void D_SendPlayerConfig(void); void D_SendPlayerConfig(void);
void Command_ExitGame_f(void); void Command_ExitGame_f(void);
void Command_Retry_f(void); //void Command_Retry_f(void);
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
void D_MapChange(INT32 pmapnum, INT32 pgametype, boolean pultmode, boolean presetplayers, INT32 pdelay, boolean pskipprecutscene, boolean pfromlevelselect); void D_MapChange(INT32 pmapnum, INT32 pgametype, boolean pultmode, boolean presetplayers, INT32 pdelay, boolean pskipprecutscene, boolean pfromlevelselect);
boolean IsPlayerAdmin(INT32 playernum); boolean IsPlayerAdmin(INT32 playernum);