xrGame: fix is_interactive_motion and get_moving_objects

OpenXRay · Sep 19, 2018 · f423725 · f423725
1 parent 8eec56e
commit f423725
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/xrGame/IKLimbsController.cpp b/src/xrGame/IKLimbsController.cpp
@@ -199,7 +199,7 @@ void CIKLimbsController::ObjectShift(float static_shift, const SCalculateData cd
     CPhysicsShellHolder* sh = smart_cast<CPhysicsShellHolder*>(m_object);
     VERIFY(sh);
     // CCharacterPhysicsSupport *ch = sh->character_physics_support();
-    _object_shift.freeze(!!Device.Paused()); // ch->interactive_motion() ||
+    _object_shift.freeze(!!Device.Paused()); // ch->is_interactive_motion() ||
 
     if (cnt_in_step != sz && PredictObjectShift(cd)) // cnt_in_step > 0 &&
         return;

diff --git a/src/xrGame/PhysicsShellHolder.cpp b/src/xrGame/PhysicsShellHolder.cpp
@@ -322,7 +322,7 @@ void CPhysicsShellHolder::OnChangeVisual()
         if (char_support)
             char_support->destroy_imotion();
 
-        VERIFY(!character_physics_support() || !character_physics_support()->interactive_motion());
+        VERIFY(!character_physics_support() || !character_physics_support()->is_interactive_motion());
         if (m_pPhysicsShell)
             m_pPhysicsShell->Deactivate();
         xr_delete(m_pPhysicsShell);

diff --git a/src/xrGame/alife_simulator.cpp b/src/xrGame/alife_simulator.cpp
@@ -37,7 +37,7 @@ CALifeSimulator::CALifeSimulator(IPureServer* server, shared_str* command_line)
         xr_delete(g_object_factory);
         ai().SetupScriptEngine();
 #ifdef DEBUG
-        ai().moving_objects().clear();
+        ai().get_moving_objects().clear();
 #endif // DEBUG
     }