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

[kirben at users.sourceforge.net]

Revision: 24356
          http://svn.sourceforge.net/scummvm/?rev=24356&view=rev
Author:   kirben
Date:     2006-10-16 18:04:14 -0700 (Mon, 16 Oct 2006)

Log Message:
-----------
Add minor differences in windows code of Elvira 1/2/WW

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

Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp	2006-10-17 00:38:04 UTC (rev 24355)
+++ scummvm/trunk/engines/agos/charset.cpp	2006-10-17 01:04:14 UTC (rev 24356)
@@ -383,8 +383,13 @@
 }
 
 void AGOSEngine::openTextWindow() {
-	if (_textWindow)
+	if (_textWindow) {
+		if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
+			if (_textWindow->flags & 0x80)
+				clearWindow(_textWindow);
+		}
 		return;
+	}
 
 	if (getGameType() == GType_FF || getGameType() == GType_PP)
 		_textWindow = openWindow(64, 96, 384, 172, 1, 0, 15);

Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp	2006-10-17 00:38:04 UTC (rev 24355)
+++ scummvm/trunk/engines/agos/window.cpp	2006-10-17 01:04:14 UTC (rev 24356)
@@ -46,6 +46,9 @@
 	while (window->mode != 0)
 		window++;
 
+	if (getGameType() == GType_ELVIRA1 && y >= 133)
+		textColor += 16;
+
 	window->mode = 2;
 	window->x = x;
 	window->y = y;
@@ -60,7 +63,7 @@
 	window->textMaxLength = window->width * 8 / 6; // characters are 6 pixels
 	window->scrollY = 0;
 
-	if (getGameType() == GType_ELVIRA1)
+	if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW)
 		clearWindow(window);
 
 	return window;


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