Prevented multiple loading of the same image files

2 files changed, 18 insertions, 13 deletions

@@ -228,20 +228,24 @@ void Renderer::render(Game& game) {
   SDL_RenderPresent(ren_.get());
 }
 
-int Renderer::loadImageFromFile(std::string_view filename) {
-  surface_ptr pfs(IMG_Load(filename.data()));
-  if (!pfs)
-  {
-    throw img_error();
-  }
+int Renderer::loadImageFromFile(std::string filename) {
+  if (!filenameToTexId_.count(filename)) {
+    surface_ptr pfs(IMG_Load(filename.data()));
+    if (!pfs)
+    {
+      throw img_error();
+    }
 
-  texture_ptr tex = texture_ptr(SDL_CreateTextureFromSurface(ren_.get(), pfs.get()));
-  //SDL_SetTextureBlendMode(tex, SDL_BLENDMODE_BLEND);
+    texture_ptr tex = texture_ptr(SDL_CreateTextureFromSurface(ren_.get(), pfs.get()));
+    //SDL_SetTextureBlendMode(tex, SDL_BLENDMODE_BLEND);
 
-  int texId = textures_.size();
-  textures_.push_back(std::move(tex));
+    int texId = textures_.size();
+    textures_.push_back(std::move(tex));
+
+    filenameToTexId_[filename] = texId;
+  }
 
-  return texId;
+  return filenameToTexId_[filename];
 }
 
 void Renderer::renderMessageLine(MessageCache& line, const std::string& text, Game& game) {
@@ -5,7 +5,7 @@
 #include <SDL_image.h>
 #include <stdexcept>
 #include <memory>
-#include <string_view>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -119,7 +119,7 @@ public:
 
   void render(Game& game);
 
-  int loadImageFromFile(std::string_view filename);
+  int loadImageFromFile(std::string filename);
 
 private:
 
@@ -131,6 +131,7 @@ private:
 
   // Textures loaded from files
   std::vector<texture_ptr> textures_;
+  std::map<std::string, int> filenameToTexId_;
 
   // Map rendering
   texture_ptr renderMapLayer(const Map& map, int layer);