palette animations are per tileset not sprite

Author: morganchristiansson

CIO/CFile.cpp

@@ -349,7 +349,6 @@ bool CFile::read_lbm(FILE* fp, const boost::filesystem::path& filepath)
     // fseek(fp, length-20, SEEK_CUR);
 
     const Uint16 tilesetSlot = static_cast<Uint16>(bmpArray - global::bmpArray.data());
-    int chunkIdx = 0;
 
     /* READ SECOND CHUNK "CMAP" */
 
@@ -421,7 +420,19 @@ bool CFile::read_lbm(FILE* fp, const boost::filesystem::path& filepath)
                     anim.currentOffset = 0;
                     anim.lastAppliedOffset = 0;
                     anim.lastUpdateTime = SDL_GetTicks();
-                    global::paletteAnimations[tilesetSlot][chunkIdx] = anim;
+                    switch(tilesetSlot)
+                    {
+                        case TILESET_GREENLAND_8BPP:
+                            global::paletteAnimations[MAP_GREENLAND].push_back(anim);
+                            break;
+                        case TILESET_WASTELAND_8BPP:
+                            global::paletteAnimations[MAP_WASTELAND].push_back(anim);
+                            break;
+                        case TILESET_WINTERLAND_8BPP:
+                            global::paletteAnimations[MAP_WINTERLAND].push_back(anim);
+                            break;
+                        default: break;
+                    }
                 }
                 if(chunkLen > 8)
                 {
@@ -445,7 +456,6 @@ bool CFile::read_lbm(FILE* fp, const boost::filesystem::path& filepath)
                 chunkLen++;
             fseek(fp, chunkLen, SEEK_CUR);
         }
-        chunkIdx++;
     }
     if(feof(fp))
         return false;

CSurface.cpp

@@ -1515,12 +1515,10 @@ static void rotatePaletteRange(SDL_Palette* pal, uint8_t firstClr, int colorCoun
 
 void CSurface::UpdatePaletteAnimations(MapType mapType)
 {
-    const auto tilesetIdx8 = tilesetIdxForMapType(mapType, false);
-    auto animIt = global::paletteAnimations.find(static_cast<Uint16>(tilesetIdx8));
-    if(animIt == global::paletteAnimations.end() || animIt->second.empty())
+    if(global::paletteAnimations[mapType].empty())
         return;
 
-    auto& animMap = animIt->second;
+    const auto tilesetIdx8 = tilesetIdxForMapType(mapType, false);
     auto* surf8 = global::bmpArray[tilesetIdx8].surface.get();
     if(!surf8 || !surf8->format->palette)
         return;
@@ -1535,7 +1533,7 @@ void CSurface::UpdatePaletteAnimations(MapType mapType)
     const unsigned now = SDL_GetTicks();
     bool anyUpdate = false;
 
-    for(auto& [palAnimIdx, anim] : animMap)
+    for(auto& anim : global::paletteAnimations[mapType])
     {
         if(anim.rate == 0)
             continue;

globals.cpp

@@ -12,8 +12,8 @@ std::vector<bobBMP> global::bmpArray(MAXBOBBMP);
 std::vector<bobSHADOW> global::shadowArray(MAXBOBSHADOW);
 // array for all palettes
 std::vector<bobPAL> global::palArray(MAXBOBPAL);
-// Palette animations keyed by (bmpArray slot of 8-bit tileset) -> (CRNG chunk index).
-std::map<Uint16, std::map<int, PaletteAnimation>> global::paletteAnimations;
+// Palette animations per tileset, indexed by MapType (0=Greenland, 1=Wasteland, 2=Winterland).
+std::array<std::vector<PaletteAnimation>, 3> global::paletteAnimations;
 // the game object
 CGame* global::s2;
 

globals.h

@@ -8,7 +8,7 @@
 #include "gameData/WorldDescription.h"
 #include <boost/filesystem/path.hpp>
 #include <SDL.h>
-#include <map>
+#include <array>
 #include <vector>
 
 class CGame;
@@ -24,8 +24,9 @@ extern std::vector<bobBMP> bmpArray;
 extern std::vector<bobSHADOW> shadowArray;
 // array for all palettes
 extern std::vector<bobPAL> palArray;
-// Palette animations keyed by (bmpArray slot of 8-bit tileset) -> (CRNG chunk index).
-extern std::map<Uint16, std::map<int, PaletteAnimation>> paletteAnimations;
+// Palette animations per tileset, indexed by MapType (0=Greenland, 1=Wasteland, 2=Winterland).
+// Each entry is a list of CRNG chunk animations applied to the whole tileset palette.
+extern std::array<std::vector<PaletteAnimation>, 3> paletteAnimations;
 // the game object
 extern CGame* s2;
 // Path to game data (must not be empty!)