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

[athrxx at users.sourceforge.net]

Revision: 53954
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53954&view=rev
Author:   athrxx
Date:     2010-10-30 18:37:15 +0000 (Sat, 30 Oct 2010)

Log Message:
-----------
LOL: workaround for bug #3098935

(Vaelan's Cube can be duplicated at Scotia's Barrier)
This is a bug in the game data of early unpatched floppy versions.
This can also be fixed by applying the official patch (ftp://ftp.westwood.com/pub/lands1/updates/lolus123.exe).

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

Modified: scummvm/trunk/engines/kyra/detection_tables.h
===================================================================
--- scummvm/trunk/engines/kyra/detection_tables.h	2010-10-30 17:28:54 UTC (rev 53953)
+++ scummvm/trunk/engines/kyra/detection_tables.h	2010-10-30 18:37:15 UTC (rev 53954)
@@ -1146,6 +1146,23 @@
 			"lol",
 			"Extracted",
 			{
+				{ "GENERAL.PAK", 0, "d119e3b57f8e5edcbb90980ca6f4215a", -1 },
+				{ "CHAPTER7.PAK", 0, "71a3d3cb1554294646a389e5c345cf28", -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			ADGF_NO_FLAGS,
+			Common::GUIO_NOSPEECH | Common::GUIO_MIDIADLIB | Common::GUIO_MIDIMT32 | Common::GUIO_MIDIGM | Common::GUIO_MIDIPCSPK
+		},
+		LOL_FLOPPY_FLAGS
+	},
+
+	{
+		{
+			"lol",
+			"Extracted",
+			{
 				{ "GENERAL.PAK", 0, "996e66e81054d36249907a1d8158da3d", -1 },
 				{ "CHAPTER7.PAK", 0, "cabee57f00d6d84b65a732b6868a4959", -1 },
 				{ 0, 0, 0, 0 }

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2010-10-30 17:28:54 UTC (rev 53953)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2010-10-30 18:37:15 UTC (rev 53954)
@@ -267,6 +267,12 @@
 	tmp->nameStringId = stackPos(1);
 	tmp->shpIndex = stackPos(2);
 	tmp->type = stackPos(3);
+
+	// WORKAROUND for unpatched early floppy versions.
+	// The Vaelan's cube should not be able to be equipped in a weapon slot.
+	if (stackPos(0) == 264 && tmp->type == 5)
+		tmp->type = 0;
+
 	tmp->itemScriptFunc = stackPos(4);
 	tmp->might = stackPos(5);
 	tmp->skill = stackPos(6);


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