From c00145e551b7f651f1339fe3b8d9fa2c2ce9a817 Mon Sep 17 00:00:00 2001
From: Daniel Evans <dan@rekt.io>
Date: Sat, 3 Dec 2016 21:50:34 +0000
Subject: [PATCH] Reduce code duplication for DFF texture lookup

---
 rwengine/src/engine/GameData.cpp | 30 +++++++-----------------------
 rwengine/src/engine/GameData.hpp |  1 +
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp
index d70d1bf6..19e45cbd 100644
--- a/rwengine/src/engine/GameData.cpp
+++ b/rwengine/src/engine/GameData.cpp
@@ -5,7 +5,6 @@
 #include <engine/GameState.hpp>
 #include <engine/GameWorld.hpp>
 #include <loaders/LoaderCOL.hpp>
-#include <loaders/LoaderDFF.hpp>
 #include <loaders/LoaderIDE.hpp>
 #include <loaders/LoaderIPL.hpp>
 #include <script/SCMFile.hpp>
@@ -23,6 +22,10 @@
 
 GameData::GameData(Logger* log, const std::string& path)
     : datpath(path), logger(log), engine(nullptr) {
+    dffLoader.setTextureLookupCallback(
+        [&](const std::string& texture, const std::string&) {
+            return findSlotTexture(currenttextureslot, texture);
+        });
 }
 
 GameData::~GameData() {
@@ -353,13 +356,7 @@ Model* GameData::loadClump(const std::string& name) {
         logger->error("Data", "Failed to load model " + name);
         return nullptr;
     }
-    LoaderDFF l;
-    l.setTextureLookupCallback(
-        [&](const std::string& texture, const std::string&) {
-            // Lookup the texture in the current texture slot
-            return findSlotTexture(currenttextureslot, texture);
-        });
-    auto m = l.loadFromMemory(file);
+    auto m = dffLoader.loadFromMemory(file);
     if (!m) {
         logger->error("Data", "Error loading model file " + name);
         return nullptr;
@@ -373,14 +370,7 @@ void GameData::loadModelFile(const std::string& name) {
         logger->log("Data", Logger::Error, "Failed to load model file " + name);
         return;
     }
-    LoaderDFF l;
-    l.setTextureLookupCallback(
-        [&](const std::string& texture, const std::string&) {
-            // Lookup the texture in the current texture slot
-            return findSlotTexture(currenttextureslot, texture);
-        });
-
-    auto m = l.loadFromMemory(file);
+    auto m = dffLoader.loadFromMemory(file);
     if (!m) {
         logger->log("Data", Logger::Error, "Error loading model file " + name);
         return;
@@ -444,13 +434,7 @@ void GameData::loadModel(ModelID model) {
                                   std::to_string(model) + " [" + name + "]");
         return;
     }
-    LoaderDFF l;
-    l.setTextureLookupCallback(
-        [&](const std::string& texture, const std::string&) {
-            // Lookup the texture in the current texture slot
-            return findSlotTexture(currenttextureslot, texture);
-        });
-    auto m = l.loadFromMemory(file);
+    auto m = dffLoader.loadFromMemory(file);
     if (!m) {
         logger->error("Data",
                       "Error loading model file for " + std::to_string(model));
diff --git a/rwengine/src/engine/GameData.hpp b/rwengine/src/engine/GameData.hpp
index 49cf92e5..bd3a17a4 100644
--- a/rwengine/src/engine/GameData.hpp
+++ b/rwengine/src/engine/GameData.hpp
@@ -42,6 +42,7 @@ private:
     std::string currenttextureslot;
 
     Logger* logger;
+    LoaderDFF dffLoader;
 public:
     /**
      * ctor