mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merge branch 'bound_branch' into 'master'
Bound branch Closes #5912 See merge request OpenMW/openmw!682
This commit is contained in:
commit
75a967d743
@ -112,6 +112,7 @@
|
|||||||
Bug #5899: Visible modal windows and dropdowns crashing game on exit
|
Bug #5899: Visible modal windows and dropdowns crashing game on exit
|
||||||
Bug #5902: NiZBufferProperty is unable to disable the depth test
|
Bug #5902: NiZBufferProperty is unable to disable the depth test
|
||||||
Bug #5906: Sunglare doesn't work with Mesa drivers and AMD GPUs
|
Bug #5906: Sunglare doesn't work with Mesa drivers and AMD GPUs
|
||||||
|
Bug #5912: ImprovedBound mod doesn't work
|
||||||
Feature #390: 3rd person look "over the shoulder"
|
Feature #390: 3rd person look "over the shoulder"
|
||||||
Feature #832: OpenMW-CS: Handle deleted references
|
Feature #832: OpenMW-CS: Handle deleted references
|
||||||
Feature #1536: Show more information about level on menu
|
Feature #1536: Show more information about level on menu
|
||||||
|
@ -346,7 +346,11 @@ namespace MWMechanics
|
|||||||
if (actor != MWMechanics::getPlayer())
|
if (actor != MWMechanics::getPlayer())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
MWWorld::Ptr newItem = *store.getSlot(slot);
|
MWWorld::Ptr newItem;
|
||||||
|
auto it = store.getSlot(slot);
|
||||||
|
// Equip can fail because beast races cannot equip boots/helmets
|
||||||
|
if(it != store.end())
|
||||||
|
newItem = *it;
|
||||||
|
|
||||||
if (newItem.isEmpty() || boundPtr != newItem)
|
if (newItem.isEmpty() || boundPtr != newItem)
|
||||||
return;
|
return;
|
||||||
|
@ -145,6 +145,12 @@ namespace MWMechanics
|
|||||||
|
|
||||||
for (std::map<ESM::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
|
for (std::map<ESM::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
|
||||||
{
|
{
|
||||||
|
if(it->second == -1)
|
||||||
|
{
|
||||||
|
// Keep the spell effect active if we failed to spawn anything
|
||||||
|
it++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->second);
|
MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->second);
|
||||||
if (ptr.isEmpty() || (ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished()))
|
if (ptr.isEmpty() || (ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished()))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user