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

kirben at users.sourceforge.net kirben at users.sourceforge.net
Wed Mar 15 21:42:02 CET 2006


Revision: 21326
Author:   kirben
Date:     2006-03-15 21:41:39 -0800 (Wed, 15 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21326&view=rev

Log Message:
-----------
Remove duplicate fcs field

Modified Paths:
--------------
    scummvm/trunk/engines/simon/intern.h
    scummvm/trunk/engines/simon/oracle.cpp
Modified: scummvm/trunk/engines/simon/intern.h
===================================================================
--- scummvm/trunk/engines/simon/intern.h	2006-03-16 04:10:34 UTC (rev 21325)
+++ scummvm/trunk/engines/simon/intern.h	2006-03-16 05:41:39 UTC (rev 21326)
@@ -90,8 +90,7 @@
 	uint16 x, y;
 	uint16 width, height;
 	uint16 textColumn, textRow;
-	uint16 scrollY;
-	uint8 textColumnOffset, textLength, textMaxLength;
+	uint16 textColumnOffset, textLength, textMaxLength;
 	uint8 fill_color, text_color, unk5;
 	FillOrCopyData *fcs_data;
 	FillOrCopyStruct() { memset(this, 0, sizeof(*this)); }

Modified: scummvm/trunk/engines/simon/oracle.cpp
===================================================================
--- scummvm/trunk/engines/simon/oracle.cpp	2006-03-16 04:10:34 UTC (rev 21325)
+++ scummvm/trunk/engines/simon/oracle.cpp	2006-03-16 05:41:39 UTC (rev 21326)
@@ -37,7 +37,7 @@
 	_hyperLink = x;
 	_variableArray[50] = _textWindow->textColumn+_textWindow->x;
 	_variableArray[51] = _textWindow->textRow+_textWindow->y+
-						(_oracleMaxScrollY - _textWindow->scrollY) * 15;
+						(_oracleMaxScrollY - _textWindow->textColumnOffset) * 15;
 }
 
 


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