mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 21:49:41 +00:00
Code Issues Releases Wiki Activity

some correction

Browse source
This commit is contained in:
gugus 2012-08-05 16:21:53 +02:00
parent b2ce1dfd1a
commit d850a3ee49
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,15 +66,15 @@ namespace MWScript
float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
float az = Ogre::Radian(ptr.getRefData().getPosition().rot[2]).valueDegrees(); float az = Ogre::Radian(ptr.getRefData().getPosition().rot[2]).valueDegrees();
if(axis == "X") if(axis == "x")
{ {
MWBase::Environment::get().getWorld()->rotateObject(ptr,angle,ay,az); MWBase::Environment::get().getWorld()->rotateObject(ptr,angle,ay,az);
} }
if(axis == "Y") if(axis == "y")
{ {
MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,angle,az); MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,angle,az);
} }
if(axis == "Z") if(axis == "z")
{ {
MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,angle); MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,angle);
} }
@ -93,15 +93,15 @@ namespace MWScript
std::string axis = runtime.getStringLiteral (runtime[0].mInteger); std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
if(axis == "X") if(axis == "x")
{ {
runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees()); runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees());
} }
if(axis == "Y") if(axis == "y")
{ {
runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees()); runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees());
} }
if(axis == "Z") if(axis == "z")
{ {
runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[2]).valueDegrees()); runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[2]).valueDegrees());
} }
@ -120,15 +120,15 @@ namespace MWScript
std::string axis = runtime.getStringLiteral (runtime[0].mInteger); std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
if(axis == "X") if(axis == "x")
{ {
runtime.push(ptr.getRefData().getPosition().pos[0]); runtime.push(ptr.getRefData().getPosition().pos[0]);
} }
if(axis == "Y") if(axis == "y")
{ {
runtime.push(ptr.getRefData().getPosition().pos[1]); runtime.push(ptr.getRefData().getPosition().pos[1]);
} }
if(axis == "Z") if(axis == "z")
{ {
runtime.push(ptr.getRefData().getPosition().pos[2]); runtime.push(ptr.getRefData().getPosition().pos[2]);
} }
@ -154,15 +154,15 @@ namespace MWScript
float az = ptr.getRefData().getPosition().pos[2]; float az = ptr.getRefData().getPosition().pos[2];
std::cout << "setPos"; std::cout << "setPos";
if(axis == "X") if(axis == "x")
{ {
MWBase::Environment::get().getWorld()->moveObject(ptr,pos,ay,az); MWBase::Environment::get().getWorld()->moveObject(ptr,pos,ay,az);
} }
if(axis == "Y") if(axis == "y")
{ {
MWBase::Environment::get().getWorld()->moveObject(ptr,ax,pos,az); MWBase::Environment::get().getWorld()->moveObject(ptr,ax,pos,az);
} }
if(axis == "Z") if(axis == "z")
{ {
MWBase::Environment::get().getWorld()->moveObject(ptr,ax,ay,pos); MWBase::Environment::get().getWorld()->moveObject(ptr,ax,ay,pos);
} }
@ -181,15 +181,15 @@ namespace MWScript
std::string axis = runtime.getStringLiteral (runtime[0].mInteger); std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
if(axis == "X") if(axis == "x")
{ {
runtime.push(ptr.getCellRef().pos.pos[0]); runtime.push(ptr.getCellRef().pos.pos[0]);
} }
if(axis == "Y") if(axis == "y")
{ {
runtime.push(ptr.getCellRef().pos.pos[1]); runtime.push(ptr.getCellRef().pos.pos[1]);
} }
if(axis == "Z") if(axis == "z")
{ {
runtime.push(ptr.getCellRef().pos.pos[2]); runtime.push(ptr.getCellRef().pos.pos[2]);
} }
@ -217,9 +217,9 @@ namespace MWScript
extensions.registerFunction("getscale",'f',"",opcodeGetScale,opcodeGetScaleExplicit); extensions.registerFunction("getscale",'f',"",opcodeGetScale,opcodeGetScaleExplicit);
extensions.registerInstruction("setangle","Sf",opcodeSetAngle,opcodeSetAngleExplicit); extensions.registerInstruction("setangle","Sf",opcodeSetAngle,opcodeSetAngleExplicit);
extensions.registerFunction("getangle",'f',"S",opcodeGetAngle,opcodeGetAngleExplicit); extensions.registerFunction("getangle",'f',"S",opcodeGetAngle,opcodeGetAngleExplicit);
extensions.registerInstruction("setpos","Sf",opcodeSetPos,opcodeSetPosExplicit); extensions.registerInstruction("setpos","cf",opcodeSetPos,opcodeSetPosExplicit);
extensions.registerFunction("getpos",'f',"S",opcodeGetPos,opcodeGetPosExplicit); extensions.registerFunction("getpos",'f',"c",opcodeGetPos,opcodeGetPosExplicit);
extensions.registerFunction("getstartingpos",'f',"S",opcodeGetStartingPos,opcodeGetStartingPosExplicit); extensions.registerFunction("getstartingpos",'f',"c",opcodeGetStartingPos,opcodeGetStartingPosExplicit);
} }
void installOpcodes (Interpreter::Interpreter& interpreter) void installOpcodes (Interpreter::Interpreter& interpreter)