Made some sprites persist between map changes

The player party characters are now initialised at the start of the game and are no longer re-created after every map change. The script system takes care of moving the player into the correct position on the new map.

Deleted sprite IDs are now reused the next time a sprite is created, instead of throwing out everything between maps.

1 files changed, 3 insertions, 3 deletions

@@ -1,6 +1,7 @@
 #ifndef GAME_H_E6F1396E
 #define GAME_H_E6F1396E
 
+#include <deque>
 #include <list>
 #include <range/v3/all.hpp>
 #include <vector>
@@ -76,7 +77,7 @@ public:
     });
   }
 
-  void loadMap(std::string filename, std::string warpPoint, Direction dir);
+  void loadMap(std::string filename);
 
   const Map& getMap() const { return *map_; }
 
@@ -84,8 +85,6 @@ public:
 
 private:
 
-  void clearSprites();
-
   Mixer mixer_;
   bool shouldQuit_ = false;
 
@@ -93,6 +92,7 @@ private:
   std::map<SystemKey, System*> systemByKey_;
 
   std::set<int> spriteIds_;
+  std::deque<int> idsToReuse_;
   std::vector<Sprite> sprites_;
   std::map<std::string, int> spritesByAlias_;
   std::unique_ptr<Map> map_;