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

- validate fountaincolor before using it.

This commit is contained in:
Christoph Oelckers 2022-06-21 19:46:43 +02:00
parent 3213f046c2
commit d5888dfa0a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/2d/v_draw.cpp
View File

@ -1624,4 +1624,4 @@ DEFINE_ACTION_FUNCTION(_Screen, SetOffset)
PARAM_FLOAT(x);
PARAM_FLOAT(y);
ACTION_RETURN_VEC2(twod->SetOffset(DVector2(x, y)));
}
}

1
src/playsim/p_effect.cpp
View File

@ -440,6 +440,7 @@ void P_RunEffect (AActor *actor, int effects)
&grey4, &white
};
int color = actor->fountaincolor*2;
if (color < 0 || color >= 16) color = 0;
MakeFountain (actor, *fountainColors[color], *fountainColors[color+1]);
}
if (effects & FX_RESPAWNINVUL)