Enabled MULTITEXTURE in debug builds

CMakeLists.txt

@@ -58,7 +58,7 @@ set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} ${WARNINGS}")
 # Flags for Debug build
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
-# set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DMULTITEXTURE")
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DMULTITEXTURE")
 
 # Flags for Releasae builds
 set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -DNDEBUG")

TODO.md

@@ -9,6 +9,7 @@
     * Use std::strings
     * Rewrite Console and use operator << to write to the console?
 * SDL_TTF 2.0.12+ can do line breaks, use it: http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688
+* Mesh has 2 different approaches of storing the same data (eg. mColors and mColorArray), but half of ‘em isn’t implemented. Unify this, probably even reusing the Mesh class for the model_meshes...
 
 ## Changes
 

src/Entity.cpp

@@ -104,7 +104,6 @@ void Entity::move(char movement) {
             return;
     }
 
-    //room = getRoomByLocation(x, y, z);
     roomNew = getWorld().getRoomByLocation(room, x, y, z);
 
     if (roomNew == -1) { // Will we hit a portal?

src/Room.cpp

@@ -13,6 +13,11 @@
 #include "Render.h"
 #include "Room.h"
 
+#ifdef MULTITEXTURE
+#include <map>
+extern std::map<int, int> gMapTex2Bump;
+#endif
+
 Room::Room(TombRaider &tr, unsigned int index) {
     vec3_t box[2];
     Matrix transform;