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

[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:
f531eba971 ULTIMA: Replace some comma operators with semicolons


Commit: f531eba971eeca0f0c27ea9234dffcc8abc776fa
    https://github.com/scummvm/scummvm/commit/f531eba971eeca0f0c27ea9234dffcc8abc776fa
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-04-20T12:48:26+09:00

Commit Message:
ULTIMA: Replace some comma operators with semicolons

Changed paths:
    engines/ultima/nuvie/core/effect.cpp
    engines/ultima/ultima4/game/script.cpp


diff --git a/engines/ultima/nuvie/core/effect.cpp b/engines/ultima/nuvie/core/effect.cpp
index 6c181d203e..48999c509e 100644
--- a/engines/ultima/nuvie/core/effect.cpp
+++ b/engines/ultima/nuvie/core/effect.cpp
@@ -1137,7 +1137,8 @@ bool FadeEffect::pixelated_fade_core(uint32 pixels_to_check, sint16 fade_to) {
 		}
 		if (pixels[rnum] != color) {
 			pixels[rnum] = color;
-			++colored, ++colored_total; // another pixel was set
+			++colored;
+			++colored_total; // another pixel was set
 		}
 		++p;
 	}
diff --git a/engines/ultima/ultima4/game/script.cpp b/engines/ultima/ultima4/game/script.cpp
index 14c4720455..72b15722c9 100644
--- a/engines/ultima/ultima4/game/script.cpp
+++ b/engines/ultima/ultima4/game/script.cpp
@@ -1412,8 +1412,8 @@ void Script::parseOperation(const Common::String &str, Common::String *left, Com
 		*op = ops[i];
 	}
 
-	*left = str.substr(0, pos),
-	 *right = str.substr(pos + ops[i].size());
+	*left = str.substr(0, pos);
+	*right = str.substr(pos + ops[i].size());
 }
 
 int Script::mathValue(const Common::String &str) {