mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-20 01:21:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue_6901' into 'master'

Browse Source 
Fix Morrowind.exe soul gem usage discrepancy #6901

See merge request OpenMW/openmw!2181
This commit is contained in:
psi29a 2022-07-25 09:39:42 +00:00
commit e2b245d3b7
4 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -133,6 +133,7 @@
Bug #6799: Game crashes if an NPC has no Class attached
Bug #6849: ImageButton texture is not scaled properly
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
Bug #6901: Morrowind.exe soul gem usage discrepancy
Feature #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable"

9
apps/openmw/mwclass/misc.cpp
View File

@ -203,9 +203,12 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> Miscellaneous::use (const MWWorld::Ptr& ptr, bool force) const
{
if (ptr.getCellRef().getSoul().empty() || !MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(ptr.getCellRef().getSoul()))
return std::make_unique<MWWorld::NullAction>();
return std::make_unique<MWWorld::ActionSoulgem>(ptr);
const std::string soulgemPrefix = "misc_soulgem";
if (::Misc::StringUtils::ciCompareLen(ptr.getCellRef().getRefId(), soulgemPrefix, soulgemPrefix.length()) == 0)
return std::make_unique<MWWorld::ActionSoulgem>(ptr);
return std::make_unique<MWWorld::NullAction>();
}
bool Miscellaneous::canSell (const MWWorld::ConstPtr& item, int npcServices) const

35
apps/openmw/mwscript/containerextensions.cpp
View File

@ -304,11 +304,40 @@ namespace MWScript
MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
MWWorld::ContainerStoreIterator it = invStore.begin();
for (; it != invStore.end(); ++it)
// With soul gems we prefer filled ones.
const std::string soulgemPrefix = "misc_soulgem";
if (::Misc::StringUtils::ciCompareLen(item, soulgemPrefix, soulgemPrefix.length()) == 0)
{
if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
break;
it = invStore.end();
for (auto it_any = invStore.begin(); it_any != invStore.end(); ++it_any)
{
if (::Misc::StringUtils::ciEqual(it_any->getCellRef().getRefId(), item))
{
if (!it_any->getCellRef().getSoul().empty() &&
MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(it_any->getCellRef().getSoul()))
{
it = it_any;
break;
}
else if (it == invStore.end())
it = it_any;
}
}
}
else
{
for (; it != invStore.end(); ++it)
{
if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
break;
}
}
if (it == invStore.end())
{
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), item, 1);

23
apps/openmw/mwworld/actionsoulgem.cpp
View File

@ -1,10 +1,15 @@
#include "actionsoulgem.hpp"
#include <components/debug/debuglog.hpp>
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwmechanics/actorutil.hpp"
#include "../mwworld/esmstore.hpp"
namespace MWWorld
{
@ -23,7 +28,23 @@ namespace MWWorld
MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage5}");
return;
}
MWBase::Environment::get().getWindowManager()->showSoulgemDialog(getTarget());
const auto& target = getTarget();
const std::string targetSoul = target.getCellRef().getSoul();
if (targetSoul.empty())
{
MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage32}");
return;
}
if (!MWBase::Environment::get().getWorld()->getStore().get<ESM::Creature>().search(targetSoul))
{
Log(Debug::Warning) << "Soul '" << targetSoul << "' not found (item: '" << target.getCellRef().getRefId() << "')";
return;
}
MWBase::Environment::get().getWindowManager()->showSoulgemDialog(target);
}