Removed gLaraModel

src/Game.cpp

@@ -24,7 +24,6 @@
 
 // Old Code compatibility
 #define TexelScale 256.0f
-skeletal_model_t *gLaraModel;
 
 #ifndef EXPERIMENTAL_UNFIFIED_ROOM_GEOMETERY
 #define TextureLimit 24
@@ -556,8 +555,6 @@ void Game::processMoveable(int index, int i, int *ent,
     // Gather more info if this is lara
     if (moveable[index].object_id == 0)
     {
-        gLaraModel = r_model; // hack to avoid broken system until new event sys
-
         lara = true;
         getCamera().translate(pos[0], pos[1] - 470, pos[2]);
         thing->type = 0x02;

src/OpenRaider.cpp

@@ -24,8 +24,6 @@
 #include "utils/time.h"
 #include "OpenRaider.h"
 
-extern skeletal_model_t *gLaraModel; //! \fixme
-
 OpenRaider::OpenRaider() {
     mRunning = false;
     mFPS = false;
@@ -558,13 +556,14 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
                 getConsole().print("Pass BOOL to pigtail command!");
                 return -46;
             }
-            gLaraModel->pigtails = b;
+            SkeletalModel *tmp = static_cast<SkeletalModel *>(getGame().mLara->tmpHook);
+            tmp->model->pigtails = b;
             if (b) {
-                gLaraModel->ponyOff -= 20;
-                gLaraModel->ponytail[1] -= 32;
+                tmp->model->ponyOff -= 20;
+                tmp->model->ponytail[1] -= 32;
             } else {
-                gLaraModel->ponyOff += 20;
-                gLaraModel->ponytail[1] += 32;
+                tmp->model->ponyOff += 20;
+                tmp->model->ponytail[1] += 32;
             }
             getConsole().print("Pigtail is now %s", b ? "on" : "off");
         } else {
@@ -573,10 +572,11 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
         }
     } else if (strcmp(command, "ponypos") == 0) {
         if (args->size() > 3) {
-            gLaraModel->ponytail[0] = (float)atof(args->at(0));
-            gLaraModel->ponytail[1] = (float)atof(args->at(1));
-            gLaraModel->ponytail[2] = (float)atof(args->at(2));
-            gLaraModel->ponytailAngle = (float)atof(args->at(3));
+            SkeletalModel *tmp = static_cast<SkeletalModel *>(getGame().mLara->tmpHook);
+            tmp->model->ponytail[0] = (float)atof(args->at(0));
+            tmp->model->ponytail[1] = (float)atof(args->at(1));
+            tmp->model->ponytail[2] = (float)atof(args->at(2));
+            tmp->model->ponytailAngle = (float)atof(args->at(3));
         } else {
             getConsole().print("Invalid use of ponypos-command!");
             return -48;