Commit f61cc041 authored by Richard Gobeille's avatar Richard Gobeille
Browse files

engine: block repeated attempts to load a particular hightile in software mode after failure

parent cb673c33
...@@ -213,7 +213,8 @@ classicht_t *tileLoadHigh(int dapicnum) ...@@ -213,7 +213,8 @@ classicht_t *tileLoadHigh(int dapicnum)
if ((!usehightile) | if ((!usehightile) |
((paletteloaded & PALETTE_MAIN) != PALETTE_MAIN) | ((paletteloaded & PALETTE_MAIN) != PALETTE_MAIN) |
(tsiz.x <= 0) | (tsiz.y <= 0) | (tsiz.x <= 0) | (tsiz.y <= 0) |
(!si/* || (si->flags & HICR_INDEXED) != HICR_INDEXED*/)) (!si/* || (si->flags & HICR_INDEXED) != HICR_INDEXED*/) |
(cht->lock == 254))
return NULL; return NULL;
if (!cht->ptr) if (!cht->ptr)
...@@ -233,6 +234,7 @@ classicht_t *tileLoadHigh(int dapicnum) ...@@ -233,6 +234,7 @@ classicht_t *tileLoadHigh(int dapicnum)
if (EDUKE32_PREDICT_FALSE(!picptr | (xsiz <= 0) | (ysiz <= 0))) if (EDUKE32_PREDICT_FALSE(!picptr | (xsiz <= 0) | (ysiz <= 0)))
{ {
cht->lock = 254;
Xfree(picptr); Xfree(picptr);
return NULL; return NULL;
} }
...@@ -244,6 +246,7 @@ classicht_t *tileLoadHigh(int dapicnum) ...@@ -244,6 +246,7 @@ classicht_t *tileLoadHigh(int dapicnum)
if ((tsiz.x != xsiz) | (tsiz.y != ysiz)) if ((tsiz.x != xsiz) | (tsiz.y != ysiz))
{ {
cht->lock = 254;
Xfree(picptr); Xfree(picptr);
return NULL; return NULL;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment