X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=28fda4e084bded0987e95063d08a0493bea107d6;hb=b640b9d7647df4cbba0e530f6f4bcece384048e4;hp=e68c1cea8a7ea142591defe7e95e115854984cd0;hpb=c1dca83f9655759c36e3e5e9e95739d46c55c894;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index e68c1cea..28fda4e0 100644 --- a/src/init.c +++ b/src/init.c @@ -717,6 +717,8 @@ void InitElementGraphicInfo() } } +#if 0 + /* !!! THIS ALSO CLEARS SPECIAL FLAGS (AND IS NOT NEEDED ANYWAY) !!! */ /* set animation mode to "none" for each graphic with only 1 frame */ for (i = 0; i < MAX_NUM_ELEMENTS; i++) { @@ -742,6 +744,7 @@ void InitElementGraphicInfo() } } } +#endif #if 0 #if DEBUG @@ -4605,14 +4608,20 @@ static char *getNewArtworkIdentifier(int type) void ReloadCustomArtwork(int force_reload) { - char *gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS); - char *snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS); - char *mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC); + char *gfx_new_identifier; + char *snd_new_identifier; + char *mus_new_identifier; boolean force_reload_gfx = (force_reload & (1 << ARTWORK_TYPE_GRAPHICS)); boolean force_reload_snd = (force_reload & (1 << ARTWORK_TYPE_SOUNDS)); boolean force_reload_mus = (force_reload & (1 << ARTWORK_TYPE_MUSIC)); boolean redraw_screen = FALSE; + force_reload_gfx |= AdjustGraphicsForEMC(); + + gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS); + snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS); + mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC); + if (gfx_new_identifier != NULL || force_reload_gfx) { #if 0