mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-27 22:49:25 +02:00
Fix possible crash on actions with no initiator set
Such as spawning of new wandering monsters on new month
This commit is contained in:
@@ -298,7 +298,7 @@ bool MapViewController::isEventVisible(const CGObjectInstance * obj, const Playe
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// do not focus on actions of other players except for AI with simturns off
|
// do not focus on actions of other players except for AI with simturns off
|
||||||
if (initiator != LOCPLINT->playerID)
|
if (initiator != LOCPLINT->playerID && initiator.isValidPlayer())
|
||||||
{
|
{
|
||||||
if (LOCPLINT->makingTurn)
|
if (LOCPLINT->makingTurn)
|
||||||
return false;
|
return false;
|
||||||
@@ -324,7 +324,7 @@ bool MapViewController::isEventVisible(const CGHeroInstance * obj, const int3 &
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// do not focus on actions of other players except for AI with simturns off
|
// do not focus on actions of other players except for AI with simturns off
|
||||||
if (obj->getOwner() != LOCPLINT->playerID)
|
if (obj->getOwner() != LOCPLINT->playerID && obj->getOwner().isValidPlayer())
|
||||||
{
|
{
|
||||||
if (LOCPLINT->makingTurn)
|
if (LOCPLINT->makingTurn)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user