[Scummvm-git-logs] scummvm master -> 82fe2265d506bb658cd5d9da6d51c02d604439a1

[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:
82fe2265d5 ULTIMA8: Fix infinite loop killing Malchir


Commit: 82fe2265d506bb658cd5d9da6d51c02d604439a1
    https://github.com/scummvm/scummvm/commit/82fe2265d506bb658cd5d9da6d51c02d604439a1
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-24T15:27:39+09:00

Commit Message:
ULTIMA8: Fix infinite loop killing Malchir

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 7e4d8adb8d..67c2f8886e 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -312,7 +312,7 @@ bool Actor::giveTreasure() {
 		}
 
 		// we need to produce a number of items
-		for (i = 0; (int)i < count; ++i) {
+		for (int j = 0; (int)j < count; ++j) {
 			// pick shape
 			int n = getRandom() % ti._shapes.size();
 			uint32 shapeNum = ti._shapes[n];