Runs again. Wrong SkeletalModels used?

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140516 ]
+    * Finished moving the Entity/SkeletalModel logic into classes
+    * Currently seems as if wrong SkeletalModels are used for entities?
+
     [ 20140515 ]
     * Slight cmake script improvements
     * Created Entity class that will also get animation state

TODO.md

@@ -17,6 +17,11 @@ There are these DebugModel, DebugMap flags...?
 ## Changes
 
 * Using std::vector with [] is not bound checked. Segfaults were caused because the upper bound of the argument was never checked and garbage was returned... Do consistent checks, or use .at() as it throws an exception
+* Creating the Room class has introduced a bug that crashes when walking the level:
+
+    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...?
 
 ## Cmake
 

src/SkeletalModel.cpp

@@ -81,9 +81,14 @@ BoneFrame::BoneFrame(TombRaider &tr, unsigned int index, unsigned int i, unsigne
     tr2_moveable_t *moveable = tr.Moveable();
     tr2_item_t *item = tr.Item();
 
-    pos[0] = (short)*frame[*frame_offset + 6];
-    pos[1] = (short)*frame[*frame_offset + 7];
-    pos[2] = (short)*frame[*frame_offset + 8];
+    /*!
+     * \fixme Do we really need to keep frame and frame_offset
+     * at the top level, passing pointers?!
+     */
+
+    pos[0] = (short)((*frame)[(*frame_offset) + 6]);
+    pos[1] = (short)((*frame)[(*frame_offset) + 7]);
+    pos[2] = (short)((*frame)[(*frame_offset) + 8]);
 
     yaw = ((item[i].angle >> 14) & 0x03);
     yaw *= 90;