[Scummvm-cvs-logs] SF.net SVN: scummvm:[43997] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 43997
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43997&view=rev
Author:   athrxx
Date:     2009-09-06 23:02:52 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
LOL/Floppy: implemented missing opcode

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/script_lol.cpp
    scummvm/trunk/engines/kyra/text_lol.cpp
    scummvm/trunk/engines/kyra/text_lol.h

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-09-06 23:01:33 UTC (rev 43996)
+++ scummvm/trunk/engines/kyra/lol.h	2009-09-06 23:02:52 UTC (rev 43997)
@@ -762,6 +762,7 @@
 	int olol_setNextFunc(EMCState *script);
 	int olol_dummy1(EMCState *script);
 	int olol_suspendMonster(EMCState *script);
+	int olol_setScriptTextParameter(EMCState *script);
 	int olol_triggerEventOnMouseButtonClick(EMCState *script);
 	int olol_printWindowText(EMCState *script);
 	int olol_countSpecificMonsters(EMCState *script);

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-09-06 23:01:33 UTC (rev 43996)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-09-06 23:02:52 UTC (rev 43997)
@@ -1625,6 +1625,12 @@
 	return 1;
 }
 
+int LoLEngine::olol_setScriptTextParameter(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_setScriptTextParameter(%p) (%d)", (const void *)script, stackPos(0));
+	_txt->_scriptTextParameter = stackPos(0);
+	return 1;
+}
+
 int LoLEngine::olol_triggerEventOnMouseButtonClick(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_triggerEventOnMouseButtonClick(%p) (%d)", (const void *)script, stackPos(0));
 	gui_notifyButtonListChanged();
@@ -2815,7 +2821,7 @@
 	Opcode(olol_suspendMonster);
 
 	// 0x80
-	OpcodeUnImpl();
+	Opcode(olol_setScriptTextParameter);
 	Opcode(olol_triggerEventOnMouseButtonClick);
 	Opcode(olol_printWindowText);
 	Opcode(olol_countSpecificMonsters);

Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp	2009-09-06 23:01:33 UTC (rev 43996)
+++ scummvm/trunk/engines/kyra/text_lol.cpp	2009-09-06 23:02:52 UTC (rev 43997)
@@ -33,7 +33,7 @@
 namespace Kyra {
 
 TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen) : _vm(vm), _screen(screen),
-	_scriptParameter(0), _lineCount(0),	_printFlag(false), _lineWidth(0), _numCharsTotal(0),
+	_scriptTextParameter(0), _lineCount(0),	_printFlag(false), _lineWidth(0), _numCharsTotal(0),
 	_numCharsLeft(0), _numCharsPrinted(0) {
 
 	memset(_stringParameters, 0, 15 * sizeof(char *));
@@ -286,7 +286,7 @@
 
 		switch (para) {
 		case 'a':
-			snprintf(dst, 7, "%d", _scriptParameter);
+			snprintf(dst, 7, "%d", _scriptTextParameter);
 			dst += strlen(dst);
 			break;
 

Modified: scummvm/trunk/engines/kyra/text_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.h	2009-09-06 23:01:33 UTC (rev 43996)
+++ scummvm/trunk/engines/kyra/text_lol.h	2009-09-06 23:02:52 UTC (rev 43997)
@@ -49,7 +49,7 @@
 	void printDialogueText(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
 	void printMessage(uint16 type, const char *str, ...) GCC_PRINTF(3, 4);
 
-	int16 _scriptParameter;
+	int16 _scriptTextParameter;
 
 private:
 	void displayText(char *str, ...);


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