krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

more cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2012-09-18 11:06:19 +02:00
parent 408c5b8bd4
commit ea8eab4f34
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwbase/world.hpp
View file

@ -142,9 +142,6 @@ namespace MWBase
virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0; virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0;
///< Return a pointer to a liveCellRef with the given Ogre handle. ///< 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 /// \todo enable reference in the OGRE scene
virtual void enable (const MWWorld::Ptr& ptr) = 0; 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 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; 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) virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
const = 0; const = 0;
@ -224,7 +221,7 @@ namespace MWBase
virtual bool toggleCollisionMode() = 0; virtual bool toggleCollisionMode() = 0;
///< Toggle collision mode for player. If disabled player object should ignore ///< Toggle collision mode for player. If disabled player object should ignore
/// collisions and gravity. /// collisions and gravity.
///< \return Resulting mode /// \return Resulting mode
virtual bool toggleRenderMode (RenderMode mode) = 0; virtual bool toggleRenderMode (RenderMode mode) = 0;
///< Toggle a render mode. ///< Toggle a render mode.

4
apps/openmw/mwscript/transformationextensions.cpp
View file

@ -1,6 +1,7 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <OgreMath.h> #include <OgreMath.h>
#include <OgreSceneNode.h>
#include <components/esm_store/store.hpp> #include <components/esm_store/store.hpp>
#include <components/esm/loadcell.hpp> #include <components/esm/loadcell.hpp>
@ -19,7 +20,6 @@
#include "interpretercontext.hpp" #include "interpretercontext.hpp"
#include "ref.hpp" #include "ref.hpp"
#include "OgreSceneNode.h"
namespace MWScript namespace MWScript
{ {
@ -389,8 +389,6 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime) virtual void execute (Interpreter::Runtime& runtime)
{ {
//MWWorld::Ptr ptr = R()(runtime);
std::string itemID = runtime.getStringLiteral (runtime[0].mInteger); std::string itemID = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();