[Scummvm-cvs-logs] CVS: scummvm/sword1 screen.cpp,1.46,1.47

Robert Göffringmann lavosspawn at users.sourceforge.net
Fri Dec 3 20:42:02 CET 2004


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

Modified Files:
	screen.cpp 
Log Message:
clear scroll offsets... not sure if this is actually necessary, but it *could* be related to bug #1077394

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- screen.cpp	9 Nov 2004 04:06:09 -0000	1.46
+++ screen.cpp	4 Dec 2004 04:41:17 -0000	1.47
@@ -68,8 +68,11 @@
 }
 
 void Screen::setScrolling(int16 offsetX, int16 offsetY) {
-	if (!Logic::_scriptVars[SCROLL_FLAG])
+	if (!Logic::_scriptVars[SCROLL_FLAG]) {
+		Logic::_scriptVars[SCROLL_OFFSET_X] = _oldScrollX = 0;
+		Logic::_scriptVars[SCROLL_OFFSET_Y] = _oldScrollY = 0;
 		return ; // screen is smaller than 640x400 => no need for scrolling
+	}
 
 	offsetX = inRange(0, offsetX, Logic::_scriptVars[MAX_SCROLL_OFFSET_X]);
 	offsetY = inRange(0, offsetY, Logic::_scriptVars[MAX_SCROLL_OFFSET_Y]);





More information about the Scummvm-git-logs mailing list