Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LeoD
EDuke32
Commits
f61cc041
Commit
f61cc041
authored
Apr 18, 2022
by
Richard Gobeille
Browse files
engine: block repeated attempts to load a particular hightile in software mode after failure
parent
cb673c33
Changes
1
Hide whitespace changes
Inline
Side-by-side
source/build/src/engine.cpp
View file @
f61cc041
...
...
@@ -213,7 +213,8 @@ classicht_t *tileLoadHigh(int dapicnum)
if
((
!
usehightile
)
|
((
paletteloaded
&
PALETTE_MAIN
)
!=
PALETTE_MAIN
)
|
(
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
;
if
(
!
cht
->
ptr
)
...
...
@@ -233,6 +234,7 @@ classicht_t *tileLoadHigh(int dapicnum)
if
(
EDUKE32_PREDICT_FALSE
(
!
picptr
|
(
xsiz
<=
0
)
|
(
ysiz
<=
0
)))
{
cht
->
lock
=
254
;
Xfree
(
picptr
);
return
NULL
;
}
...
...
@@ -244,6 +246,7 @@ classicht_t *tileLoadHigh(int dapicnum)
if
((
tsiz
.
x
!=
xsiz
)
|
(
tsiz
.
y
!=
ysiz
))
{
cht
->
lock
=
254
;
Xfree
(
picptr
);
return
NULL
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment