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

Avoid summon spawn if actor isn't in a cell (bug #5644)

Browse source
This commit is contained in:
Alexei Dobrohotov 2020-10-18 01:40:58 +03:00
parent 9d350ec824
commit f90e403bc1
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -55,6 +55,7 @@
Bug #5603: Setting constant effect cast style doesn't correct effects view Bug #5603: Setting constant effect cast style doesn't correct effects view
Bug #5611: Usable items with "0 Uses" should be used only once Bug #5611: Usable items with "0 Uses" should be used only once
Bug #5622: Can't properly interact with the console when in pause menu Bug #5622: Can't properly interact with the console when in pause menu
Bug #5644: Summon effects running on the player during game initialization cause crashes
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"
Feature #2386: Distant Statics in the form of Object Paging Feature #2386: Distant Statics in the form of Object Paging
Feature #4894: Consider actors as obstacles for pathfinding Feature #4894: Consider actors as obstacles for pathfinding

5
apps/openmw/mwmechanics/actors.cpp
View file

@ -1198,6 +1198,11 @@ namespace MWMechanics
} }
} }
// Summoned creature update visitor assumes the actor belongs to a cell.
// This assumption isn't always valid for the player character.
if (!ptr.isInCell())
return;
bool hasSummonEffect = false; bool hasSummonEffect = false;
for (MagicEffects::Collection::const_iterator it = effects.begin(); it != effects.end(); ++it) for (MagicEffects::Collection::const_iterator it = effects.begin(); it != effects.end(); ++it)
{ {

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -2182,6 +2182,8 @@ namespace MWWorld
Ptr World::copyObjectToCell(const ConstPtr &object, CellStore* cell, ESM::Position pos, int count, bool adjustPos) Ptr World::copyObjectToCell(const ConstPtr &object, CellStore* cell, ESM::Position pos, int count, bool adjustPos)
{ {
if (!cell)
throw std::runtime_error("copyObjectToCell(): cannot copy object to null cell");
if (cell->isExterior()) if (cell->isExterior())
{ {
int cellX, cellY; int cellX, cellY;