zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 21:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed texture validation checks.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-15 21:57:59 +02:00
parent 95b4340eec
commit 2c2b871083
10 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/blood/src/view.cpp
View file

@ -228,7 +228,7 @@ void viewGetFontInfo(int id, const char *unk1, int *pXSize, int *pYSize)
for (const char *pBuf = unk1; *pBuf != 0; pBuf++) for (const char *pBuf = unk1; *pBuf != 0; pBuf++)
{ {
int tile = ((*pBuf-32)&127)+pFont->tile; int tile = ((*pBuf-32)&127)+pFont->tile;
if (tilesiz[tile].x != 0 && tilesiz[tile].y != 0) if (tileGetTexture(tile)->isValid())
width += tilesiz[tile].x+pFont->space; width += tilesiz[tile].x+pFont->space;
} }
if (pXSize) if (pXSize)

2
source/duke3d/src/game.cpp
View file

@ -3936,7 +3936,7 @@ PALONLY:
// XXX: t->picnum can be out-of-bounds by bad user code. // XXX: t->picnum can be out-of-bounds by bad user code.
if (viewtype > 0) if (viewtype > 0)
while (tilesiz[t->picnum].x == 0 && t->picnum > 0) while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0)
t->picnum -= l; //Hack, for actors t->picnum -= l; //Hack, for actors
if (actor[i].dispicnum >= 0) if (actor[i].dispicnum >= 0)

2
source/duke3d/src/sbar.cpp
View file

@ -1052,7 +1052,7 @@ void G_DrawBackground(void)
// XXX: if dapicnum is not available, this might leave the menu background // XXX: if dapicnum is not available, this might leave the menu background
// not drawn, leading to "HOM". // not drawn, leading to "HOM".
if ((dapicnum >= 0 && tilesiz[dapicnum].x == 0) || (dapicnum >= 0 && tilesiz[dapicnum].y == 0) || if ((dapicnum >= 0 && !tileGetTexture(dapicnum)->isValid()) ||
(windowxy1.x-1 <= 0 && windowxy2.x >= xdim-1 && windowxy1.y-1 <= 0 && windowxy2.y >= ydim-1) || (windowxy1.x-1 <= 0 && windowxy2.x >= xdim-1 && windowxy1.y-1 <= 0 && windowxy2.y >= ydim-1) ||
dapicnum < 0) dapicnum < 0)
{ {

3
source/duke3d/src/screens.cpp
View file

@ -446,8 +446,7 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
{ {
if (wal->nextwall >= 0) continue; if (wal->nextwall >= 0) continue;
if (tilesiz[wal->picnum].x == 0) continue; if (!tileGetTexture(wal->picnum)->isValid()) continue;
if (tilesiz[wal->picnum].y == 0) continue;
if (j == k) if (j == k)
{ {

3
source/exhumed/src/map.cpp
View file

@ -383,8 +383,7 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
{ {
if (wal->nextwall >= 0) continue; if (wal->nextwall >= 0) continue;
if (tilesiz[wal->picnum].x == 0) continue; if (!tileGetTexture(wal->picnum)->isValid()) continue;
if (tilesiz[wal->picnum].y == 0) continue;
if (j == k) if (j == k)
{ {

2
source/rr/src/game.cpp
View file

@ -5349,7 +5349,7 @@ default_case2:
// XXX: t->picnum can be out-of-bounds by bad user code. // XXX: t->picnum can be out-of-bounds by bad user code.
if (l > 0) if (l > 0)
while (tilesiz[t->picnum].x == 0 && t->picnum > 0) while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0)
t->picnum -= l; //Hack, for actors t->picnum -= l; //Hack, for actors
if (actor[i].dispicnum >= 0) if (actor[i].dispicnum >= 0)

3
source/rr/src/rrdh.cpp
View file

@ -3453,8 +3453,7 @@ void sub_57B38(long cposx, long cposy, long czoom, short cang)
if ((show2dwall[j>>3]&(1<<(j&7))) == 0) continue; if ((show2dwall[j>>3]&(1<<(j&7))) == 0) continue;
if (tilesiz[wal->picnum].x == 0) continue; if (!tileGetTexture(wal->picnum)->isValid()) continue;
if (tilesiz[wal->picnum].y == 0) continue;
if (j == k) if (j == k)
{ x1 = x2; y1 = y2; } { x1 = x2; y1 = y2; }

2
source/rr/src/sbar.cpp
View file

@ -1461,7 +1461,7 @@ void G_DrawBackground(void)
// XXX: if dapicnum is not available, this might leave the menu background // XXX: if dapicnum is not available, this might leave the menu background
// not drawn, leading to "HOM". // not drawn, leading to "HOM".
if ((dapicnum >= 0 && tilesiz[dapicnum].x == 0) || (dapicnum >= 0 && tilesiz[dapicnum].y == 0) || if ((dapicnum >= 0 && !tileGetTexture(dapicnum)->isValid()) ||
(windowxy1.x-1 <= 0 && windowxy2.x >= xdim-1 && windowxy1.y-1 <= 0 && windowxy2.y >= ydim-1) || (windowxy1.x-1 <= 0 && windowxy2.x >= xdim-1 && windowxy1.y-1 <= 0 && windowxy2.y >= ydim-1) ||
dapicnum < 0) dapicnum < 0)
{ {

3
source/rr/src/screens.cpp
View file

@ -446,8 +446,7 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
{ {
if (wal->nextwall >= 0) continue; if (wal->nextwall >= 0) continue;
if (tilesiz[wal->picnum].x == 0) continue; if (!tileGetTexture(wal->picnum)->isValid()) continue;
if (tilesiz[wal->picnum].y == 0) continue;
if (j == k) if (j == k)
{ {

5
source/sw/src/game.cpp
View file

@ -3679,10 +3679,7 @@ SHOWSPRITE:
if (!mapcheat && (show2dwall[j >> 3] & (1 << (j & 7))) == 0) if (!mapcheat && (show2dwall[j >> 3] & (1 << (j & 7))) == 0)
continue; continue;
if (tilesiz[wal->picnum].x == 0) if (!tileGetTexture(wal->picnum)->isValid()) continue;
continue;
if (tilesiz[wal->picnum].y == 0)
continue;
ox = wal->x - cposx; ox = wal->x - cposx;
oy = wal->y - cposy; oy = wal->y - cposy;