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

[athrxx at users.sourceforge.net]

Revision: 41027
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41027&view=rev
Author:   athrxx
Date:     2009-05-30 12:30:13 +0000 (Sat, 30 May 2009)

Log Message:
-----------
LOL: - added English floppy version to detection
- implemented opcode required for Yvel woods

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

Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp	2009-05-30 10:54:25 UTC (rev 41026)
+++ scummvm/trunk/engines/kyra/detection.cpp	2009-05-30 12:30:13 UTC (rev 41027)
@@ -1009,6 +1009,22 @@
 			"lol",
 			"Extracted",
 			{
+				{ "GENERAL.PAK", 0, "2aaa30e120c08af87196820e9dd4bf73", -1 },
+				{ "CHAPTER7.PAK", 0, "eb92bf7ebb4e890add1233a6b0c810ff", -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			ADGF_NO_FLAGS
+		},
+		LOL_FLOPPY_FLAGS
+	},
+
+	{
+		{
+			"lol",
+			"Extracted",
+			{
 				{ "GENERAL.PAK", 0, "996e66e81054d36249907a1d8158da3d", -1 },
 				{ "CHAPTER7.PAK", 0, "cabee57f00d6d84b65a732b6868a4959", -1 },
 				{ 0, 0, 0, 0 }

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-05-30 10:54:25 UTC (rev 41026)
+++ scummvm/trunk/engines/kyra/lol.h	2009-05-30 12:30:13 UTC (rev 41027)
@@ -730,6 +730,7 @@
 	int olol_prepareSpecialScene(EMCState *script);
 	int olol_restoreAfterSpecialScene(EMCState *script);
 	int olol_assignCustomSfx(EMCState *script);
+	int olol_findAssignedMonster(EMCState *script);
 	int olol_checkBlockForMonster(EMCState *script);
 	int olol_transformRegion(EMCState *script);
 	int olol_calcCoordinatesAddDirectionOffset(EMCState *script);

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-05-30 10:54:25 UTC (rev 41026)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-05-30 12:30:13 UTC (rev 41027)
@@ -1791,6 +1791,17 @@
 	return 0;
 }
 
+int LoLEngine::olol_findAssignedMonster(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_findAssignedMonster(%p)  (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+	uint16 o = stackPos(1) == -1 ? _levelBlockProperties[stackPos(0)].assignedObjects : findObject(stackPos(1))->nextAssignedObject;
+	while (o) {
+		if (o & 0x8000)
+			return o & 0x7fff;		
+		o = findObject(o)->nextAssignedObject;
+	}
+	return -1;
+}
+
 int LoLEngine::olol_checkBlockForMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_checkBlockForMonster(%p)  (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	uint16 block = stackPos(0);
@@ -2511,7 +2522,7 @@
 	// 0x94
 	Opcode(olol_assignCustomSfx);
 	OpcodeUnImpl();
-	OpcodeUnImpl();
+	Opcode(olol_findAssignedMonster);
 	Opcode(olol_checkBlockForMonster);
 
 	// 0x98


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