Prevented multiple loading of the same image files

1 files changed, 15 insertions, 11 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) {