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

[kirben at users.sourceforge.net]

Revision: 24277
          http://svn.sourceforge.net/scummvm/?rev=24277&view=rev
Author:   kirben
Date:     2006-10-11 07:03:40 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Add opcode for Elvira 1

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/debug.h
    scummvm/trunk/engines/agos/items.cpp
    scummvm/trunk/engines/agos/window.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2006-10-11 13:59:01 UTC (rev 24276)
+++ scummvm/trunk/engines/agos/agos.h	2006-10-11 14:03:40 UTC (rev 24277)
@@ -699,7 +699,7 @@
 	void inventoryUp(WindowBlock *window);
 	void inventoryDown(WindowBlock *window);
 
-	WindowBlock *openWindow(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color);
+	WindowBlock *openWindow(uint x, uint y, uint w, uint h, uint flags, uint fillColor, uint textColor);
 	uint getWindowNum(WindowBlock *window);
 	void clearWindow(WindowBlock *window);
 	void changeWindow(uint a);
@@ -1083,6 +1083,7 @@
 	void oe1_findMaster();
 	void oe1_nextMaster();
 	void oe1_menu();
+	void oe1_enableInput();
 	void oe1_setTime();
 	void oe1_ifTime();
 	void oe1_bitClear();

Modified: scummvm/trunk/engines/agos/debug.h
===================================================================
--- scummvm/trunk/engines/agos/debug.h	2006-10-11 13:59:01 UTC (rev 24276)
+++ scummvm/trunk/engines/agos/debug.h	2006-10-11 14:03:40 UTC (rev 24277)
@@ -350,7 +350,7 @@
 	/* 256 */
 	"W|SYNC",
 	"WI|DEF_OBJ",
-	NULL,
+	"|ENABLE_INPUT",
 	"|SET_TIME",
 	/* 260 */
 	"WJ|IF_TIME",

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2006-10-11 13:59:01 UTC (rev 24276)
+++ scummvm/trunk/engines/agos/items.cpp	2006-10-11 14:03:40 UTC (rev 24277)
@@ -315,6 +315,7 @@
 	op[256] = &AGOSEngine::o_sync;
 	op[257] = &AGOSEngine::o_defObj;
 
+	op[258] = &AGOSEngine::oe1_enableInput;
 	op[259] = &AGOSEngine::oe1_setTime;
 	op[260] = &AGOSEngine::oe1_ifTime;
 	op[261] = &AGOSEngine::o_here;
@@ -2086,6 +2087,20 @@
 	setScriptCondition((_variableArray[var] & (1 << bit)) != 0);
 }
 
+void AGOSEngine::oe1_enableInput() {
+	// 258: enable input
+	_variableArray[500] = 0;
+
+	for (int i = 120; i < 130; i++)
+		disableBox(i);
+
+	// XXX
+	_lastHitArea = 0;
+	_verbHitArea = 0;
+	_hitAreaSubjectItem = NULL;
+	_hitAreaObjectItem = NULL;
+}
+
 void AGOSEngine::oe1_setTime() {
 	// 259: set time
 	time(&_timeStore);

Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp	2006-10-11 13:59:01 UTC (rev 24276)
+++ scummvm/trunk/engines/agos/window.cpp	2006-10-11 14:03:40 UTC (rev 24277)
@@ -39,7 +39,7 @@
 	return 0;
 }
 
-WindowBlock *AGOSEngine::openWindow(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color) {
+WindowBlock *AGOSEngine::openWindow(uint x, uint y, uint w, uint h, uint flags, uint fillColor, uint textColor) {
 	WindowBlock *window;
 
 	window = _windowList;
@@ -52,8 +52,8 @@
 	window->width = w;
 	window->height = h;
 	window->flags = flags;
-	window->fill_color = fill_color;
-	window->text_color = text_color;
+	window->fill_color = fillColor;
+	window->text_color = textColor;
 	window->textColumn = 0;
 	window->textRow = 0;
 	window->textColumnOffset = 0;


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