[Scummvm-cvs-logs] SF.net SVN: scummvm: [23052] scummvm/branches/branch-0-9-0/engines/simon/vga.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Mon Jun 12 07:59:58 CEST 2006
Revision: 23052
Author: kirben
Date: 2006-06-11 22:59:53 -0700 (Sun, 11 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23052&view=rev
Log Message:
-----------
Fix errors in centreScroll() of FF
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/engines/simon/vga.cpp
Modified: scummvm/branches/branch-0-9-0/engines/simon/vga.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/simon/vga.cpp 2006-06-12 00:47:33 UTC (rev 23051)
+++ scummvm/branches/branch-0-9-0/engines/simon/vga.cpp 2006-06-12 05:59:53 UTC (rev 23052)
@@ -2589,32 +2589,32 @@
if (_scrollXMax != 0) {
_scrollCount = 0;
x = _variableArray[15] - _scrollX;
- if (getBitFlag(85) || x >= 624) {
+ if (x < 17 || (getBitFlag(85) && x < 320)) {
x -= 320;
+ if (_scrollX < -x)
+ x = -_scrollX;
+ _scrollCount = x;
+ } else if ((getBitFlag(85) && x >= 320) || x >= 624) {
+ x -= 320;
tmp = _scrollXMax - _scrollX;
if (tmp < x)
x = tmp;
_scrollCount = x;
- } else if (x < 17) {
- x -= 320;
- if (_scrollX < -x)
- x = -_scrollX;
- _scrollCount = x;
}
} else if (_scrollYMax != 0) {
_scrollCount = 0;
y = _variableArray[16] - _scrollY;
- if (y >= 460) {
+ if (y < 30) {
y -= 240;
+ if (_scrollY < -y)
+ y = -_scrollY;
+ _scrollCount = y;
+ } else if (y >= 460) {
+ y -= 240;
tmp = _scrollYMax - _scrollY;
if (tmp < y)
y = tmp;
_scrollCount = y;
- } else if (y < 30) {
- y -= 240;
- if (_scrollY < -y)
- y = -_scrollY;
- _scrollCount = y;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list