Slight improvements in new Loader

include/loader/Loader.h

@@ -8,7 +8,9 @@
 #ifndef _LOADER_LOADER_H_
 #define _LOADER_LOADER_H_
 
+#include <memory>
 #include <string>
+
 #include "utils/binary.h"
 
 class Loader {
@@ -25,7 +27,7 @@ public:
 
     static LoaderVersion checkFile(std::string f);
 
-    static Loader *createLoader(std::string f);
+    static std::unique_ptr<Loader> createLoader(std::string f);
 
     virtual ~Loader();
 

include/loader/LoaderTR1.h

@@ -8,8 +8,6 @@
 #ifndef _LOADER_LOADER_TR1_H_
 #define _LOADER_LOADER_TR1_H_
 
-#include <cstdint>
-
 #include "loader/Loader.h"
 
 class LoaderTR1 : public Loader {
@@ -19,10 +17,8 @@ public:
 
     virtual int load(std::string f);
 
-
 private:
 
-
 };
 
 #endif

include/loader/LoaderTR2.h

@@ -8,9 +8,6 @@
 #ifndef _LOADER_LOADER_TR2_H_
 #define _LOADER_LOADER_TR2_H_
 
-#include <cstdint>
-#include <array>
-
 #include "loader/Loader.h"
 
 class LoaderTR2 : public Loader {
@@ -20,9 +17,7 @@ public:
 
     virtual int load(std::string f);
 
-
 private:
-
     void loadPaletteTextiles();
     void loadRooms();
     void loadFloorData();
@@ -41,10 +36,6 @@ private:
     void loadSoundMap();
     void loadSoundDetails();
     void loadSampleIndices();
-
-    std::array<uint32_t, 256> palette; //!< RGBA, A unused
-    uint32_t numTextiles;
-    uint16_t **textiles; //!< numTextiles, 256 * 256 * 2 bytes, ARGB (MSB + 3x5bit)
 };
 
 #endif

include/loader/LoaderTR3.h

@@ -8,8 +8,6 @@
 #ifndef _LOADER_LOADER_TR3_H_
 #define _LOADER_LOADER_TR3_H_
 
-#include <cstdint>
-
 #include "loader/Loader.h"
 
 class LoaderTR3 : public Loader {
@@ -19,10 +17,8 @@ public:
 
     virtual int load(std::string f);
 
-
 private:
 
-
 };
 
 #endif

src/Game.cpp

@@ -79,23 +79,21 @@ int Game::loadLevel(const char *level) {
 
     getConsole() << "Loading " << levelName << Console::endl;
 
-    Loader *loader = Loader::createLoader(level);
     int error = 0;
-    if (loader != NULL) {
+    auto loader = Loader::createLoader(level);
+    if (loader) {
         // First Loader test
         error = loader->load(level);
         if (error != 0) {
-            delete loader;
             return error;
         }
 
         // And now...?
 
-        delete loader;
         getConsole() << "Tried Loader..." << Console::endl;
     }
 
-    if ((loader == NULL) || (error == 0)) {
+    if ((!loader) || (error == 0)) {
         // Old TombRaider level loader
         error = mTombRaider.Load(levelName.c_str());
         if (error != 0)

src/loader/Loader.cpp

@@ -34,7 +34,7 @@ Loader::LoaderVersion Loader::checkFile(std::string f) {
     return TR_UNKNOWN;
 }
 
-Loader *Loader::createLoader(std::string f) {
+std::unique_ptr<Loader> Loader::createLoader(std::string f) {
     LoaderVersion v = checkFile(f);
     switch (v) {
         case TR_1:
@@ -45,7 +45,7 @@ Loader *Loader::createLoader(std::string f) {
             return NULL;
 
         case TR_2:
-            return new LoaderTR2();
+            return std::unique_ptr<Loader>(new LoaderTR2());
     }
 }
 

src/loader/LoaderTR2.cpp

@@ -5,6 +5,8 @@
  * \author xythobuz
  */
 
+#include <array>
+#include <cstdint>
 #include <vector>
 
 #include "global.h"
@@ -12,16 +14,9 @@
 #include "loader/LoaderTR2.h"
 
 LoaderTR2::LoaderTR2() {
-    numTextiles = 0;
-    textiles = nullptr;
 }
 
 LoaderTR2::~LoaderTR2() {
-    if (textiles != nullptr) {
-        for (unsigned int i = 0; i < numTextiles; i++)
-            delete [] textiles[i];
-        delete [] textiles;
-    }
 }
 
 int LoaderTR2::load(std::string f) {
@@ -98,21 +93,25 @@ void LoaderTR2::loadPaletteTextiles() {
     file.seek(file.tell() + 768); // Skip 8bit palette, 256 * 3 bytes
 
     // Read the 16bit palette, 256 * 4 bytes, RGBA, A unused
+    std::array<uint32_t, 256> palette; //!< RGBA, A unused
     for (auto &x : palette)
         x = file.readU32();
 
-    numTextiles = file.readU32();
+    uint32_t numTextiles = file.readU32();
 
     file.seek(file.tell() + (numTextiles * 256 * 256)); // Skip 8bit textiles
 
     // Read the 16bit textiles, numTextiles * 256 * 256 * 2 bytes
-    textiles = new uint16_t *[numTextiles];
+    std::vector<std::array<uint16_t, 256 * 256>> textiles;
     for (unsigned int i = 0; i < numTextiles; i++) {
-        textiles[i] = new uint16_t[256 * 256];
-        for (unsigned int j = 0; j < (256 * 256); j++) {
-            textiles[i][j] = file.readU16();
+        std::array<uint16_t, 256 * 256> arr;
+        for (auto &x : arr) {
+            x = file.readU16();
         }
+        textiles.push_back(arr);
     }
+
+    // TODO store palette and textiles somewhere
 }
 
 void LoaderTR2::loadRooms() {