gWorld and LARA for Render now moved to Game

include/Game.h

@@ -10,6 +10,7 @@
 
 #include "global.h"
 #include "TombRaider.h"
+#include "World.h"
 
 /*!
  * \brief Game abstraction
@@ -30,10 +31,14 @@ public:
 
     void percentCallback(int percent);
 
+    World mWorld;
+    entity_t *mLara;
+
 private:
 
     char *mName;
     TombRaider mTombRaider;
+
 };
 
 #endif

src/Game.cpp

@@ -29,6 +29,8 @@ void Game::percentCallback(int percent) {
 
 // Throw exception with negative integer error code if fails
 Game::Game(const char *level) {
+    mLara = NULL;
+
     mName = bufferString("%s", level);
 
     // Load the level pak into TombRaider

src/Render.cpp

@@ -24,11 +24,14 @@
 #include "Emitter.h"
 #endif
 
+#include "main.h"
+#include "Game.h"
+#include "OpenRaider.h"
 #include "Render.h"
 
-//! \fixme really should be changed!
-entity_t *LARA = NULL;
-World gWorld;
+//! \fixme Should be changed
+#define LARA gOpenRaider->mGame->mLara
+#define gWorld gOpenRaider->mGame->mWorld
 
 // Colors
 const float BLACK[]       = {  0.0f,  0.0f,  0.0f, 1.0f };