[Scummvm-git-logs] scummvm branch-2-3 -> a5bad57fceecfa4fd1fbd11006c506d53de52eea

[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:
a5bad57fce ULTIMA8: Fix where Crusader BA-40 ammo is used


Commit: a5bad57fceecfa4fd1fbd11006c506d53de52eea
    https://github.com/scummvm/scummvm/commit/a5bad57fceecfa4fd1fbd11006c506d53de52eea
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-09-09T23:06:44+09:00

Commit Message:
ULTIMA8: Fix where Crusader BA-40 ammo is used

After rechecking, the original game has expendable BA-40 ammo on every
difficulty above *1*, not *2*.  Confirmed in dosbox and the disassembly
(function at 13c8:2975).

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


diff --git a/engines/ultima/ultima8/world/world.cpp b/engines/ultima/ultima8/world/world.cpp
index e4b358d385..57ea10a999 100644
--- a/engines/ultima/ultima8/world/world.cpp
+++ b/engines/ultima/ultima8/world/world.cpp
@@ -516,7 +516,7 @@ void World::setGameDifficulty(uint8 difficulty) {
 	   if (si && si->_weaponInfo) {
 		   WeaponInfo *wi = si->_weaponInfo;
 		   wi->_clipSize = 20;
-		   if (difficulty > 2) {
+		   if (difficulty > 1) {
 			   wi->_ammoShape = 0x33D;
 			   wi->_ammoType = 1;
 		   } else {