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

[dreammaster]

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:
b942623563 Fix buggy UCList.remove


Commit: b9426235635ace6ecfbea1f763692ba165f37dda
    https://github.com/scummvm/scummvm/commit/b9426235635ace6ecfbea1f763692ba165f37dda
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-02-24T18:10:01-08:00

Commit Message:
Fix buggy UCList.remove

Changed paths:
    engines/ultima/ultima8/usecode/uc_list.h


diff --git a/engines/ultima/ultima8/usecode/uc_list.h b/engines/ultima/ultima8/usecode/uc_list.h
index e5176538d5..ad73bf87d7 100644
--- a/engines/ultima/ultima8/usecode/uc_list.h
+++ b/engines/ultima/ultima8/usecode/uc_list.h
@@ -86,8 +86,8 @@ public:
 		for (unsigned int i = 0; i < _size; i++) {
 			bool equal = true;
 			for (unsigned int j = 0; j < _elementSize && equal; j++)
-				equal = (_elements[i * _elementSize + j] == e[j]);
-			if (!equal) {
+				equal = equal && (_elements[i * _elementSize + j] == e[j]);
+			if (equal) {
 				_elements.erase(_elements.begin() + i * _elementSize,
 				               _elements.begin() + (i + 1)*_elementSize);
 				_size--;