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

[eriktorbjorn at users.sourceforge.net]

Revision: 21745
Author:   eriktorbjorn
Date:     2006-04-09 23:57:44 -0700 (Sun, 09 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21745&view=rev

Log Message:
-----------
Merged o_defineWindow() into o1_defWindow().

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-10 06:51:20 UTC (rev 21744)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 06:57:44 UTC (rev 21745)
@@ -884,7 +884,22 @@
 	uint h = getVarOrWord();
 	uint flags = getVarOrWord();
 	uint fill_color = getVarOrWord();
-	o_defineWindow(num, x, y, w, h, flags, fill_color, 0);
+	uint text_color = 0;
+
+	num &= 7;
+
+	if (_windowArray[num])
+		closeWindow(num);
+
+	_windowArray[num] = openWindow(x, y, w, h, flags, fill_color, text_color);
+
+	if (num == _curWindow) {
+		_textWindow = _windowArray[num];
+		if (getGameType() == GType_FF)
+			showmessage_helper_3(_textWindow->textColumn, _textWindow->width);
+		else
+			showmessage_helper_3(_textWindow->textLength, _textWindow->textMaxLength);
+	}
 }
 
 void SimonEngine::o1_window() {
@@ -1991,22 +2006,4 @@
 	_lockWord &= ~0x8000;
 }
 
-/* OK */
-void SimonEngine::o_defineWindow(uint num, uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color) {
-	num &= 7;
-
-	if (_windowArray[num])
-		closeWindow(num);
-
-	_windowArray[num] = openWindow(x, y, w, h, flags, fill_color, text_color);
-
-	if (num == _curWindow) {
-		_textWindow = _windowArray[num];
-		if (getGameType() == GType_FF)
-			showmessage_helper_3(_textWindow->textColumn, _textWindow->width);
-		else
-			showmessage_helper_3(_textWindow->textLength, _textWindow->textMaxLength);
-	}
-}
-
 } // End of namespace Simon

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 06:51:20 UTC (rev 21744)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 06:57:44 UTC (rev 21745)
@@ -700,7 +700,6 @@
 	void loadZone(uint vga_res);
 
 	void loadSprite(uint windowNum, uint vga_res, uint vga_sprite_id, uint x, uint y, uint palette);
-	void o_defineWindow(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h);
 	void playSpeech(uint speech_id, uint vga_sprite_id);
 	WindowBlock *openWindow(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color);
 


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