mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-19 05:36:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'stacked_up' into 'master'

Browse source 
Make stack manipulation unconditional

Closes #6717

See merge request OpenMW/openmw!1815
This commit is contained in:
psi29a 2022-04-30 16:58:57 +00:00
commit 828f394200
4 changed files with 84 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -114,6 +114,7 @@
Bug #6682: HitOnMe doesn't fire as intended Bug #6682: HitOnMe doesn't fire as intended
Bug #6697: Shaders vertex lighting incorrectly clamped Bug #6697: Shaders vertex lighting incorrectly clamped
Bug #6711: Log time differs from real time Bug #6711: Log time differs from real time
Bug #6717: Broken script causes interpreter stack corruption
Feature #890: OpenMW-CS: Column filtering Feature #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable" Feature #2491: Ability to make OpenMW "portable"

2
apps/openmw/mwscript/cellextensions.cpp
View file

@ -208,6 +208,7 @@ namespace MWScript
void execute (Interpreter::Runtime& runtime) override void execute (Interpreter::Runtime& runtime) override
{ {
Interpreter::Type_Float level = runtime[0].mFloat; Interpreter::Type_Float level = runtime[0].mFloat;
runtime.pop();
if (!MWMechanics::getPlayer().isInCell()) if (!MWMechanics::getPlayer().isInCell())
{ {
@ -231,6 +232,7 @@ namespace MWScript
void execute (Interpreter::Runtime& runtime) override void execute (Interpreter::Runtime& runtime) override
{ {
Interpreter::Type_Float level = runtime[0].mFloat; Interpreter::Type_Float level = runtime[0].mFloat;
runtime.pop();
if (!MWMechanics::getPlayer().isInCell()) if (!MWMechanics::getPlayer().isInCell())
{ {

1
apps/openmw/mwscript/statsextensions.cpp
View file

@ -1208,6 +1208,7 @@ namespace MWScript
void execute (Interpreter::Runtime& runtime) override void execute (Interpreter::Runtime& runtime) override
{ {
// dummy // dummy
runtime.pop();
runtime.push(0); runtime.push(0);
} }
}; };

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

@ -193,18 +193,23 @@ 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") float ret = 0.f;
if (!axis.empty())
{ {
runtime.push(osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[0])); if (axis[0] == 'x')
}
else if (axis == "y")
{ {
runtime.push(osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[1])); ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[0]);
} }
else if (axis == "z") else if (axis[0] == 'y')
{ {
runtime.push(osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[2])); ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[1]);
} }
else if (axis[0] == 'z')
{
ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().rot[2]);
}
}
runtime.push(ret);
} }
}; };
@ -220,18 +225,23 @@ 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") float ret = 0.f;
if (!axis.empty())
{ {
runtime.push(osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0])); if (axis[0] == 'x')
}
else if (axis=="y")
{ {
runtime.push(osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1])); ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
} }
else if (axis=="z") else if (axis[0] == 'y')
{ {
runtime.push(osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[2])); ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
} }
else if (axis[0] == 'z')
{
ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[2]);
}
}
runtime.push(ret);
} }
}; };
@ -247,18 +257,23 @@ 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") float ret = 0.f;
if (!axis.empty())
{ {
runtime.push(ptr.getRefData().getPosition().pos[0]); if (axis[0] == 'x')
}
else if(axis == "y")
{ {
runtime.push(ptr.getRefData().getPosition().pos[1]); ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[0]);
} }
else if(axis == "z") else if (axis[0] == 'y')
{ {
runtime.push(ptr.getRefData().getPosition().pos[2]); ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[1]);
} }
else if (axis[0] == 'z')
{
ret = osg::RadiansToDegrees(ptr.getRefData().getPosition().pos[2]);
}
}
runtime.push(ret);
} }
}; };
@ -271,14 +286,14 @@ namespace MWScript
{ {
MWWorld::Ptr ptr = R()(runtime); MWWorld::Ptr ptr = R()(runtime);
if (!ptr.isInCell())
return;
std::string axis = runtime.getStringLiteral (runtime[0].mInteger); std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
Interpreter::Type_Float pos = runtime[0].mFloat; Interpreter::Type_Float pos = runtime[0].mFloat;
runtime.pop(); runtime.pop();
if (!ptr.isInCell())
return;
// Note: SetPos does not skip weather transitions in vanilla engine, so we do not call setTeleported(true) here. // Note: SetPos does not skip weather transitions in vanilla engine, so we do not call setTeleported(true) here.
const auto curPos = ptr.getRefData().getPosition().asVec3(); const auto curPos = ptr.getRefData().getPosition().asVec3();
@ -328,18 +343,23 @@ 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") float ret = 0.f;
if (!axis.empty())
{ {
runtime.push(ptr.getCellRef().getPosition().pos[0]); if (axis[0] == 'x')
}
else if(axis == "y")
{ {
runtime.push(ptr.getCellRef().getPosition().pos[1]); ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[0]);
} }
else if(axis == "z") else if (axis[0] == 'y')
{ {
runtime.push(ptr.getCellRef().getPosition().pos[2]); ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[1]);
} }
else if (axis[0] == 'z')
{
ret = osg::RadiansToDegrees(ptr.getCellRef().getPosition().pos[2]);
}
}
runtime.push(ret);
} }
}; };
@ -352,15 +372,6 @@ namespace MWScript
{ {
MWWorld::Ptr ptr = R()(runtime); MWWorld::Ptr ptr = R()(runtime);
if (ptr.getContainerStore())
return;
bool isPlayer = ptr == MWMechanics::getPlayer();
if (isPlayer)
{
MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
}
Interpreter::Type_Float x = runtime[0].mFloat; Interpreter::Type_Float x = runtime[0].mFloat;
runtime.pop(); runtime.pop();
Interpreter::Type_Float y = runtime[0].mFloat; Interpreter::Type_Float y = runtime[0].mFloat;
@ -372,6 +383,15 @@ namespace MWScript
std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
if (ptr.getContainerStore())
return;
bool isPlayer = ptr == MWMechanics::getPlayer();
if (isPlayer)
{
MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
}
MWWorld::CellStore* store = nullptr; MWWorld::CellStore* store = nullptr;
try try
{ {
@ -424,14 +444,6 @@ namespace MWScript
{ {
MWWorld::Ptr ptr = R()(runtime); MWWorld::Ptr ptr = R()(runtime);
if (!ptr.isInCell())
return;
if (ptr == MWMechanics::getPlayer())
{
MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
}
Interpreter::Type_Float x = runtime[0].mFloat; Interpreter::Type_Float x = runtime[0].mFloat;
runtime.pop(); runtime.pop();
Interpreter::Type_Float y = runtime[0].mFloat; Interpreter::Type_Float y = runtime[0].mFloat;
@ -440,6 +452,14 @@ namespace MWScript
runtime.pop(); runtime.pop();
Interpreter::Type_Float zRot = runtime[0].mFloat; Interpreter::Type_Float zRot = runtime[0].mFloat;
runtime.pop(); runtime.pop();
if (!ptr.isInCell())
return;
if (ptr == MWMechanics::getPlayer())
{
MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
}
int cx,cy; int cx,cy;
MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy); MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy);