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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat May 10 20:30:20 CEST 2008


Revision: 31980
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31980&view=rev
Author:   lordhoto
Date:     2008-05-10 11:30:20 -0700 (Sat, 10 May 2008)

Log Message:
-----------
Implemented opcode 106: o2_playFireflyScore.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_v2.cpp
    scummvm/trunk/engines/kyra/kyra_hof.h
    scummvm/trunk/engines/kyra/script_hof.cpp

Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp	2008-05-10 18:23:11 UTC (rev 31979)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp	2008-05-10 18:30:20 UTC (rev 31980)
@@ -410,7 +410,7 @@
 		_isDeleteMenu = false;
 	}
 
-	delay(10);
+	_vm->delay(10);
 }
 
 void GUI_v2::renewHighlight(Menu &menu) {

Modified: scummvm/trunk/engines/kyra/kyra_hof.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.h	2008-05-10 18:23:11 UTC (rev 31979)
+++ scummvm/trunk/engines/kyra/kyra_hof.h	2008-05-10 18:30:20 UTC (rev 31980)
@@ -750,6 +750,7 @@
 	int o2_setRunFlag(EMCState *script);
 	int o2_showLetter(EMCState *script);
 	int o2_fillRect(EMCState *script);
+	int o2_playFireflyScore(EMCState *script);
 	int o2_encodeShape(EMCState *script);
 	int o2_defineSceneAnim(EMCState *script);
 	int o2_updateSceneAnim(EMCState *script);

Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-10 18:23:11 UTC (rev 31979)
+++ scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-10 18:30:20 UTC (rev 31980)
@@ -862,6 +862,16 @@
 	return 0;
 }
 
+int KyraEngine_HoF::o2_playFireflyScore(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_playFireflyScore(%p) ()", (const void *)script);
+	if (_sound->getSfxType() == Sound::kAdlib || _sound->getSfxType() == Sound::kMidiMT32 || _sound->getSfxType() == Sound::kMidiGM) {
+		snd_playWanderScoreViaMap(86, 1);
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
 int KyraEngine_HoF::o2_encodeShape(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_encodeShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1),
 		stackPos(2), stackPos(3), stackPos(4));
@@ -1623,7 +1633,7 @@
 	// 0x68
 	OpcodeUnImpl();
 	OpcodeUnImpl();
-	OpcodeUnImpl();
+	Opcode(o2_playFireflyScore);
 	Opcode(o2_waitForConfirmationClick);
 	// 0x6c
 	Opcode(o2_encodeShape);


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




More information about the Scummvm-git-logs mailing list