Added TombRaider level loader

include/Game.h

@@ -9,6 +9,7 @@
 #define _GAME_H_
 
 #include "global.h"
+#include "TombRaider.h"
 
 /*!
  * \brief Game abstraction
@@ -16,6 +17,7 @@
 class Game {
 public:
 
+    // Throw exception with negative integer error code if fails
     Game(const char *level);
 
     ~Game();
@@ -26,8 +28,12 @@ public:
 
     void display();
 
+    void percentCallback(int percent);
+
 private:
 
+    char *mName;
+    TombRaider mTombRaider;
 };
 
 #endif

src/CMakeLists.txt

@@ -37,6 +37,7 @@ set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp")
 set (SRCS ${SRCS} "OpenRaider.cpp")
 set (SRCS ${SRCS} "Sound.cpp")
+set (SRCS ${SRCS} "TombRaider.cpp")
 set (SRCS ${SRCS} "Window.cpp")
 
 # Select available Windowing library

src/Game.cpp

@@ -14,13 +14,33 @@
 #endif
 
 #include "main.h"
-#include "Window.h"
+#include "Console.h"
 #include "Game.h"
+#include "utils/strings.h"
 
+void percentCallbackTrampoline(int percent, void *data) {
+    Game *self = static_cast<Game *>(data);
+    self->percentCallback(percent);
+}
+
+void Game::percentCallback(int percent) {
+
+}
+
+// Throw exception with negative integer error code if fails
 Game::Game(const char *level) {
+    mName = bufferString("%s", level);
+
+    gOpenRaider->mConsole->print("Loading %s", mName);
+    int error = mTombRaider.Load(mName, percentCallbackTrampoline, this);
+    if (error != 0) {
+        throw error;
+    }
 }
 
 Game::~Game() {
+    if (mName)
+        delete [] mName;
 }
 
 void Game::handleAction(ActionEvents action, bool isFinished) {
@@ -32,7 +52,7 @@ void Game::handleMouseMotion(int xrel, int yrel) {
 }
 
 void Game::display() {
-    unsigned char color[4] = {0xFF, 0xFF, 0xFF, 0xFF};
-    gOpenRaider->mWindow->drawText(10, 10, 1.50f, color, "Game");
+    glClearColor(0.00f, 0.70f, 0.00f, 1.0f);
+    glClear(GL_COLOR_BUFFER_BIT);
 }
 

src/Menu.cpp

@@ -148,7 +148,10 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
         while (i-- > 0)
             handleKeyboard(up, true);
     } else if (key == enter) {
-
+        char *tmp = bufferString("load %s", gOpenRaider->mMapList[mCursor]);
+        if (gOpenRaider->command(tmp) == 0)
+            setVisible(false);
+        delete [] tmp;
     }
 }
 

src/OpenRaider.cpp

@@ -161,6 +161,7 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
     } else if (strcmp(command, "help") == 0) {
         if (args->size() == 0) {
             mConsole->print("Available commands:");
+            mConsole->print("  load");
             mConsole->print("  set");
             mConsole->print("  bind");
             mConsole->print("  help");
@@ -170,7 +171,19 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             return help(args->at(0));
         } else {
             mConsole->print("Invalid use of help-command");
-            return -5;
+            return -4;
+        }
+    } else if (strcmp(command, "load") == 0) {
+        if (mGame)
+            delete mGame;
+        char *tmp = bufferString("%s%s", mPakDir, args->at(0));
+        try {
+            mGame = new Game(tmp);
+            delete [] tmp;
+            return 0;
+        } catch (int error) {
+            delete [] tmp;
+            return error;
         }
     } else {
         mConsole->print("Unknown command: %s ", command);
@@ -216,6 +229,9 @@ int OpenRaider::help(const char *cmd) {
         mConsole->print("Key-Format:");
         mConsole->print("  'a' or '1'    for character/number keys");
         mConsole->print("  \"leftctrl\"  for symbols and special keys");
+    } else if (strcmp(cmd, "load") == 0) {
+        mConsole->print("load-Command Usage:");
+        mConsole->print("  load levelfile.name");
     } else {
         mConsole->print("No help available for %s", cmd);
         return -1;