Menu play button working

ChangeLog.md

@@ -5,6 +5,7 @@
     [ 20140505 ]
     * Moved setup of Room, Portal, Box, Sector, ... into their
       Constructors.
+    * Fixed menu play button
 
     [ 20140504 ]
     * Forcing use of new Room and Sprite classes in World.

include/Menu.h

@@ -44,6 +44,8 @@ private:
 
     void displayMapList();
 
+    void play();
+
     bool mVisible;
     unsigned int mCursor;
     unsigned int mMin;

include/Render.h

@@ -53,11 +53,6 @@ public:
         fAllRooms               = (1 << 14)
     } RenderFlags;
 
-    typedef enum {
-        roomMesh,
-        skeletalMesh
-    } RenderMeshType;
-
     /*!
      * \brief Constructs an object of Render
      */
@@ -166,9 +161,8 @@ public:
      *
      * Texture must be initialized.
      * \param r_mesh Mesh to render.
-     * \param type Must be object containing mesh
      */
-    void drawModelMesh(model_mesh_t *r_mesh, RenderMeshType type);
+    void drawModelMesh(model_mesh_t *r_mesh);
 
     //! \fixme should be private
 

include/Room.h

@@ -9,9 +9,7 @@
 #define _ROOM_H_
 
 #include <vector>
-#include <memory>
 #include "math/math.h"
-#include "math/Matrix.h"
 #include "Mesh.h"
 #include "Sprite.h"
 #include "TombRaider.h"

include/RoomData.h

@@ -12,8 +12,6 @@
 #include <memory>
 #include "math/math.h"
 #include "math/Matrix.h"
-#include "Mesh.h"
-#include "Sprite.h"
 #include "TombRaider.h"
 
 class Light {

src/Menu.cpp

@@ -194,6 +194,16 @@ void Menu::display() {
     }
 }
 
+void Menu::play() {
+    char *tmp = bufferString("load %s", mMapList[mCursor]);
+    if (getOpenRaider().command(tmp) == 0) {
+        setVisible(false);
+    } else {
+        //! \todo Display something if an error occurs
+    }
+    delete [] tmp;
+}
+
 void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
     if (!pressed)
         return;
@@ -221,13 +231,7 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
         while (i-- > 0)
             handleKeyboard(upKey, true);
     } else if (key == enterKey) {
-        char *tmp = bufferString("load %s", mMapList[mCursor]);
-        if (getOpenRaider().command(tmp) == 0) {
-            setVisible(false);
-        } else {
-            //! \todo Display something if an error occurs
-        }
-        delete [] tmp;
+        play();
     }
 }
 
@@ -242,7 +246,7 @@ void Menu::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton butto
         mCursor = mMin + (y / 25);
     } else if ((y >= 25) && (y <= 100) && (x >= 25) && (x <= 125)) {
         // Play button
-        mCursor = 0;
+        play();
     }
 }
 

src/Render.cpp

@@ -900,7 +900,7 @@ void Render::drawModel(SkeletalModel *model)
 
                 if (tag2)
                 {
-                    drawModelMesh(getWorld().getMesh(tag2->mesh), Render::skeletalMesh);
+                    drawModelMesh(getWorld().getMesh(tag2->mesh));
                 }
             }
         }
@@ -943,20 +943,17 @@ void Render::drawModel(SkeletalModel *model)
                     {
                         glPushMatrix();
                         glTranslatef(mdl->ponyOff2, 0.0, 0.0);
-                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i),
-                                Render::skeletalMesh);
+                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i));
                         glPopMatrix();
 
                         glPushMatrix();
                         glTranslatef(-mdl->ponyOff2, 0.0, 0.0);
-                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i),
-                                Render::skeletalMesh);
+                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i));
                         glPopMatrix();
                     }
                     else
                     {
-                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i),
-                                Render::skeletalMesh);
+                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i));
                     }
                 }
 
@@ -969,7 +966,7 @@ void Render::drawModel(SkeletalModel *model)
             }
         }
 
-        drawModelMesh(getWorld().getMesh(tag->mesh), Render::skeletalMesh);
+        drawModelMesh(getWorld().getMesh(tag->mesh));
     }
 
     // Cycle frames ( cheap hack from old ent state based system )
@@ -1213,7 +1210,7 @@ void Render::tmpRenderModelMesh(model_mesh_t *r_mesh, texture_tri_t *ttri)
 }
 
 
-void Render::drawModelMesh(model_mesh_t *r_mesh, RenderMeshType type)
+void Render::drawModelMesh(model_mesh_t *r_mesh)
 {
     texture_tri_t *ttri;
     int lastTexture = -1;
@@ -1230,17 +1227,7 @@ void Render::drawModelMesh(model_mesh_t *r_mesh, RenderMeshType type)
     glColor3fv(WHITE);
 
     if (mMode == modeWireframe)
-    {
-        switch (type)
-        {
-            case roomMesh:
-                glColor3fv(YELLOW);
-                break;
-            case skeletalMesh:
-                glColor3fv(WHITE);
-                break;
-        }
-    }
+        glColor3fv(WHITE);
 
     glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
     glBindTexture(GL_TEXTURE_2D, 1);  // White texture for colors

src/RoomData.cpp

@@ -69,6 +69,8 @@ Light::LightType Light::getType() {
     return type;
 }
 
+// ----------------------------------------------------------------------------
+
 StaticModel::StaticModel(TombRaider &tr, unsigned int room, unsigned int i) {
     tr.getRoomModel(room, i, &index, pos, &yaw);
 }
@@ -86,7 +88,7 @@ void StaticModel::display() {
     glTranslated(pos[0], pos[1], pos[2]);
     glRotated(yaw, 0, 1, 0);
 
-    getRender().drawModelMesh(mesh, Render::roomMesh);
+    getRender().drawModelMesh(mesh);
     glPopMatrix();
 }
 
@@ -99,6 +101,8 @@ bool StaticModel::operator<(const StaticModel &other) {
     return (distA < distB);
 }
 
+// ----------------------------------------------------------------------------
+
 Portal::Portal(TombRaider &tr, unsigned int room, unsigned int index, Matrix &transform) {
     float portalVertices[12];
     tr.getRoomPortal(room, index, &adjoiningRoom, normal, portalVertices);
@@ -124,10 +128,14 @@ int Portal::getAdjoiningRoom() {
     return adjoiningRoom;
 }
 
+// ----------------------------------------------------------------------------
+
 Box::Box(TombRaider &tr, unsigned int room, unsigned int index) {
     tr.getRoomBox(room, index, a, b, c, d);
 }
 
+// ----------------------------------------------------------------------------
+
 Sector::Sector(TombRaider &tr, unsigned int room, unsigned int index) {
     unsigned int sectorFlags;
     int floorDataIndex, boxIndex, roomBelow, roomAbove;