[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
- Previous message: [Scummvm-cvs-logs] CVS: docs/docbook .cvsignore,NONE,1.1 Makefile,1.1.1.1,1.2 devguide.xml,1.1.1.1,1.2 manual.xml,1.1.1.1,1.2 sdocbook.dtd,1.1.1.1,NONE
- Next message: [Scummvm-cvs-logs] CVS: docs/docbook/manual a133.html,1.1.1.1,NONE a154.html,1.1.1.1,NONE a169.html,1.1.1.1,NONE c119.html,1.1.1.1,NONE c50.html,1.1.1.1,NONE c7.html,1.1.1.1,NONE c84.html,1.1.1.1,NONE g172.html,1.1.1.1,NONE g208.html,1.1.1.1,NONE g241.html,1.1.1.1,NONE g330.html,1.1.1.1,NONE g336.html,1.1.1.1,NONE g340.html,1.1.1.1,NONE g382.html,1.1.1.1,NONE i183.html,1.1.1.1,NONE i219.html,1.1.1.1,NONE i252.html,1.1.1.1,NONE i341.html,1.1.1.1,NONE i347.html,1.1.1.1,NONE i351.html,1.1.1.1,NONE i393.html,1.1.1.1,NONE index.html,1.1.1.1,NONE x107.html,1.1.1.1,NONE x110.html,1.1.1.1,NONE x113.html,1.1.1.1,NONE x116.html,1.1.1.1,NONE x124.html,1.1.1.1,NONE x127.html,1.1.1.1,NONE x130.html,1.1.1.1,NONE x139.html,1.1.1.1,NONE x142.html,1.1.1.1,NONE x145.html,1.1.1.1,NONE x148.html,1.1.1.1,NONE x151.html,1.1.1.1,NONE x16.html,1.1.1.1,NONE x160.html,1.1.1.1,NONE x163.html,1.1.1.1,NONE x166.html,1.1.1.1,NONE x19.html,1.1.1.1,NONE x22.html,1.1.1.1,NONE x47.html,1.1.1.1,NONE x60.html,1.1.1.1,NONE x81.html,1.1.1.1,NONE x89.html,1.1.1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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]);
- Previous message: [Scummvm-cvs-logs] CVS: docs/docbook .cvsignore,NONE,1.1 Makefile,1.1.1.1,1.2 devguide.xml,1.1.1.1,1.2 manual.xml,1.1.1.1,1.2 sdocbook.dtd,1.1.1.1,NONE
- Next message: [Scummvm-cvs-logs] CVS: docs/docbook/manual a133.html,1.1.1.1,NONE a154.html,1.1.1.1,NONE a169.html,1.1.1.1,NONE c119.html,1.1.1.1,NONE c50.html,1.1.1.1,NONE c7.html,1.1.1.1,NONE c84.html,1.1.1.1,NONE g172.html,1.1.1.1,NONE g208.html,1.1.1.1,NONE g241.html,1.1.1.1,NONE g330.html,1.1.1.1,NONE g336.html,1.1.1.1,NONE g340.html,1.1.1.1,NONE g382.html,1.1.1.1,NONE i183.html,1.1.1.1,NONE i219.html,1.1.1.1,NONE i252.html,1.1.1.1,NONE i341.html,1.1.1.1,NONE i347.html,1.1.1.1,NONE i351.html,1.1.1.1,NONE i393.html,1.1.1.1,NONE index.html,1.1.1.1,NONE x107.html,1.1.1.1,NONE x110.html,1.1.1.1,NONE x113.html,1.1.1.1,NONE x116.html,1.1.1.1,NONE x124.html,1.1.1.1,NONE x127.html,1.1.1.1,NONE x130.html,1.1.1.1,NONE x139.html,1.1.1.1,NONE x142.html,1.1.1.1,NONE x145.html,1.1.1.1,NONE x148.html,1.1.1.1,NONE x151.html,1.1.1.1,NONE x16.html,1.1.1.1,NONE x160.html,1.1.1.1,NONE x163.html,1.1.1.1,NONE x166.html,1.1.1.1,NONE x19.html,1.1.1.1,NONE x22.html,1.1.1.1,NONE x47.html,1.1.1.1,NONE x60.html,1.1.1.1,NONE x81.html,1.1.1.1,NONE x89.html,1.1.1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list