projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e014434
)
renamed variable
author
Holger Schemel
<info@artsoft.org>
Sun, 18 Oct 2020 22:51:14 +0000
(
00:51
+0200)
committer
Holger Schemel
<info@artsoft.org>
Sun, 13 Dec 2020 23:57:57 +0000
(
00:57
+0100)
src/init.c
patch
|
blob
|
history
diff --git
a/src/init.c
b/src/init.c
index e5df926f9569a4046d11ff80515dade391dc7667..1c71531876003765be3eeb0d8d96608b40426c4d 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-5909,7
+5909,7
@@
static void InitOverrideArtwork(void)
static char *getNewArtworkIdentifier(int type)
{
static char *getNewArtworkIdentifier(int type)
{
- static char *l
eveldir_current
_identifier[3] = { NULL, NULL, NULL };
+ static char *l
ast_leveldir
_identifier[3] = { NULL, NULL, NULL };
static boolean last_override_level_artwork[3] = { FALSE, FALSE, FALSE };
static boolean last_has_level_artwork_set[3] = { FALSE, FALSE, FALSE };
static boolean initialized[3] = { FALSE, FALSE, FALSE };
static boolean last_override_level_artwork[3] = { FALSE, FALSE, FALSE };
static boolean last_has_level_artwork_set[3] = { FALSE, FALSE, FALSE };
static boolean initialized[3] = { FALSE, FALSE, FALSE };
@@
-5948,11
+5948,11
@@
static char *getNewArtworkIdentifier(int type)
------------------------------------------------------------ */
// ---------- reload if level set and also artwork set has changed ----------
------------------------------------------------------------ */
// ---------- reload if level set and also artwork set has changed ----------
- if (l
eveldir_current
_identifier[type] != leveldir_identifier &&
+ if (l
ast_leveldir
_identifier[type] != leveldir_identifier &&
(last_has_level_artwork_set[type] || has_level_artwork_set))
artwork_new_identifier = artwork_current_identifier;
(last_has_level_artwork_set[type] || has_level_artwork_set))
artwork_new_identifier = artwork_current_identifier;
- l
eveldir_current
_identifier[type] = leveldir_identifier;
+ l
ast_leveldir
_identifier[type] = leveldir_identifier;
last_has_level_artwork_set[type] = has_level_artwork_set;
// ---------- reload if "override artwork" setting has changed --------------
last_has_level_artwork_set[type] = has_level_artwork_set;
// ---------- reload if "override artwork" setting has changed --------------