stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 13:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'stop-waddress' into 'master'

Browse source 
Stop -Waddress warnings

See merge request STJr/SRB2!1804
This commit is contained in:
sphere 2022-09-08 14:51:15 +00:00
commit 877ade801b
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/blua/ldump.c
View file

@ -60,7 +60,7 @@ static void DumpVector(const void* b, int n, size_t size, DumpState* D)
static void DumpString(const TString* s, DumpState* D) static void DumpString(const TString* s, DumpState* D)
{ {
if (s==NULL || getstr(s)==NULL) if (s==NULL)
{ {
size_t size=0; size_t size=0;
DumpVar(size,D); DumpVar(size,D);

2
src/d_netcmd.c
View file

@ -4575,7 +4575,7 @@ void Command_Retry_f(void)
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"));
else if (netgame || multiplayer) else if (netgame || multiplayer)
CONS_Printf(M_GetText("This only works in single player.\n")); CONS_Printf(M_GetText("This only works in single player.\n"));
else if (!&players[consoleplayer] || players[consoleplayer].lives <= 1) else if (players[consoleplayer].lives <= 1)
CONS_Printf(M_GetText("You can't retry without any lives remaining!\n")); CONS_Printf(M_GetText("You can't retry without any lives remaining!\n"));
else if (G_IsSpecialStage(gamemap)) else if (G_IsSpecialStage(gamemap))
CONS_Printf(M_GetText("You can't retry special stages!\n")); CONS_Printf(M_GetText("You can't retry special stages!\n"));

15
src/m_menu.c
View file

@ -3686,16 +3686,11 @@ void M_StartControlPanel(void)
} }
else else
{ {
INT32 numlives = 2; INT32 numlives = players[consoleplayer].lives;
SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
if (&players[consoleplayer])
{
numlives = players[consoleplayer].lives;
if (players[consoleplayer].playerstate != PST_LIVE) if (players[consoleplayer].playerstate != PST_LIVE)
++numlives; ++numlives;
}
SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
// The list of things that can disable retrying is (was?) a little too complex // The list of things that can disable retrying is (was?) a little too complex
// for me to want to use the short if statement syntax // for me to want to use the short if statement syntax
@ -3754,7 +3749,7 @@ void M_StartControlPanel(void)
if (G_GametypeHasTeams()) if (G_GametypeHasTeams())
MPauseMenu[mpause_switchteam].status = IT_STRING | IT_SUBMENU; MPauseMenu[mpause_switchteam].status = IT_STRING | IT_SUBMENU;
else if (G_GametypeHasSpectators()) else if (G_GametypeHasSpectators())
MPauseMenu[((&players[consoleplayer] && players[consoleplayer].spectator) ? mpause_entergame : mpause_spectate)].status = IT_STRING | IT_CALL; MPauseMenu[players[consoleplayer].spectator ? mpause_entergame : mpause_spectate].status = IT_STRING | IT_CALL;
else // in this odd case, we still want something to be on the menu even if it's useless else // in this odd case, we still want something to be on the menu even if it's useless
MPauseMenu[mpause_spectate].status = IT_GRAYEDOUT; MPauseMenu[mpause_spectate].status = IT_GRAYEDOUT;
} }
@ -7012,7 +7007,7 @@ static void M_RetryResponse(INT32 ch)
if (ch != 'y' && ch != KEY_ENTER) if (ch != 'y' && ch != KEY_ENTER)
return; return;
if (!&players[consoleplayer] || netgame || multiplayer) // Should never happen! if (netgame || multiplayer) // Should never happen!
return; return;
M_ClearMenus(true); M_ClearMenus(true);

2
src/m_misc.c
View file

@ -833,7 +833,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
else else
snprintf(lvlttltext, 48, "Unknown"); snprintf(lvlttltext, 48, "Unknown");
if (gamestate == GS_LEVEL && &players[displayplayer] && players[displayplayer].mo) if (gamestate == GS_LEVEL && players[displayplayer].mo)
snprintf(locationtxt, 40, "X:%d Y:%d Z:%d A:%d", snprintf(locationtxt, 40, "X:%d Y:%d Z:%d A:%d",
players[displayplayer].mo->x>>FRACBITS, players[displayplayer].mo->x>>FRACBITS,
players[displayplayer].mo->y>>FRACBITS, players[displayplayer].mo->y>>FRACBITS,