From 41d4ad93f8609a906e54210c7d8ef4a7470001b8 Mon Sep 17 00:00:00 2001
From: Sebastian Wick <wick.sebastian@gmail.com>
Date: Tue, 2 Aug 2011 18:50:31 +0200
Subject: [PATCH] World::moveObjectImp
---
apps/openmw/mwworld/world.cpp | 7 ++++++-
apps/openmw/mwworld/world.hpp | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 1a424d7c8..2a89b1f42 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -647,7 +647,7 @@ namespace MWWorld
}
}
- void World::moveObject (Ptr ptr, float x, float y, float z)
+ void World::moveObjectImp (Ptr ptr, float x, float y, float z)
{
ptr.getCellRef().pos.pos[0] = x;
ptr.getCellRef().pos.pos[1] = y;
@@ -674,6 +674,11 @@ namespace MWWorld
}
}
}
+ }
+
+ void World::moveObject (Ptr ptr, float x, float y, float z)
+ {
+ moveObjectImp(ptr, x, y, z);
mPhysics->moveObject (ptr.getRefData().getHandle(), Ogre::Vector3 (x, y, z),
!DoingPhysics::isDoingPhysics());
diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp
index 045d37aac..53dd2c86c 100644
--- a/apps/openmw/mwworld/world.hpp
+++ b/apps/openmw/mwworld/world.hpp
@@ -179,6 +179,8 @@ namespace MWWorld
///< Return handle of the object the player is looking at
void deleteObject (Ptr ptr);
+
+ void moveObjectImp (Ptr ptr, float x, float y, float z);
void moveObject (Ptr ptr, float x, float y, float z);