zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Fail gracefully from WarpToArea instead of aborting

Browse source
This commit is contained in:
Evan Ramos 2020-05-22 00:17:32 -05:00 committed by Christoph Oelckers
parent f318d2282a
commit 71dc4ff5a4
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/sw/src/warp.cpp
View file

@ -183,6 +183,9 @@ WarpToArea(SPRITEp sp_from, int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum
// exp: WARP_CEILING or WARP_CEILING_PLANE // exp: WARP_CEILING or WARP_CEILING_PLANE
if (sp->hitag == to_tag) if (sp->hitag == to_tag)
{ {
if ((unsigned)sp->sectnum >= MAXSECTORS)
return nullptr;
// determine new x,y,z position // determine new x,y,z position
*x = sp->x + xoff; *x = sp->x + xoff;
*y = sp->y + yoff; *y = sp->y + yoff;
@ -195,7 +198,6 @@ WarpToArea(SPRITEp sp_from, int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum
*sectnum = sp->sectnum; *sectnum = sp->sectnum;
updatesector(*x, *y, sectnum); updatesector(*x, *y, sectnum);
ASSERT(*sectnum >= 0);
return sp; return sp;
} }
} }