From 1f83953da4130af2d4c33303ae462bda396185df Mon Sep 17 00:00:00 2001 From: AlexVinS Date: Sun, 10 Feb 2019 21:09:24 +0300 Subject: [PATCH] Partial fix for https://bugs.vcmi.eu/view.php?id=3033 --- AI/VCAI/Goals/VisitObj.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/AI/VCAI/Goals/VisitObj.cpp b/AI/VCAI/Goals/VisitObj.cpp index 33e69325b..9fa030e1c 100644 --- a/AI/VCAI/Goals/VisitObj.cpp +++ b/AI/VCAI/Goals/VisitObj.cpp @@ -90,10 +90,16 @@ TSubgoal VisitObj::whatToDoToAchieve() return bestGoal; } -VisitObj::VisitObj(int Objid) : CGoal(VISIT_OBJ) +VisitObj::VisitObj(int Objid) + : CGoal(VISIT_OBJ) { objid = Objid; - tile = ai->myCb->getObjInstance(ObjectInstanceID(objid))->visitablePos(); + auto obj = ai->myCb->getObjInstance(ObjectInstanceID(objid)); + if(obj) + tile = obj->visitablePos(); + else + logAi->error("VisitObj constructed with invalid object instance %d", Objid); + priority = 3; }