mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-18 07:46:38 +00:00
Code Issues Releases Wiki Activity

Requested changes

Browse source
This commit is contained in:
SkyHasACat 2025-08-02 05:33:27 -07:00
parent 1986891e79
commit 5203f300e2
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwlua/types/npc.cpp
View file

@ -88,7 +88,7 @@ namespace
} }
if (rec["baseDisposition"] != sol::nil) if (rec["baseDisposition"] != sol::nil)
npc.mNpdt.mDisposition = static_cast<int>(rec["baseDisposition"]); npc.mNpdt.mDisposition = rec["baseDisposition"].get<int>();
if (rec["baseGold"] != sol::nil) if (rec["baseGold"] != sol::nil)
npc.mNpdt.mGold = static_cast<int>(rec["baseGold"]); npc.mNpdt.mGold = static_cast<int>(rec["baseGold"]);
@ -101,7 +101,7 @@ namespace
{ {
const sol::table services = rec["servicesOffered"]; const sol::table services = rec["servicesOffered"];
int flags = 0; int flags = 0;
auto setFlag = [&](const char* key, int mask) { auto setFlag = [&](const std::string_view& key, int mask) {
if (services[key] != sol::nil && services[key]) if (services[key] != sol::nil && services[key])
flags |= mask; flags |= mask;
}; };

14
apps/openmw/mwworld/esmstore.cpp
View file

@ -726,8 +726,6 @@ namespace MWWorld
switch (type) switch (type)
{ {
case ESM::REC_ALCH: case ESM::REC_ALCH:
case ESM::REC_MISC:
case ESM::REC_ACTI:
case ESM::REC_ARMO: case ESM::REC_ARMO:
case ESM::REC_BOOK: case ESM::REC_BOOK:
case ESM::REC_CLAS: case ESM::REC_CLAS:
@ -735,14 +733,16 @@ namespace MWWorld
case ESM::REC_ENCH: case ESM::REC_ENCH:
case ESM::REC_SPEL: case ESM::REC_SPEL:
case ESM::REC_WEAP: case ESM::REC_WEAP:
mStoreImp->mRecNameToStore[type]->read(reader);
return true;
case ESM::REC_NPC_:
case ESM::REC_CREA:
case ESM::REC_CONT:
case ESM::REC_MISC:
case ESM::REC_ACTI:
case ESM::REC_LEVI: case ESM::REC_LEVI:
case ESM::REC_LEVC: case ESM::REC_LEVC:
case ESM::REC_LIGH: case ESM::REC_LIGH:
case ESM::REC_NPC_:
mStoreImp->mRecNameToStore[type]->read(reader);
return true;
case ESM::REC_CREA:
case ESM::REC_CONT:
mStoreImp->mRecNameToStore[type]->read(reader, true); mStoreImp->mRecNameToStore[type]->read(reader, true);
return true; return true;