zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed some warnings

This commit is contained in:
Christoph Oelckers 2020-08-31 19:28:05 +02:00
parent e5d963c515
commit 54d65bfcfc
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/core/statusbar.cpp
View File

@ -826,7 +826,7 @@ short DBaseStatusBar::CalcMagazineAmount(short ammo_remaining, short clip_capaci
short clip_current = ammo_remaining != 0 && clip_amount == 0 ? clip_capacity : clip_amount;
// Return current clip value if weapon has rounds or is not on a reload cycle.
return ammo_remaining == 0 || reloading && clip_amount == 0 ? 0 : clip_current;
return ammo_remaining == 0 || (reloading && clip_amount == 0) ? 0 : clip_current;
}
//============================================================================

1
source/exhumed/src/2d.cpp
View File

@ -1002,7 +1002,6 @@ class DLastLevelCinema : public DScreenJob
int var_28 = 12;
int ebp;
int nEndTime = 240;
int phase = 0;
int nextclock = 4;
unsigned int nStringTypeOn, nCharTypeOn;

7
source/exhumed/src/exhumed.cpp
View File

@ -308,13 +308,6 @@ void mysetbrightness(char nBrightness)
g_visibility = 2048 - (nBrightness << 9);
}
// Replicate original DOS EXE behaviour when pointer is null
static const char *safeStrtok(char *s, const char *d)
{
const char *r = strtok(s, d);
return r ? r : "";
}
void DoClockBeep()
{