Removed more old stuff from WorldData

include/WorldData.h

@@ -12,27 +12,14 @@
 #include "math/math.h"
 #include "SkeletalModel.h"
 
-// Mirrors TombRaider class' room flags really
 typedef enum {
-    roomFlag_underWater    = 0x0001
-} room_flags_t;
-
-typedef enum {
-    worldMoveType_walkNoSwim   = -1,
-    worldMoveType_walk         = 0,
-    worldMoveType_noClipping   = 1,
-    worldMoveType_fly          = 2,
-    worldMoveType_swim         = 3
+    worldMoveType_walkNoSwim = -1,
+    worldMoveType_walk       = 0,
+    worldMoveType_noClipping = 1,
+    worldMoveType_fly        = 2,
+    worldMoveType_swim       = 3
 } worldMoveType;
 
-typedef struct {
-    vec3_t pos;
-} vertex_t;
-
-typedef struct {
-    vec2_t st;
-} texel_t;
-
 /*! \fixme For now shaders are textures on tex objects
  * and materials on color objects. If -1
  * then it doesn't have that information yet.
@@ -63,15 +50,12 @@ typedef struct {
     vec_t *normals;
 } model_mesh_t;
 
-typedef struct entity_s {
+typedef struct {
     int id;                  //!< Unique identifier
     float pos[3];            //!< World position
     float angles[3];         //!< Euler angles (pitch, yaw, roll)
-    int type;                //!< {(0x00, item), (0x01, ai), (0x02, player)}
     int room;                //!< Current room entity is in
     worldMoveType moveType;  //!< Type of motion/clipping
-    bool moving;             //!< In motion?
-    struct entity_s *master; //!< Part of entity chain?
 
     int state;               //!< State of the Player, AI, or object
     int objectId;            //!< What kind of entity?
@@ -79,13 +63,6 @@ typedef struct entity_s {
     int modelId;             //!< Animation model
     SkeletalModel *tmpHook;
     bool animate;
-
-    /*
-    float time, lastTime;
-    int state, lastState;
-    int event, lastEvent;
-    int goal;
-    */
 } entity_t;
 
 #endif

src/Game.cpp

@@ -447,13 +447,11 @@ void Game::processMoveable(int index, int i, int *ent,
 
     thing = new entity_t;
     thing->id = (*ent)++;
-    thing->type = 0x00;
     thing->pos[0] = item[i].x;
     thing->pos[1] = item[i].y;
     thing->pos[2] = item[i].z;
     thing->angles[1] = yaw;
     thing->objectId = moveable[index].object_id;
-    thing->moving = false;
     thing->animate = false;
 
     sModel = new SkeletalModel();
@@ -487,9 +485,7 @@ void Game::processMoveable(int index, int i, int *ent,
     if (moveable[index].object_id == 0)
     {
         lara = true;
-        thing->type = 0x02;
         mLara = thing; // Mongoose 2002.03.22, Cheap hack for now
-        mLara->master = 0x0;
 
         switch (mTombRaider.Engine())
         {
@@ -855,14 +851,7 @@ void Game::setupTextureColor(texture_tri_t *r_tri, float *colorf)
         r_tri->texture = mTextureOffset + gColorTextureHACK.size();
 
         getRender().loadTexture(Texture::generateColorTexture(color, 32, 32),
-                32, 32,
-                r_tri->texture);
-
-#ifdef DEBUG_COLOR_TEXTURE_GEN
-        printf("Color 0x%02x%02x%02x%02x | 0x%08xto texture[%u]?\n",
-                color[0], color[1], color[2], color[3], colorI,
-                gColorTextureHACK.size());
-#endif
+                32, 32, r_tri->texture);
     }
     else
     {
@@ -1075,8 +1064,6 @@ void Game::processModels()
         std::sort(mesh->coloredRectangles.begin(), mesh->coloredRectangles.end(), compareFaceTextureId);
 
         getWorld().addMesh(mesh);
-        //printf(".");
-        //fflush(stdout);
     }
 
     printf("Done! Found %d meshes.\n", mTombRaider.getMeshCount());

src/Render.cpp

@@ -467,18 +467,6 @@ void Render::display()
             renderTrace(0, u, v); // v = target
         }
 
-        entity_t *route = getGame().mLara->master;
-
-        while (route)
-        {
-            if (route->master)
-            {
-                renderTrace(1, route->pos, route->master->pos);
-            }
-
-            route = route->master;
-        }
-
         glEnable(GL_CULL_FACE);
         glEnable(GL_TEXTURE_2D);
     }
@@ -751,36 +739,6 @@ 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 = getGame().mLara->tmpHook;
-
-        if (mdl)
-        {
-            int frame;
-
-            // Mongoose 2002.03.22, Test 'idle' aniamtions
-            if (!getGame().mLara->moving)
-            {
-                frame = mdl->getIdleAnimation();
-
-                // Mongoose 2002.08.15, Stop flickering of idle lara here
-                if (frame == 11)
-                {
-                    mdl->setFrame(0);
-                }
-            }
-            else
-            {
-                frame = mdl->getAnimation();
-            }
-
-            animation_frame_t *animation = mdl->model->animation[frame];
-
-            if (animation && mdl->getFrame() > (int)animation->frame.size()-1)
-            {
-                mdl->setFrame(0);
-            }
-        }
-
         glPushMatrix();
 
         glTranslated(getGame().mLara->pos[0], getGame().mLara->pos[1], getGame().mLara->pos[2]);

src/Room.cpp

@@ -30,7 +30,12 @@ Room::Room(TombRaider &tr, unsigned int index) {
         return;
     }
 
-    tr.getRoomInfo(index, &flags, pos, box[0], box[1]);
+    flags = 0;
+    unsigned int trFlags = 0;
+    tr.getRoomInfo(index, &trFlags, pos, box[0], box[1]);
+
+    if (trFlags & tombraiderRoom_underWater)
+        flags |= RoomFlagUnderWater;
 
     // Adjust positioning for OR world coordinate translation
     box[0][0] += pos[0];

src/World.cpp

@@ -44,7 +44,6 @@ void World::addEntity(entity_t *e)
 {
     if (e)
     {
-        e->master = 0x0;
         e->moveType = worldMoveType_walk; // Walk
         e->room = getRoomByLocation(e->pos[0], e->pos[1], e->pos[2]);
         mEntities.push_back(e);
@@ -144,16 +143,12 @@ void World::moveEntity(entity_t *e, char movement)
 
     // If you're underwater you may want to swim  =)
     // ...if you're worldMoveType_walkNoSwim, you better hope it's shallow
-    if (roomFlags & roomFlag_underWater && e->moveType == worldMoveType_walk)
-    {
+    if (roomFlags & RoomFlagUnderWater && e->moveType == worldMoveType_walk)
         e->moveType = worldMoveType_swim;
-    }
 
     // Don't swim on land
-    if (!(roomFlags & roomFlag_underWater) && e->moveType == worldMoveType_swim)
-    {
+    if (!(roomFlags & RoomFlagUnderWater) && e->moveType == worldMoveType_swim)
         e->moveType = worldMoveType_walk;
-    }
 
     // Mongoose 2002.09.02, Add check for room -> room transition
     //   ( Only allow by movement between rooms by using portals )
@@ -234,12 +229,10 @@ void World::moveEntity(entity_t *e, char movement)
     }
     else
     {
-        e->moving = false;
         return;
     }
 
     e->room = room;
-    e->moving = true;
 }