Fixed wireframe background color

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141116 ]
+    * Fixed background color of wireframe mode
+
     [ 20141110 ]
     * Added [Binspector](https://github.com/binspector/binspector) binary file format template
       that can be used to parse and analyze TR2 and TR3 script files.

src/Render.cpp

@@ -167,8 +167,8 @@ void Render::setMode(int n) {
             break;
         case Render::modeSolid:
         case Render::modeWireframe:
-            glClearColor(PURPLE[0] * 256.0f, PURPLE[1] * 256.0f,
-                         PURPLE[2] * 256.0f, PURPLE[3] * 256.0f);
+            glClearColor(PURPLE[0] / 256.0f, PURPLE[1] / 256.0f,
+                    PURPLE[2] / 256.0f, PURPLE[3] / 256.0f);
             glDisable(GL_TEXTURE_2D);
             break;
         default:
@@ -178,7 +178,8 @@ void Render::setMode(int n) {
                 glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
             }
 
-            glClearColor(BLACK[0], BLACK[1], BLACK[2], BLACK[3]);
+            glClearColor(BLACK[0] / 256.0f, BLACK[1] / 256.0f,
+                    BLACK[2] / 256.0f, BLACK[3] / 256.0f);
 
             glEnable(GL_TEXTURE_2D);
     }
@@ -378,16 +379,13 @@ void Render::drawLoadScreen() {
 }
 
 void Render::newRoomRenderList(int index) {
+    assert(index >= 0);
+
     static int currentRoomId = -1;
 
-    if (index == -1) { // -1 is error, so draw room 0, for the hell of it
-        mRoomRenderList.clear();
-        mRoomRenderList.push_back(&getWorld().getRoom(0));
-    } else {
-        // Update room render list if needed
-        if (currentRoomId != index) {
-            buildRoomRenderList(getWorld().getRoom(index));
-        }
+    // Update room render list if needed
+    if (currentRoomId != index) {
+        buildRoomRenderList(getWorld().getRoom(index));
     }
 
     currentRoomId = index;

src/TextureManager.cpp

@@ -157,7 +157,6 @@ int TextureManager::loadBufferSlot(unsigned char* image,
     }
 
     glColor3ubv(WHITE);
-    glClearColor(0.0, 0.0, 0.0, 0.0);
     glEnable(GL_DEPTH_TEST);
     glShadeModel(GL_SMOOTH);
 

src/Window.cpp

@@ -40,7 +40,7 @@ int Window::initializeGL() {
     //glCullFace(GL_FRONT);
 
     // Set background to black
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+    glClearColor(BLACK[0] / 256.0f, BLACK[1] / 256.0f, BLACK[2] / 256.0f, BLACK[3] / 256.0f);
 
     // Disable lighting
     glDisable(GL_LIGHTING);

src/loader/LoaderTR2.cpp

@@ -387,7 +387,7 @@ void LoaderTR2::loadStaticMeshes() {
         uint16_t mesh = file.readU16(); // Offset into MeshPointers[]
 
         // tr2_vertex BoundingBox[2][2];
-        // // First index is which one, second index is opposite corners
+        // First index is which one, second index is opposite corners
         int16_t x11 = file.read16();
         int16_t y11 = file.read16();
         int16_t z11 = file.read16();