[Scummvm-git-logs] scummvm master -> c6e10b26f57fa22c36ccd70403ff2e4a625a7fe0

mduggan mgithub at guarana.org
Sat Jul 31 04:01:34 UTC 2021


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:
c6e10b26f5 ULTIMA8: Correct crusader splash damage divisor


Commit: c6e10b26f57fa22c36ccd70403ff2e4a625a7fe0
    https://github.com/scummvm/scummvm/commit/c6e10b26f57fa22c36ccd70403ff2e4a625a7fe0
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-07-31T12:58:56+09:00

Commit Message:
ULTIMA8: Correct crusader splash damage divisor

Checking the original game again, because our coordinate system is double, we
should halve the divisor factor to calculate the correct damage.

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 88fbb7ce99..c4f22ff745 100644
--- a/engines/ultima/ultima8/world/fire_type.cpp
+++ b/engines/ultima/ultima8/world/fire_type.cpp
@@ -262,7 +262,7 @@ void FireType::applySplashDamageAround(const Point3 &pt, int damage, int rangedi
 			Point3 pt2;
 			splashitem->getLocation(pt2);
 			int splashrange = pt.maxDistXYZ(pt2);
-			splashrange = (splashrange / 16) / 3;
+			splashrange = (splashrange / 32) / 3;
 			if (splashrange)
 				splashitemdamage /= splashrange;
 		}




More information about the Scummvm-git-logs mailing list