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

OMGPizzaGuy noreply at scummvm.org
Tue May 14 01:06:21 UTC 2024


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:
a0091635df ULTIMA8: Spray blood when hit by any item for enough damage.


Commit: a0091635dffd8fa3622ea0559439a96202e2b4c6
    https://github.com/scummvm/scummvm/commit/a0091635dffd8fa3622ea0559439a96202e2b4c6
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-05-13T20:06:05-05:00

Commit Message:
ULTIMA8: Spray blood when hit by any item for enough damage.
This allow blood sprays when damaged in the force field maze, which happens in the original game.
Fixes #14841

Changed paths:
    engines/ultima/ultima8/world/actors/actor.cpp


diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index d2159a1b4a0..2be600484e3 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -1194,7 +1194,7 @@ void Actor::receiveHitU8(uint16 other, Direction dir, int damage, uint16 damage_
 	}
 
 	Common::RandomSource &rs = Ultima8Engine::get_instance()->getRandomSource();
-	if (damage >= 4 && _objId == 1 && attacker) {
+	if (damage >= 4 && _objId == 1 && hitter) {
 		// play blood sprite
 		int start = 0, end = 12;
 		if (dir > dir_east) {




More information about the Scummvm-git-logs mailing list