[Scummvm-cvs-logs] SF.net SVN: scummvm: [21669] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 21669
Author:   kirben
Date:     2006-04-07 06:39:59 -0700 (Fri, 07 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21669&view=rev

Log Message:
-----------
Add scrolling adjustments when drawing overlay in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/oracle.cpp
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/oracle.cpp
===================================================================
--- scummvm/trunk/engines/simon/oracle.cpp	2006-04-07 12:57:40 UTC (rev 21668)
+++ scummvm/trunk/engines/simon/oracle.cpp	2006-04-07 13:39:59 UTC (rev 21669)
@@ -91,18 +91,18 @@
 	changeWindow(3);
 	_noOracleScroll = 0;
 
-	if(_textWindow->scrollY > _oracleMaxScrollY) 		// For scroll up
+	if (_textWindow->scrollY > _oracleMaxScrollY) 		// For scroll up
 		_oracleMaxScrollY = _textWindow->scrollY;
 
 	while(1) {
-		if(_textWindow->scrollY == _oracleMaxScrollY)
+		if (_textWindow->scrollY == _oracleMaxScrollY)
 			break;
 		_textWindow->textRow = 105;
 		for (i = 0; i < 5; i++) {
 			_newLines = 0;
 			_textWindow->textColumn = 0;
 			_textWindow->textRow -= 3;
-			if(i == 2) {
+			if (i == 2) {
 				_textWindow->scrollY += 1;
 				_textWindow->textRow += 15;
 				linksUp();
@@ -126,17 +126,17 @@
 	changeWindow(3);
 	_noOracleScroll = 0;
 
-	if(_textWindow->scrollY > _oracleMaxScrollY) 		// For scroll up
+	if (_textWindow->scrollY > _oracleMaxScrollY) 		// For scroll up
 		_oracleMaxScrollY = _textWindow->scrollY;
 
 	while(1) {
-		if(_textWindow->scrollY == 0)
+		if (_textWindow->scrollY == 0)
 			break;
 		for (i = 0; i < 5; i++) {
 			_newLines = 0;
 			_textWindow->textColumn = 0;
 			_textWindow->textRow = (i + 1) * 3;
-			if(i == 4) {
+			if (i == 4) {
 				_textWindow->scrollY -= 1;
 				_textWindow->textRow = 0;
 				linksDown();

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-07 12:57:40 UTC (rev 21668)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-07 13:39:59 UTC (rev 21669)
@@ -908,7 +908,7 @@
 		} else if (state->flags & kDFOverlayed) {
 			state->surf_addr = getScaleBuf();
 			state->surf_pitch = _dxSurfacePitch;
-			state->surf_addr += state->x + state->y * state->surf_pitch;
+			state->surf_addr += (state->x + _scrollX) + (state->y + _scrollY) * state->surf_pitch;
 
 			uint w, h;
 			byte *src, *dst, *dst_org;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.