mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-09-18 10:49:51 +02:00
parent 4469976be9
commit 408c5b8bd4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/openmw/mwscript/transformationextensions.cpp
View File

@ -1,6 +1,9 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <OgreMath.h>
#include <components/esm_store/store.hpp> #include <components/esm_store/store.hpp>
#include <components/esm/loadcell.hpp>
#include <components/compiler/extensions.hpp> #include <components/compiler/extensions.hpp>
@ -11,18 +14,13 @@
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"
#include "../mwworld/manualref.hpp"
#include "interpretercontext.hpp" #include "interpretercontext.hpp"
#include "ref.hpp" #include "ref.hpp"
#include "OgreSceneNode.h" #include "OgreSceneNode.h"
#include "../mwworld/player.hpp"
#include <components/esm/loadcell.hpp>
#include "../mwworld/manualref.hpp"
#include "OgreMath.h"
namespace MWScript namespace MWScript
{ {
namespace Transformation namespace Transformation
@ -172,6 +170,8 @@ namespace MWScript
{ {
runtime.push(ptr.getRefData().getPosition().pos[2]); runtime.push(ptr.getRefData().getPosition().pos[2]);
} }
else
throw std::runtime_error ("invalid rotation axis: " + axis);
} }
}; };
@ -192,7 +192,6 @@ namespace MWScript
float ax = ptr.getRefData().getPosition().pos[0]; float ax = ptr.getRefData().getPosition().pos[0];
float ay = ptr.getRefData().getPosition().pos[1]; float ay = ptr.getRefData().getPosition().pos[1];
float az = ptr.getRefData().getPosition().pos[2]; float az = ptr.getRefData().getPosition().pos[2];
if(axis == "x") if(axis == "x")
{ {
@ -206,6 +205,8 @@ namespace MWScript
{ {
MWBase::Environment::get().getWorld()->moveObject(ptr,ax,ay,pos); MWBase::Environment::get().getWorld()->moveObject(ptr,ax,ay,pos);
} }
else
throw std::runtime_error ("invalid axis: " + axis);
} }
}; };
@ -233,6 +234,8 @@ namespace MWScript
{ {
runtime.push(ptr.getCellRef().pos.pos[2]); runtime.push(ptr.getCellRef().pos.pos[2]);
} }
else
throw std::runtime_error ("invalid axis: " + axis);
} }
}; };
@ -331,8 +334,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();
std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
@ -402,10 +403,9 @@ namespace MWScript
Interpreter::Type_Float zRot = runtime[0].mFloat; Interpreter::Type_Float zRot = runtime[0].mFloat;
runtime.pop(); runtime.pop();
MWWorld::CellStore* store = 0;
int cx,cy; int cx,cy;
MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy); MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);
store = MWBase::Environment::get().getWorld()->getExterior(cx,cy); MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
if(store) if(store)
{ {
ESM::Position pos; ESM::Position pos;