diff --git a/src/blua/ldump.c b/src/blua/ldump.c index c9d3d4870..b69a12729 100644 --- a/src/blua/ldump.c +++ b/src/blua/ldump.c @@ -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) { - if (s==NULL || getstr(s)==NULL) + if (s==NULL) { size_t size=0; DumpVar(size,D); diff --git a/src/m_menu.c b/src/m_menu.c index 6b7179bee..ba2a1073f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6300,7 +6300,7 @@ static void M_RetryResponse(INT32 ch) if (ch != 'y' && ch != KEY_ENTER) return; - if (!&players[consoleplayer] || netgame || multiplayer) // Should never happen! + if (netgame || multiplayer) // Should never happen! return; M_ClearMenus(true); diff --git a/src/m_misc.c b/src/m_misc.c index 181930464..307146d7d 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -762,7 +762,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png else snprintf(lvlttltext, 48, "Unknown"); - if (gamestate == GS_LEVEL && &players[displayplayers[0]] && players[displayplayers[0]].mo) + if (gamestate == GS_LEVEL && players[displayplayers[0]].mo) snprintf(locationtxt, 40, "X:%d Y:%d Z:%d A:%d", players[displayplayers[0]].mo->x>>FRACBITS, players[displayplayers[0]].mo->y>>FRACBITS, diff --git a/src/w_wad.c b/src/w_wad.c index d8065b0f8..283c4a252 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1683,7 +1683,7 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist, continue; for (j = 0; j < NUMSPRITES; j++) - if (sprnames[j] && !strncmp(lumpinfo.name, sprnames[j], 4)) // Sprites + if (sprnames[j][0] && !strncmp(lumpinfo.name, sprnames[j], 4)) // Sprites continue; goodfile = false;