ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-02-22 19:41:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up CG_DrawProxWarning design

Browse source 
Hopefully fixes the following warning
cg_draw.c:2315 assuming signed overflow does not occur when assuming that (X + c) < X is always false [-Wstrict-overflow]
This commit is contained in:
Zack Middleton 2015-03-20 21:09:04 -05:00
parent c4a2836269
commit 5fb49acda8
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/cgame/cg_draw.c
View file

@ -2298,8 +2298,7 @@ static void CG_DrawProxWarning( void ) {
char s [32]; char s [32];
int w; int w;
static int proxTime; static int proxTime;
static int proxCounter; int proxTick;
static int proxTick;
if( !(cg.snap->ps.eFlags & EF_TICKING ) ) { if( !(cg.snap->ps.eFlags & EF_TICKING ) ) {
proxTime = 0; proxTime = 0;
@ -2307,17 +2306,12 @@ static void CG_DrawProxWarning( void ) {
} }
if (proxTime == 0) { if (proxTime == 0) {
proxTime = cg.time + 5000; proxTime = cg.time;
proxCounter = 5;
proxTick = 0;
} }
if (cg.time > proxTime) { proxTick = 10 - ((cg.time - proxTime) / 1000);
proxTick = proxCounter--;
proxTime = cg.time + 1000;
}
if (proxTick != 0) { if (proxTick > 0 && proxTick <= 5) {
Com_sprintf(s, sizeof(s), "INTERNAL COMBUSTION IN: %i", proxTick); Com_sprintf(s, sizeof(s), "INTERNAL COMBUSTION IN: %i", proxTick);
} else { } else {
Com_sprintf(s, sizeof(s), "YOU HAVE BEEN MINED"); Com_sprintf(s, sizeof(s), "YOU HAVE BEEN MINED");