diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp index 9d432c5b6..b841e5427 100644 --- a/apps/openmw/mwbase/world.hpp +++ b/apps/openmw/mwbase/world.hpp @@ -142,9 +142,6 @@ namespace MWBase virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0; ///< Return a pointer to a liveCellRef with the given Ogre handle. - virtual void - copyObjectToCell(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell, const ESM::Position &pos) = 0; - /// \todo enable reference in the OGRE scene virtual void enable (const MWWorld::Ptr& ptr) = 0; @@ -208,7 +205,7 @@ namespace MWBase virtual void rotateObject(const MWWorld::Ptr& ptr,float x,float y,float z, bool adjust = false) = 0; virtual void safePlaceObject(const MWWorld::Ptr& ptr,MWWorld::CellStore &Cell,ESM::Position pos) = 0; - ///< place an object in a "safe" location (ie not in the void, etc). Makes a copy of the Ptr. + ///< place an object in a "safe" location (ie not in the void, etc). virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false) const = 0; @@ -224,7 +221,7 @@ namespace MWBase virtual bool toggleCollisionMode() = 0; ///< Toggle collision mode for player. If disabled player object should ignore /// collisions and gravity. - ///< \return Resulting mode + /// \return Resulting mode virtual bool toggleRenderMode (RenderMode mode) = 0; ///< Toggle a render mode. diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index cd979e2ec..570b8e081 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include @@ -19,7 +20,6 @@ #include "interpretercontext.hpp" #include "ref.hpp" -#include "OgreSceneNode.h" namespace MWScript { @@ -389,8 +389,6 @@ namespace MWScript virtual void execute (Interpreter::Runtime& runtime) { - //MWWorld::Ptr ptr = R()(runtime); - std::string itemID = runtime.getStringLiteral (runtime[0].mInteger); runtime.pop();