[Scummvm-cvs-logs] scummvm master -> a6fedd6034b9e1d3723bd7fcee170429e1a4afed

fuzzie fuzzie at fuzzie.org
Fri May 27 21:47:23 CEST 2011


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:
a6fedd6034 TSAGE: Cosmetic tweaks to Scene::setZoomPercents.


Commit: a6fedd6034b9e1d3723bd7fcee170429e1a4afed
    https://github.com/scummvm/scummvm/commit/a6fedd6034b9e1d3723bd7fcee170429e1a4afed
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-05-27T12:44:41-07:00

Commit Message:
TSAGE: Cosmetic tweaks to Scene::setZoomPercents.

Changed paths:
    engines/tsage/scenes.cpp



diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index d9a983c..4625661 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -463,32 +463,32 @@ void Scene::drawAltObjects() {
 }
 
 void Scene::setZoomPercents(int yStart, int minPercent, int yEnd, int maxPercent) {
-	int var_6 = 0;
+	int currDiff = 0;
 	int v = 0;
 	while (v < yStart)
 		_zoomPercents[v++] = minPercent;
 
 	int diff1 = ABS(maxPercent - minPercent);
 	int diff2 = ABS(yEnd - yStart);
-	int var_8 = MAX(diff1, diff2);
-
-	while (var_8-- != 0) {
-        _zoomPercents[v] = minPercent;
-        if (diff2 <= diff1) {
-                ++minPercent;
-                var_6 += diff2;
-                if (var_6 >= diff1) {
-                        var_6 -= diff1;
-                        ++v;
-                }
-        } else {
-                ++v;
-                var_6 += diff1;
-                if (var_6 >= diff2) {
-                        var_6 -= diff2;
-                        ++minPercent;
-                }
-        }
+	int remainingDiff = MAX(diff1, diff2);
+
+	while (remainingDiff-- != 0) {
+		_zoomPercents[v] = minPercent;
+		if (diff2 <= diff1) {
+			++minPercent;
+			currDiff += diff2;
+			if (currDiff >= diff1) {
+				currDiff -= diff1;
+				++v;
+			}
+		} else {
+			++v;
+			currDiff += diff1;
+			if (currDiff >= diff2) {
+				currDiff -= diff2;
+				++minPercent;
+			}
+		}
 	}
 
 	while (yEnd < 256)






More information about the Scummvm-git-logs mailing list