From 83debbc91b05d53af31925f122cfe70dbe893eb6 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 31 Jan 2021 08:38:13 -0500 Subject: Spritesheets are in a map now because ID's may not be continuous --- tools/sprite_dumper/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/sprite_dumper') diff --git a/tools/sprite_dumper/main.cpp b/tools/sprite_dumper/main.cpp index c87f544..46599e5 100644 --- a/tools/sprite_dumper/main.cpp +++ b/tools/sprite_dumper/main.cpp @@ -358,12 +358,12 @@ public: ss.sprites.push_back(std::move(sprite)); } - spritesheets_.push_back(std::move(ss)); - if (i == 1) return; + spritesheets_[i] = std::move(ss); + if (i == 2) return; } } - const std::vector& SpriteSheets() const { return spritesheets_; } + const std::map& SpriteSheets() const { return spritesheets_; } private: @@ -379,7 +379,7 @@ private: int baseAddr_; int gfxAddr_; - std::vector spritesheets_; + std::map spritesheets_; }; int main(int argc, char** argv) { @@ -394,7 +394,7 @@ int main(int argc, char** argv) { PaletteSet palettes(m3); //const int banks[] = {0x1A442A4, 0x1AE0638, 0x1AEE4C4, 0x1AF1ED0}; Bank b1(m3, 0x1A442A4, 0x14383E4); - Magick::Image im = b1.SpriteSheets()[1].render(m3, palettes); + Magick::Image im = b1.SpriteSheets().at(1).render(m3, palettes); im.magick("png"); im.write("out.png"); -- cgit 1.4.1