zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: fix a div by zero when drawing tile info for void tile in 3D mode.

Browse source 
This was exposed by Clang with -ftrapv, which apparently also traps those.

git-svn-id: https://svn.eduke32.com/eduke32@2757 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-06-13 23:13:28 +00:00
parent f2789ab90f
commit 8d8196993b
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
polymer/eduke32/source/astub.c
View file

@ -4251,21 +4251,24 @@ static void drawtileinfo(const char *title,int32_t x,int32_t y,int32_t picnum,in
{ {
char buf[64]; char buf[64];
int32_t small = (xdimgame<=640); int32_t small = (xdimgame<=640);
int32_t scale=65536;
int32_t x1;
int32_t oviewingrange=viewingrange, oyxaspect=yxaspect; int32_t oviewingrange=viewingrange, oyxaspect=yxaspect;
x1 = x+80; if (tilesizx[picnum]>0 && tilesizy[picnum]>0)
if (small) {
x1 /= 2; int32_t scale=65536;
int32_t x1 = x+80;
x1 *= 320.0/xdimgame; if (small)
scale /= (max(tilesizx[picnum],tilesizy[picnum])/24.0); x1 /= 2;
setaspect(65536L, (int32_t)divscale16(ydim*320L,xdim*200L)); x1 *= 320.0/xdimgame;
// +1024: prevents rotatesprite from setting aspect itself scale /= (max(tilesizx[picnum],tilesizy[picnum])/24.0);
rotatesprite_fs((x1+13)<<16,(y+11)<<16,scale,0, picnum,shade,pal, 2+1024);
setaspect(oviewingrange, oyxaspect); setaspect(65536L, (int32_t)divscale16(ydim*320L,xdim*200L));
// +1024: prevents rotatesprite from setting aspect itself
rotatesprite_fs((x1+13)<<16,(y+11)<<16,scale,0, picnum,shade,pal, 2+1024);
setaspect(oviewingrange, oyxaspect);
}
x *= xdimgame/320.0; x *= xdimgame/320.0;
y *= ydimgame/200.0; y *= ydimgame/200.0;
@ -7591,7 +7594,7 @@ static void Keys2d(void)
if (eitherCTRL) if (eitherCTRL)
{ {
g_fillCurSector = !g_fillCurSector; g_fillCurSector = !g_fillCurSector;
message("Fill currently pointed-at sector: %s", ONOFF(g_fillCurSector)); silentmessage("Fill currently pointed-at sector: %s", ONOFF(g_fillCurSector));
keystatus[KEYSC_TAB] = 0; keystatus[KEYSC_TAB] = 0;
} }
else if (eitherSHIFT) else if (eitherSHIFT)