projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added initially setting artwork identifier
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 1c1f85e21ab4eba51e727ec91f723f0fc5b48b32..136abe6a8717dea9a65db8d3c2358a543645d629 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 -------------------------
@@
-6259,6
+6260,13
@@
static char *getNewArtworkIdentifier(int type)
return artwork_new_identifier;
}
return artwork_new_identifier;
}
+static void InitArtworkIdentifier(void)
+{
+ setNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
+ setNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
+ setNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+}
+
void ReloadCustomArtwork(int force_reload)
{
int last_game_status = game_status; // save current game status
void ReloadCustomArtwork(int force_reload)
{
int last_game_status = game_status; // save current game status
@@
-6275,9
+6283,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 ||
@@
-6301,6
+6309,8
@@
void ReloadCustomArtwork(int force_reload)
UPDATE_BUSY_STATE();
UPDATE_BUSY_STATE();
+ InitMissingFileHash();
+
if (gfx_new_identifier != NULL || force_reload_gfx)
{
#if 0
if (gfx_new_identifier != NULL || force_reload_gfx)
{
#if 0
@@
-6437,6
+6447,8
@@
void OpenAll(void)
InitSimpleRandom(NEW_RANDOMIZE);
InitBetterRandom(NEW_RANDOMIZE);
InitSimpleRandom(NEW_RANDOMIZE);
InitBetterRandom(NEW_RANDOMIZE);
+ InitMissingFileHash();
+
print_timestamp_time("[init global stuff]");
InitSetup();
print_timestamp_time("[init global stuff]");
InitSetup();
@@
-6504,6
+6516,9
@@
void OpenAll(void)
InitOverrideArtwork(); // needs to know current level directory
print_timestamp_time("InitOverrideArtwork");
InitOverrideArtwork(); // needs to know current level directory
print_timestamp_time("InitOverrideArtwork");
+ InitArtworkIdentifier(); // needs to know current level directory
+ print_timestamp_time("InitArtworkIdentifier");
+
InitImages(); // needs to know current level directory
print_timestamp_time("InitImages");
InitImages(); // needs to know current level directory
print_timestamp_time("InitImages");