From: Holger Schemel <holger.schemel@virtion.de>
Date: Wed, 27 Nov 2024 18:27:28 +0000 (+0100)
Subject: fixed setting BD style image color template after changing artwork
X-Git-Tag: 4.4.0.0-test-4~26
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=350a81ee447838156d175b166c5cfd500c844caf;p=rocksndiamonds.git

fixed setting BD style image color template after changing artwork

As each (BD style) level may change the image color template using new
colors for game graphics as defined in the level file for this level,
new custom artwork (with color template definitions) must always be
reloaded before loading the level file (and adjusting the image color
template according to the colors defined in the level file).
---

diff --git a/src/screens.c b/src/screens.c
index ed511a59..11a24ddc 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -2184,14 +2184,15 @@ void DrawMainMenu(void)
   if (setup.allow_skipping_levels != STATE_TRUE && level_nr > leveldir_current->handicap_level)
     level_nr = leveldir_current->handicap_level;
 
+  // needed if last screen (level choice) changed graphics, sounds or music
+  ReloadCustomArtwork(0);
+
+  // level may use image color template, so reload custom artwork before loading level
   LoadLevel(level_nr);
   LoadScore(level_nr);
 
   SaveLevelSetup_SeriesInfo();
 
-  // needed if last screen (level choice) changed graphics, sounds or music
-  ReloadCustomArtwork(0);
-
   if (CheckTitleScreen(levelset_has_changed))
   {
     SetGameStatus(GAME_MODE_TITLE);