Fixed compiler warnings and added plain text file loading to resource manager.

2 files changed, 36 insertions, 0 deletions

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 50d0f4b8..6ed933e4 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -281,3 +281,32 @@ ResourceManager::loadFile(const std::string &fileName, int &fileSize)
 
     return buffer;
 }
+
+std::vector<std::string>
+ResourceManager::loadTextFile(const std::string &fileName)
+{
+    int contentsLength;
+    char *fileContents = (char*)loadFile(fileName, contentsLength);
+    std::vector<std::string> lines;
+
+    if (!fileContents)
+    {
+        logger->log("Couldn't load text file: %s", fileName.c_str());
+        return lines;
+    }
+
+    // Reallocate and include terminating 0 character
+    fileContents = (char*)realloc(fileContents, contentsLength + 1);
+    fileContents[contentsLength] = '\0';
+
+    // Tokenize and add each line separately
+    char *line = strtok(fileContents, "\n");
+    while (line != NULL)
+    {
+        lines.push_back(line);
+        line = strtok(NULL, "\n");
+    }
+
+    free(fileContents);
+    return lines;
+}
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index e3ad1e94..93c2dd85 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -26,6 +26,7 @@
 
 #include <map>
 #include <string>
+#include <vector>
 #include "resource.h"
 #include "image.h"
 #include "music.h"
@@ -114,6 +115,12 @@ class ResourceManager
         loadFile(const std::string &fileName, int &fileSize);
 
         /**
+         * Retrieves the contents of a text file.
+         */
+        std::vector<std::string>
+        loadTextFile(const std::string &fileName);
+
+        /**
          * Returns an instance of the class, creating one if it does not
          * already exist.
          */