mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 00:15:48 +00:00
Code Issues Releases Wiki Activity

2nd try: position/ PositionCell

Browse source
This commit is contained in:
gugus 2012-08-11 09:52:49 +02:00
parent b664b174f0
commit 7fa1dc93d7
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,16 +249,29 @@ namespace MWScript
std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
MWBase::Environment::get().getWorld()->moveObjectToCell(ptr,cellID,x,y,z);
float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getInterior(cellID);
float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); if(!store)
if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity
{ {
ax = ax/60.; ESM::Cell cell = MWBase::Environment::get().getWorld()->getExterior(cellID);
ay = ay/60.; if(cell)
zRot = zRot/60.; {
store = MWBase::Environment::get().getWorld()->getExterior(cell.getGridX(),cell.getGridY());
}
}
if(store)
{
MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z);
float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity
{
ax = ax/60.;
ay = ay/60.;
zRot = zRot/60.;
}
MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
} }
MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
} }
}; };
@ -280,7 +293,8 @@ namespace MWScript
Interpreter::Type_Float zRot = runtime[0].mFloat; Interpreter::Type_Float zRot = runtime[0].mFloat;
runtime.pop(); runtime.pop();
MWBase::Environment::get().getWorld()->moveObject(ptr,x,y,z); MWBase::Environment::get().getWorld()->moveObject(ptr,
MWBase::Environment::get().getWorld()->getExterior(x,y),x,y,z);
float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity