projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b07cd91
)
renamed function
author
Holger Schemel
<info@artsoft.org>
Fri, 15 Apr 2022 10:05:25 +0000
(12:05 +0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 15 Apr 2022 10:06:19 +0000
(12:06 +0200)
src/init.c
patch
|
blob
|
history
diff --git
a/src/init.c
b/src/init.c
index c4b787e78f2a189511e34418bada3d03d4359aa0..315983ac896ca3428199c65171534ab91d923437 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-6183,7
+6183,7
@@
static void InitOverrideArtwork(void)
#endif
}
#endif
}
-static char *
g
etNewArtworkIdentifier(int type)
+static char *
s
etNewArtworkIdentifier(int type)
{
static char *last_leveldir_identifier[3] = { NULL, NULL, NULL };
static char *last_artwork_identifier[3] = { NULL, NULL, NULL };
{
static char *last_leveldir_identifier[3] = { NULL, NULL, NULL };
static char *last_artwork_identifier[3] = { NULL, NULL, NULL };
@@
-6248,6
+6248,7
@@
static char *getNewArtworkIdentifier(int type)
// (we cannot compare string pointers here, so copy string content itself)
setString(&last_artwork_identifier[type], artwork_current_identifier);
// (we cannot compare string pointers here, so copy string content itself)
setString(&last_artwork_identifier[type], artwork_current_identifier);
+ // ---------- set new artwork identifier ----------
*(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)) = artwork_current_identifier;
// ---------- do not reload directly after starting -------------------------
*(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)) = artwork_current_identifier;
// ---------- do not reload directly after starting -------------------------
@@
-6275,9
+6276,9
@@
void ReloadCustomArtwork(int force_reload)
AdjustGraphicsForEMC();
AdjustSoundsForEMC();
AdjustGraphicsForEMC();
AdjustSoundsForEMC();
- gfx_new_identifier =
g
etNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
- snd_new_identifier =
g
etNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
- mus_new_identifier =
g
etNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+ gfx_new_identifier =
s
etNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
+ snd_new_identifier =
s
etNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
+ mus_new_identifier =
s
etNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
reload_needed = (gfx_new_identifier != NULL || force_reload_gfx ||
snd_new_identifier != NULL || force_reload_snd ||
reload_needed = (gfx_new_identifier != NULL || force_reload_gfx ||
snd_new_identifier != NULL || force_reload_snd ||