Fixed Lara no longer rotating with camera

TODO.md

@@ -21,7 +21,7 @@ There are these DebugModel, DebugMap flags...?
 
     Assertion failed: (sector < (int)mRooms.at(room)->sizeSectors()), function isWall, file /Users/thomas/Projekte/OpenRaider/src/World.cpp, line 180.
 
-* The wrong SkeletalModels are used by other entities...?
+* The wrong SkeletalModels are used by entities, except for Lara...?
 
 ## Cmake
 
@@ -36,10 +36,3 @@ There are these DebugModel, DebugMap flags...?
     * Cut TGA image reader, currently only used for menu background?!
 * When cutscene rendering is working, use TR4/5 style menu?
 
-## Errors
-
-* Sometimes this on quitting OpenRaider:
-
-    OpenRaider(92329,0x7fff7a8c4310) malloc: *** error for object 0x7fabc2001000: incorrect checksum for freed object - object was probably modified after being freed.
-
-

include/TombRaiderData.h

@@ -17,17 +17,17 @@
 #define TR_SOUND_FOOTSTEP0 1
 #define TR_SOUND_F_PISTOL  12
 
-#define TR_ANIAMTION_RUN            0
-#define TR_ANIAMTION_STAND          11
-#define TR_ANIAMTION_TURN_L         12
-#define TR_ANIAMTION_TURN_R         13
-#define TR_ANIAMTION_HIT_WALL_FRONT 53
-#define TR_ANIAMTION_SWIM_IDLE      87
-#define TR_ANIAMTION_SWIM           86
-#define TR_ANIAMTION_SWIM_L         143
-#define TR_ANIAMTION_SWIM_R         144
-#define TR_ANIAMTION_GRAB_LEDGE     96
-#define TR_ANIAMTION_PULLING_UP     97
+#define TR_ANIMATION_RUN            0
+#define TR_ANIMATION_STAND          11
+#define TR_ANIMATION_TURN_L         12
+#define TR_ANIMATION_TURN_R         13
+#define TR_ANIMATION_HIT_WALL_FRONT 53
+#define TR_ANIMATION_SWIM_IDLE      87
+#define TR_ANIMATION_SWIM           86
+#define TR_ANIMATION_SWIM_L         143
+#define TR_ANIMATION_SWIM_R         144
+#define TR_ANIMATION_GRAB_LEDGE     96
+#define TR_ANIMATION_PULLING_UP     97
 
 typedef enum {
     TR_VERSION_UNKNOWN,

src/Console.cpp

@@ -5,6 +5,8 @@
  * \author xythobuz
  */
 
+#include <iostream>
+
 #include "global.h"
 #include "Console.h"
 #include "OpenRaider.h"
@@ -67,7 +69,7 @@ void Console::print(const char *s, ...) {
     if (tmp != NULL) {
         mHistory.push_back(tmp);
 #ifdef DEBUG
-        printf("%s\n", tmp);
+        std::cout << tmp << std::endl;
 #endif
     }
 }
@@ -205,8 +207,6 @@ void Console::moveInHistory(bool up) {
 }
 
 void Console::handleText(char *text, bool notFinished) {
-    //printf("Text: %s (%s)\n", text, (notFinished ? "not finished" : "finished"));
-
     // Always scroll to bottom when text input is received
     mLineOffset = 0;
 
@@ -225,7 +225,7 @@ void Console::handleText(char *text, bool notFinished) {
         size_t length = strlen(text);
         if (length > 0) {
             if (((INPUT_BUFFER_SIZE - mInputBufferPointer) < length)) {
-                printf("Console input buffer overflowed! (> %d)\n", INPUT_BUFFER_SIZE);
+                print("Console input buffer overflowed! (> %d)", INPUT_BUFFER_SIZE);
                 return;
             }
             strcpy((mInputBuffer + mInputBufferPointer), text);

src/Entity.cpp

@@ -34,21 +34,6 @@ Entity::Entity(TombRaider &tr, unsigned int index, unsigned int i, unsigned int
     animationFrame = 0;
     idleAnimation = 0;
     state = 0;
-
-    if (tr.Engine() == TR_VERSION_1) {
-        switch (objectId) {
-            case TombRaider1::Wolf:
-                state = TombRaider1::WolfState_Lying;
-                animationFrame = 3;
-                break;
-        }
-    }
-
-    // Gather more info if this is lara
-    if (objectId == 0) {
-        animationFrame = TR_ANIAMTION_RUN;
-        idleAnimation = TR_ANIAMTION_STAND;
-    }
 }
 
 bool Entity::operator<(Entity &o) {
@@ -60,9 +45,7 @@ bool Entity::operator<(Entity &o) {
 void Entity::display() {
     glPushMatrix();
     glTranslatef(pos[0], pos[1], pos[2]);
-    glRotatef(angles[0], 1, 0, 0);
-    glRotatef(angles[1], 0, 1, 0); // Only this was done for non-lara entities
-    glRotatef(angles[2], 0, 0, 1);
+    glRotatef(OR_RAD_TO_DEG(angles[1]), 0, 1, 0);
     getWorld().getSkeletalModel(skeletalModel).display(animationFrame, boneFrame);
     glPopMatrix();
 
@@ -131,7 +114,7 @@ void Entity::move(char movement) {
                 x, y, z);
 
         if (roomNew > -1)
-            printf("Crossing from room %i to %i\n", room, roomNew);
+            getConsole().print("Crossing from room %i to %i", room, roomNew);
         else
             //! \fixme mRooms, sectors, ... are now std::vector, but often upper bound checks are missing
             return;
@@ -230,7 +213,7 @@ void Entity::print() {
     getConsole().print("Entity %d:", objectId);
     getConsole().print("  Room %i (0x%X)", room, getWorld().getRoomInfo(room));
     getConsole().print("  %.1fx %.1fy %.1fz", pos[0], pos[1], pos[2]);
-    getConsole().print("  %.1f Yaw %.1f Pitch", OR_RAD_TO_DEG(angles[1]), OR_RAD_TO_DEG(angles[2]));
+    getConsole().print("  %.1f Yaw", OR_RAD_TO_DEG(angles[1]));
 }
 
 SkeletalModel &Entity::getModel() {

src/Game.cpp

@@ -166,7 +166,6 @@ Entity &Game::getLara() {
 }
 
 void Game::processSprites() {
-    printf("Processing sprites: ");
     for (int i = 0; i < (mTombRaider.NumItems() - 1); i++) {
         if ((mTombRaider.Engine() == TR_VERSION_1) && (mTombRaider.Item()[i].intensity1 == -1))
             continue;
@@ -176,14 +175,15 @@ void Game::processSprites() {
                 getWorld().addSprite(*new SpriteSequence(mTombRaider, i, j));
         }
     }
-    printf("Done! Found %d sprites.\n", mTombRaider.NumSpriteSequences());
+
+    getConsole().print("Found %d sprites.", mTombRaider.NumSpriteSequences());
 }
 
 void Game::processRooms() {
-    printf("Processing rooms: ");
     for (int index = 0; index < mTombRaider.NumRooms(); index++)
         getWorld().addRoom(*new Room(mTombRaider, index));
-    printf("Done! Found %d rooms.\n", mTombRaider.NumRooms());
+
+    getConsole().print("Found %d rooms.", mTombRaider.NumRooms());
 }
 
 void Game::processPakSounds()
@@ -204,8 +204,6 @@ void Game::processPakSounds()
     // in this group, bits 0-1: channel number
     */
 
-    printf("Processing pak sound files: ");
-
     for (i = 0; i < mTombRaider.getSoundSamplesCount(); ++i)
     {
         mTombRaider.getSoundSample(i, &riffSz, &riff);
@@ -225,12 +223,9 @@ void Game::processPakSounds()
         //pos[1] = sound[i].y;
         //pos[2] = sound[i].z;
         //getSound().SourceAt(id, pos);
-
-        //printf(".");
-        //fflush(stdout);
     }
 
-    printf("Done! Found %u files.\n", mTombRaider.getSoundSamplesCount());
+    getConsole().print("Found %u sound samples.", mTombRaider.getSoundSamplesCount());
 }
 
 void Game::processTextures()
@@ -239,8 +234,6 @@ void Game::processTextures()
     unsigned char *bumpmap;
     int i;
 
-    printf("Processing TR textures: ");
-
     //if ( mTombRaider.getNumBumpMaps())
     //  gBumpMapStart = mTombRaider.NumTextures();
 
@@ -270,14 +263,11 @@ void Game::processTextures()
 
         if (bumpmap)
             delete [] bumpmap;
-
-        //printf(".");
-        //fflush(stdout);
     }
 
     mTextureOffset = (mTextureStart - 1) + mTombRaider.NumTextures();
 
-    printf("Done! Found %d textures.\n", mTombRaider.NumTextures());
+    getConsole().print("Found %d textures.", mTombRaider.NumTextures());
 }
 
 void Game::processMoveables()
@@ -288,8 +278,6 @@ void Game::processMoveables()
     tr2_item_t *item = mTombRaider.Item();
     tr2_sprite_sequence_t *sprite_sequence = mTombRaider.SpriteSequence();
 
-    printf("Processing skeletal models: ");
-
     for (int i = 0; i < mTombRaider.NumItems(); ++i)
     {
         int j;
@@ -364,7 +352,7 @@ void Game::processMoveables()
     }
     */
 
-    printf("Done! Found %d models.\n", mTombRaider.NumMoveables() + statCount);
+    getConsole().print("Found %d moveables.", mTombRaider.NumMoveables() + statCount);
 }
 
 // index moveable, i item, sometimes both moveable
@@ -438,7 +426,7 @@ void Game::setupTextureColor(texture_tri_t *r_tri, float *colorf)
     }
     else
     {
-        //printf("Color already loaded %i -> 0x%08x\n",
+        //getConsole().print("Color already loaded %i -> 0x%08x",
         //       gColorTextureHACK.getCurrentIndex(),
         //       gColorTextureHACK.current());
 
@@ -451,7 +439,6 @@ void Game::setupTextureColor(texture_tri_t *r_tri, float *colorf)
 
 void Game::processModels()
 {
-    printf("Processing meshes: ");
     for (int index = 0; index < mTombRaider.getMeshCount(); index++) {
         int i, j, count, texture;
         int vertexIndices[6];
@@ -465,8 +452,6 @@ void Game::processModels()
         {
             //! \fixme allow sparse lists with matching ids instead?
             getWorld().addMesh(NULL); // Filler, to make meshes array ids align
-            //printf("x");
-            //fflush(stdout);
             return;
         }
 
@@ -649,6 +634,6 @@ void Game::processModels()
         getWorld().addMesh(mesh);
     }
 
-    printf("Done! Found %d meshes.\n", mTombRaider.getMeshCount());
+    getConsole().print("Found %d meshes.", mTombRaider.getMeshCount());
 }
 

src/OpenRaider.cpp

@@ -62,7 +62,7 @@ int OpenRaider::initialize() {
 
     error = getWindow().initializeFont();
     if (error != 0) {
-        printf("Could not initialize SDL-TTF (%d)!\n", error);
+        printf("Could not initialize Font (%d)!\n", error);
         return -3;
     }
 
@@ -75,7 +75,7 @@ int OpenRaider::initialize() {
     // Initialize game engine
     error = getGame().initialize();
     if (error != 0) {
-        printf("Could not initialize Game Engine (%d)!\n", error);
+        printf("Could not initialize Game (%d)!\n", error);
         return -5;
     }
 
@@ -456,11 +456,9 @@ int OpenRaider::bind(ActionEvents action, const char *key) {
 
 void OpenRaider::run() {
     assert(mRunning == false);
-
     mRunning = true;
-    while (mRunning) {
+    while (mRunning)
         frame();
-    }
 }
 
 void OpenRaider::frame() {