From d39fa6e86ef9bc707459a691b52fdff36a863c22 Mon Sep 17 00:00:00 2001 From: a/ Date: Thu, 24 Jun 2021 23:00:43 +0900 Subject: [PATCH] SAGA2: Fallback for invalid sector deactivation --- engines/saga2/objects.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp index 39a778908e5..3c437f792f3 100644 --- a/engines/saga2/objects.cpp +++ b/engines/saga2/objects.cpp @@ -3199,8 +3199,13 @@ void ActiveRegion::update(void) { for (v = region.min.v; v < region.max.v; v++) { if (uOutOfRange || v < newRegion.min.v - || v >= newRegion.max.v) - world->getSector(u, v)->deactivate(); + || v >= newRegion.max.v) { + + if(Sector *sect = world->getSector(u, v)) + sect->deactivate(); + else + warning("ActiveRegion::update: Invalid Sector (%d, %d)", u, v); + } } }