[Scummvm-cvs-logs] SF.net SVN: scummvm:[40300] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 40300
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40300&view=rev
Author:   Kirben
Date:     2009-05-04 12:55:04 +0000 (Mon, 04 May 2009)

Log Message:
-----------
Fix input been displayed during ending sequence in PN.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/charset.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2009-05-04 09:17:31 UTC (rev 40299)
+++ scummvm/trunk/engines/agos/agos.h	2009-05-04 12:55:04 UTC (rev 40300)
@@ -805,7 +805,7 @@
 	void changeWindow(uint a);
 	void closeWindow(uint a);
 	void setTextColor(uint color);
-	void windowPutChar(WindowBlock *window, byte c, byte b = 0);
+	virtual void windowPutChar(WindowBlock *window, byte c, byte b = 0);
 	void waitWindow(WindowBlock *window);
 
 	HitArea *findBox(uint hitarea_id);
@@ -1383,7 +1383,7 @@
 	bool _inputReady;
 	bool _inputting;
 	uint16 _intputCounter, _inputMax;
-	uint16 _mousePrintFG; // NOTE: Currently not used
+	uint16 _mousePrintFG;
 	HitArea *_dragStore;
 	uint8 _hitCalled;
 
@@ -1467,6 +1467,7 @@
 	void drawIconHitBar();
 	void iconPage();
 	void printIcon(HitArea *ha, uint8 i, uint8 r);
+	virtual void windowPutChar(WindowBlock *window, byte c, byte b = 0);
 
 	bool badload(int8 errorNum);
 	int loadfl(char *name);

Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp	2009-05-04 09:17:31 UTC (rev 40299)
+++ scummvm/trunk/engines/agos/charset.cpp	2009-05-04 12:55:04 UTC (rev 40300)
@@ -484,6 +484,12 @@
 		_textWindow = openWindow(8, 144, 24, 6, 1, 0, 15);
 }
 
+void AGOSEngine_PN::windowPutChar(WindowBlock *window, byte c, byte b) {
+	if (_mousePrintFG || _wiped)
+		return;
+	AGOSEngine::windowPutChar(window, c, b);
+}
+
 void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) {
 	byte width = 6;
 


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