Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix underflow, if a pre-built structure has part of it in water. 

NOTE: since this is going on, on our mission maps, we just fix the issue, instead of
removing the item, since the item in question might be used by the scripts, and removing
it would break things.

fixes ticket:2302
(cherry picked from commit 94bedce442051a0cb1562fb0f8962c54e60e9fa3)
master
buginator 2010-11-11 19:41:08 -05:00
parent 03914be31b
commit c1b44daf1e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/map.c
View File

@ -1230,6 +1230,7 @@ extern BOOL mapObjIsAboveGround( BASE_OBJECT *psObj )
void getTileMaxMin(UDWORD x, UDWORD y, UDWORD *pMax, UDWORD *pMin)
{
UDWORD height, i, j;
int tileHeight = TILE_MIN_HEIGHT;
*pMin = TILE_MAX_HEIGHT;
*pMax = TILE_MIN_HEIGHT;
@ -1238,7 +1239,18 @@ void getTileMaxMin(UDWORD x, UDWORD y, UDWORD *pMax, UDWORD *pMin)
{
for (i=0; i < 2; i++)
{
height = map_TileHeight(x+i, y+j);
// it tileHeight is negative, that means we are in water, and will cause a underflow
// FIXME: When we add structures that *can* be on water, we need to handle this differently.
tileHeight = map_TileHeight(x+i, y+j);
if (tileHeight < 0)
{
// NOTE: should we assert here ?
height = TILE_MIN_HEIGHT;
}
else
{
height = tileHeight;
}
if (*pMin > height)
{
*pMin = height;