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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun May 18 15:22:07 CEST 2008


Revision: 32170
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32170&view=rev
Author:   lordhoto
Date:     2008-05-18 06:22:06 -0700 (Sun, 18 May 2008)

Log Message:
-----------
Reverted commit #32166.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_hof.h
    scummvm/trunk/engines/kyra/kyra_lok.h
    scummvm/trunk/engines/kyra/kyra_v1.h
    scummvm/trunk/engines/kyra/script_hof.cpp
    scummvm/trunk/engines/kyra/script_lok.cpp
    scummvm/trunk/engines/kyra/script_v1.cpp

Modified: scummvm/trunk/engines/kyra/kyra_hof.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.h	2008-05-18 13:09:37 UTC (rev 32169)
+++ scummvm/trunk/engines/kyra/kyra_hof.h	2008-05-18 13:22:06 UTC (rev 32170)
@@ -742,7 +742,6 @@
 	int o2_setDrawNoShapeFlag(EMCState *script);
 	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);

Modified: scummvm/trunk/engines/kyra/kyra_lok.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.h	2008-05-18 13:09:37 UTC (rev 32169)
+++ scummvm/trunk/engines/kyra/kyra_lok.h	2008-05-18 13:22:06 UTC (rev 32170)
@@ -791,7 +791,6 @@
 	int o1_pauseMusicSeconds(EMCState *script);
 	int o1_resetMaskRegion(EMCState *script);
 	int o1_setPaletteChangeFlag(EMCState *script);
-	int o1_fillRect(EMCState *script);
 	int o1_vocUnload(EMCState *script);
 	int o1_vocLoad(EMCState *script);
 	int o1_dummy(EMCState *script);

Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h	2008-05-18 13:09:37 UTC (rev 32169)
+++ scummvm/trunk/engines/kyra/kyra_v1.h	2008-05-18 13:22:06 UTC (rev 32170)
@@ -227,6 +227,7 @@
 	int o1_getMouseState(EMCState *script);
 	int o1_setDeathHandler(EMCState *script);
 	int o1_playWanderScoreViaMap(EMCState *script);
+	int o1_fillRect(EMCState *script);
 	int o1_blockInWalkableRegion(EMCState *script);
 	int o1_blockOutWalkableRegion(EMCState *script);
 	int o1_playSoundEffect(EMCState *script);

Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-18 13:09:37 UTC (rev 32169)
+++ scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-18 13:22:06 UTC (rev 32170)
@@ -838,12 +838,6 @@
 	return 0;
 }
 
-int KyraEngine_HoF::o2_fillRect(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
-	_screen->fillRect(stackPos(1), stackPos(2), stackPos(1)+stackPos(3), stackPos(2)+stackPos(4), stackPos(5), stackPos(0));
-	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) {
@@ -1630,7 +1624,7 @@
 	Opcode(o2_setRunFlag);
 	Opcode(o2_showLetter);
 	OpcodeUnImpl();
-	Opcode(o2_fillRect);
+	Opcode(o1_fillRect);
 	// 0x68
 	OpcodeUnImpl();
 	OpcodeUnImpl();

Modified: scummvm/trunk/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lok.cpp	2008-05-18 13:09:37 UTC (rev 32169)
+++ scummvm/trunk/engines/kyra/script_lok.cpp	2008-05-18 13:22:06 UTC (rev 32170)
@@ -1706,12 +1706,6 @@
 	return _paletteChanged;
 }
 
-int KyraEngine_LoK::o1_fillRect(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
-	_screen->fillRect(stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(0));
-	return 0;
-}
-
 int KyraEngine_LoK::o1_vocUnload(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_vocUnload(%p) ()", (const void *)script);
 	// this should unload all voc files (not needed)

Modified: scummvm/trunk/engines/kyra/script_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v1.cpp	2008-05-18 13:09:37 UTC (rev 32169)
+++ scummvm/trunk/engines/kyra/script_v1.cpp	2008-05-18 13:22:06 UTC (rev 32170)
@@ -96,6 +96,12 @@
 	return 0;
 }
 
+int KyraEngine_v1::o1_fillRect(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+	screen()->fillRect(stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(0));
+	return 0;
+}
+
 int KyraEngine_v1::o1_blockInWalkableRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	screen()->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);


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