AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-03 23:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues

Browse Source
This commit is contained in:
SkyHasACat 2025-08-01 16:10:49 -07:00
parent 2cd4b643d0
commit abb381a163
2 changed files with 88 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwlua/objectbindings.cpp
View File

@ -388,7 +388,7 @@ namespace MWLua
objectT["setScale"] = [context](const GObject& object, float scale) { objectT["setScale"] = [context](const GObject& object, float scale) {
context.mLuaManager->addAction( context.mLuaManager->addAction(
[object, scale] { MWBase::Environment::get().getWorld()->scaleObject(object.ptr(), scale); }); [object, scale] { MWBase::Environment::get().getWorld()->scaleObject(object.ptr(), scale); });
};--adjustScale };
objectT["addScript"] = [context](const GObject& object, std::string_view path, sol::object initData) { objectT["addScript"] = [context](const GObject& object, std::string_view path, sol::object initData) {
const LuaUtil::ScriptsConfiguration& cfg = context.mLua->getConfiguration(); const LuaUtil::ScriptsConfiguration& cfg = context.mLua->getConfiguration();
std::optional<int> scriptId = cfg.findId(VFS::Path::Normalized(path)); std::optional<int> scriptId = cfg.findId(VFS::Path::Normalized(path));

32
apps/openmw/mwlua/types/npc.cpp
View File

@ -31,8 +31,8 @@ namespace sol
namespace namespace
{ {
ESM::NPC tableToNPC(const sol::table& rec) ESM::NPC tableToNPC(const sol::table& rec)
{ {
ESM::NPC npc; ESM::NPC npc;
// Start from template if provided // Start from template if provided
@ -129,34 +129,6 @@ ESM::NPC tableToNPC(const sol::table& rec)
npc.mAiData.mServices = flags; npc.mAiData.mServices = flags;
} }
// Travel destinations
if (rec["travelDestinations"] != sol::nil)
{
const sol::table travelDests = rec["travelDestinations"];
npc.mTransport.clear();
for (std::size_t i = 1; i <= travelDests.size(); ++i)
{
sol::table t = travelDests[i];
ESM::Transport destination;
// Position
destination.mPos.pos = t["position"];
destination.mPos.rot = Misc::Convert::toRotation(LuaUtil::fromTransform(t["rotation"]));
// Cell
std::string cellId = t["cellId"];
destination.mCellName = cellId; // If empty, it will be handled as exterior
npc.mTransport.push_back(destination);
}
}
return npc;
}
// Blood type
if (rec["bloodType"] != sol::nil)
npc.mBloodType = static_cast<int>(rec["bloodType"]);
return npc; return npc;
} }
} }