[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.59,1.60

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16716

Modified Files:
	control.cpp 
Log Message:
Be more careful when subtracting from unsigned values. Fixes bug #1327972.


Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- control.cpp	15 Oct 2005 15:46:12 -0000	1.59
+++ control.cpp	16 Oct 2005 15:06:51 -0000	1.60
@@ -833,13 +833,17 @@
 		if (_saveScrollPos >= 1)
 			_saveScrollPos--;
 	} else if (scroll == BUTTON_SCROLL_DOWN_SLOW) {
-		if (_saveScrollPos < maxScroll - 8)
+		if (_saveScrollPos + 8 < maxScroll)
 			_saveScrollPos++;
 	} else if (scroll == BUTTON_SCROLL_DOWN_FAST) {
-		if (_saveScrollPos < maxScroll - 16)
+		if (_saveScrollPos + 16 < maxScroll)
 			_saveScrollPos += 8;
-		else
-			_saveScrollPos = maxScroll - 8;
+		else {
+			if (maxScroll >= 8)
+				_saveScrollPos = maxScroll - 8;
+			else
+				_saveScrollPos = 0;
+		}
 	}
 	_selectedSavegame = 255; // deselect savegame
 	deselectSaveslots();