Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix game crash when burndelay is 0 bug #179

Merged
merged 4 commits into from
Dec 5, 2020
Merged

Fix game crash when burndelay is 0 bug #179

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8145aee
Fix game crash when burndelay is 0 bug
MoonPadUSer Jul 29, 2020
dcd5197
Add missing )
MoonPadUSer Jul 29, 2020
4112696
Rename _burndelay to fixed_burndelay
MoonPadUSer Aug 1, 2020
750c138
Update comments
MoonPadUSer Aug 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,10 +935,12 @@ namespace game
int millis = lastmillis-d->lastres[WR_BURN];
size_t seed = size_t(d) + (millis/50);
float pc = 1, amt = (millis%50)/50.0f, intensity = 0.75f+(detrnd(seed, 25)*(1-amt) + detrnd(seed + 1, 25)*amt)/100.f;
if(burntime-millis < burndelay) pc *= float(burntime-millis)/float(burndelay);
// When playing on servers with an older version, burndelay can be 0, thus add a check to prevent division by 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is very long, and this is not a check you just enforce a lower boundary.

Suggested change
// When playing on servers with an older version, burndelay can be 0, thus add a check to prevent division by 0
// avoid division by zero by enforcing new lower boundary

int _burndelay = std::max(burndelay, 1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The _ prefix is preserved for standard-specified things (as per the ISO C standard) IIRC. Please rename.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to what?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, changed them to fixed_burndelay

if(burntime-millis < _burndelay) pc *= float(burntime - millis) / float(_burndelay);
else
{
float fluc = float(millis%burndelay)*(0.25f+0.03f)/burndelay;
float fluc = float(millis % _burndelay) * (0.25f + 0.03f) / _burndelay;
if(fluc >= 0.25f) fluc = (0.25f+0.03f-fluc)*(0.25f/0.03f);
pc *= 0.75f+fluc;
}
Expand Down Expand Up @@ -3610,8 +3612,10 @@ namespace game
{
int millis = lastmillis-d->lastres[WR_BURN];
float pc = 1, intensity = 0.5f+(rnd(50)/100.f), fade = (d != focus ? 0.5f : 0.f)+(rnd(50)/100.f);
if(burntime-millis < burndelay) pc *= float(burntime-millis)/float(burndelay);
else pc *= 0.75f+(float(millis%burndelay)/float(burndelay*4));
// When playing on servers with an older version, burndelay can be 0, thus add a check to prevent division by 0
int _burndelay = std::max(burndelay, 1);
if(burntime - millis < _burndelay) pc *= float(burntime - millis) / _burndelay;
else pc *= 0.75f + (float(millis % _burndelay) / float(_burndelay * 4));
vec pos = vec(d->center()).sub(vec(rnd(11)-5, rnd(11)-5, rnd(5)-2).mul(pc));
regular_part_create(PART_FIREBALL, 50, pos, pulsecols[PULSE_FIRE][rnd(PULSECOLOURS)], d->height*0.75f*intensity*blend*pc, fade*blend*pc, -10, 0);
}
Expand Down
14 changes: 12 additions & 2 deletions src/game/hud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,11 @@ namespace hud
if(game::focus->state >= CS_SPECTATOR || game::focus->state == CS_EDITING) break;
if(game::focus->state == CS_ALIVE) amt += min(damageresidue, 100)/100.f*0.5f;
if(burntime && game::focus->burning(lastmillis, burntime))
amt += (float((lastmillis-game::focus->lastres[WR_BURN])%burndelay)/float(burndelay))*0.5f;
{
// When playing on servers with an older version, burndelay can be 0, thus add a check to prevent division by 0
int _burndelay = std::max(burndelay, 1);
amt += (float((lastmillis-game::focus->lastres[WR_BURN]) % _burndelay) / float(_burndelay)) * 0.5f;
}
if(bleedtime && game::focus->bleeding(lastmillis, bleedtime))
amt += (float((lastmillis-game::focus->lastres[WR_BLEED])%bleeddelay)/float(bleeddelay))*0.5f;
if(shocktime && game::focus->shocking(lastmillis, shocktime))
Expand Down Expand Up @@ -3286,7 +3290,13 @@ namespace hud
if(t && t != notexture)
{
int interval = lastmillis-game::focus->lastres[WR_BURN];
float pc = interval >= burntime-500 ? 1.f+(interval-(burntime-500))/500.f : (interval%burndelay)/float(burndelay/2); if(pc > 1.f) pc = 2.f-pc;
// When playing on servers with an older version, burndelay can be 0, thus add a check to prevent division by 0
int _burndelay = std::max(burndelay, 1);
float pc = interval >= burntime - 500 ? 1.f + (interval - (burntime - 500)) / 500.f : (interval & _burndelay) / float(_burndelay / 1);
if (pc > 1.f)
{
pc = 2.f - pc;
}
glBindTexture(GL_TEXTURE_2D, t->id);
gle::colorf(0.9f*max(pc,0.5f), 0.3f*pc, 0.0625f*max(pc,0.25f), blend*burnblend*(interval >= burntime-(burndelay/2) ? pc : min(pc+0.5f, 1.f)));
drawtexture(0, top, w, h-top-bottom);
Expand Down
2 changes: 1 addition & 1 deletion src/game/vars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ GFVAR(IDF_GAMEMOD, minresizescale, FVAR_NONZERO, 0.5f, 1);
GFVAR(IDF_GAMEMOD, instaresizeamt, FVAR_NONZERO, 0.1f, 1); // each kill adds this much size in insta-resize

GVAR(IDF_GAMEMOD, burntime, 0, 5500, VAR_MAX);
GVAR(IDF_GAMEMOD, burndelay, 0, 1000, VAR_MAX);
GVAR(IDF_GAMEMOD, burndelay, 1, 1000, VAR_MAX);
GVAR(IDF_GAMEMOD, burndamage, 0, 3, VAR_MAX);
GVAR(IDF_GAMEMOD, bleedtime, 0, 5500, VAR_MAX);
GVAR(IDF_GAMEMOD, bleeddelay, 0, 1000, VAR_MAX);
Expand Down