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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Mar 17 23:42:12 CET 2008


Revision: 31166
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31166&view=rev
Author:   lordhoto
Date:     2008-03-17 15:42:12 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Implemented opcodes:
 - 91: o2_blockInRegion
 - 92: o2_blockOutRegion

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.h
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-17 22:32:30 UTC (rev 31165)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-17 22:42:12 UTC (rev 31166)
@@ -1007,6 +1007,8 @@
 	int o2_loadMusicTrack(ScriptState *script);
 	int o2_playWanderScoreViaMap(ScriptState *script);
 	int o2_playSoundEffect(ScriptState *script);
+	int o2_blockInRegion(ScriptState *script);
+	int o2_blockOutRegion(ScriptState *script);
 	int o2_setCauldronState(ScriptState *script);
 	int o2_getRand(ScriptState *script);
 	int o2_setDrawNoShapeFlag(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-17 22:32:30 UTC (rev 31165)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-17 22:42:12 UTC (rev 31166)
@@ -688,6 +688,18 @@
 	return 0;
 }
 
+int KyraEngine_v2::o2_blockInRegion(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_blockInRegion(%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);
+	return 0;
+}
+
+int KyraEngine_v2::o2_blockOutRegion(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_blockOutRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	_screen->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
+	return 0;
+}
+
 int KyraEngine_v2::o2_setCauldronState(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCauldronState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	setCauldronState(stackPos(0), stackPos(1) != 0);
@@ -1501,10 +1513,10 @@
 		Opcode(o2_playWanderScoreViaMap),
 		Opcode(o2_playSoundEffect),
 		OpcodeUnImpl(),
-		OpcodeUnImpl(),
+		Opcode(o2_blockInRegion),
 		// 0x5c
+		Opcode(o2_blockOutRegion),
 		OpcodeUnImpl(),
-		OpcodeUnImpl(),
 		Opcode(o2_setCauldronState),
 		OpcodeUnImpl(),
 		// 0x60


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