Added my Todo list

include/World.h

@@ -128,7 +128,7 @@ public:
     void addRoom(room_mesh_t *room);
 
     /*!
-     * \brief ADds mesh to world
+     * \brief Adds mesh to world
      * \param model mesh to add
      */
     void addMesh(model_mesh_t *model);

include/WorldData.h

@@ -10,6 +10,7 @@
 #define _WORLDDATA_H_
 
 #include "math/math.h"
+#include "SkeletalModel.h"
 
 // Mirrors TombRaider class' room flags really
 typedef enum {
@@ -37,7 +38,7 @@ typedef struct {
     vertex_t vertex[4];
     texel_t texel[4];
     float pos[3];
-    float radius;       //!< \fixme yeah, I know
+    float radius;       //!< \fixme yeah, I know (I don't? --xythobuz)
     int texture;
 } sprite_t;
 
@@ -90,7 +91,7 @@ typedef struct entity_s {
     int objectId;            //!< What kind of entity?
 
     int modelId;             //!< Animation model
-    void *tmpHook;
+    SkeletalModel *tmpHook;
     bool animate;
 
     /*

src/Command.cpp

@@ -252,10 +252,9 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             return -999;
         }
         if (getGame().mLara) {
-            SkeletalModel *smdl = static_cast<SkeletalModel *>(getGame().mLara->tmpHook);
             skeletal_model_t *mdl = getWorld().getModel(atoi(args->at(0)));
-            if (smdl)
-                smdl->setModel(mdl);
+            if (getGame().mLara->tmpHook)
+                getGame().mLara->tmpHook->setModel(mdl);
         }
         //m_render.ViewModel(LARA, atoi(cmd));
     } else if (strcmp(command, "pos") == 0) {
@@ -455,7 +454,7 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
                 getConsole().print("Pass BOOL to pigtail command!");
                 return -46;
             }
-            SkeletalModel *tmp = static_cast<SkeletalModel *>(getGame().mLara->tmpHook);
+            SkeletalModel *tmp = getGame().mLara->tmpHook;
             tmp->model->pigtails = b;
             if (b) {
                 tmp->model->ponyOff -= 20;
@@ -475,7 +474,7 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             return -999;
         }
         if (args->size() > 3) {
-            SkeletalModel *tmp = static_cast<SkeletalModel *>(getGame().mLara->tmpHook);
+            SkeletalModel *tmp = 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));

src/Render.cpp

@@ -490,7 +490,7 @@ void Render::display()
     // Let's see the LoS -- should be event controled
     if (getGame().mLara)
     {
-        // SkeletalModel *mdl = (SkeletalModel *)getGame().mLara->tmpHook;
+        // SkeletalModel *mdl = getGame().mLara->tmpHook;
 
         // Draw in solid colors
         glDisable(GL_TEXTURE_2D);
@@ -573,12 +573,8 @@ void Render::display()
             // Mongoose 2002.08.15, Nothing to draw, skip
             // Mongoose 2002.12.24, Some entities have no animation  =p
             if (e->tmpHook)
-            {
-                SkeletalModel *mdl = static_cast<SkeletalModel *>(e->tmpHook);
-
-                if (mdl->model->animation.empty())
+                if (e->tmpHook->model->animation.empty())
                     continue;
-            }
 
             // Is it in view volume? ( Hack to use sphere )
             if (!isVisible(e->pos[0], e->pos[1], e->pos[2], 512.0f))
@@ -608,7 +604,7 @@ void Render::display()
             glPushMatrix();
             glTranslatef(e->pos[0], e->pos[1], e->pos[2]);
             glRotatef(e->angles[1], 0, 1, 0);
-            drawModel(static_cast<SkeletalModel *>(e->tmpHook));
+            drawModel(e->tmpHook);
             glPopMatrix();
         }
     }
@@ -849,7 +845,7 @@ void Render::drawObjects()
     // Draw lara or other player model ( move to entity rendering method )
     if (mFlags & Render::fViewModel && getGame().mLara && getGame().mLara->tmpHook)
     {
-        SkeletalModel *mdl = static_cast<SkeletalModel *>(getGame().mLara->tmpHook);
+        SkeletalModel *mdl = getGame().mLara->tmpHook;
 
         if (mdl)
         {
@@ -890,7 +886,7 @@ void Render::drawObjects()
         glRotated(OR_RAD_TO_DEG(getCamera().getRadianYaw()), 0, 1, 0);
 #endif
 
-        drawModel(static_cast<SkeletalModel *>(getGame().mLara->tmpHook));
+        drawModel(getGame().mLara->tmpHook);
         glPopMatrix();
     }