[Scummvm-git-logs] scummvm branch-2-6 -> df2121b04f1c52dfee0989d830ad3c78ef47db66

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
df2121b04f ULTIMA8: Fix Crusader crash if splash item destroyed before damage happens


Commit: df2121b04f1c52dfee0989d830ad3c78ef47db66
    https://github.com/scummvm/scummvm/commit/df2121b04f1c52dfee0989d830ad3c78ef47db66
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2022-06-26T08:44:36+09:00

Commit Message:
ULTIMA8: Fix Crusader crash if splash item destroyed before damage happens

Changed paths:
    engines/ultima/ultima8/world/fire_type.cpp


diff --git a/engines/ultima/ultima8/world/fire_type.cpp b/engines/ultima/ultima8/world/fire_type.cpp
index 25859e11c9b..8ff9aeb3112 100644
--- a/engines/ultima/ultima8/world/fire_type.cpp
+++ b/engines/ultima/ultima8/world/fire_type.cpp
@@ -268,7 +268,11 @@ void FireType::applySplashDamageAround(const Point3 &pt, int damage, int rangedi
 		if (!splashitemdamage)
 			continue;
 
-		Direction splashdir = src->getDirToItemCentre(pt);
+		Direction splashdir;
+		if (src)
+			splashdir = src->getDirToItemCentre(pt);
+		else
+			splashdir = dir_north;
 		splashitem->receiveHit(0, splashdir, splashitemdamage, _typeNo);
 	}
 }