[Scummvm-cvs-logs] SF.net SVN: scummvm:[51950] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 51950
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51950&view=rev
Author:   m_kiewitz
Date:     2010-08-10 13:18:13 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
SCI: adding workaround for kq5

when giving the tambourine to the monster - bug #3041262

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/workarounds.cpp
    scummvm/trunk/engines/sci/graphics/animate.cpp

Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-08-09 21:57:49 UTC (rev 51949)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-08-10 13:18:13 UTC (rev 51950)
@@ -114,6 +114,7 @@
 	{ GID_JONES,         764,   255,  0,                   "", "export 0",       -1,   14, { WORKAROUND_FAKE,   0 } }, // jones/ega&vga only - called when the game starts
 	{ GID_KQ5,            -1,     0,  0,                   "", "export 29",      -1,    3, { WORKAROUND_FAKE,   0 } }, // called when playing harp for the harpies or when aborting dialog in toy shop, is used for kDoAudio - bug #3034700
 	{ GID_KQ5,            25,    25,  0,              "rm025", "doit",           -1,    0, { WORKAROUND_FAKE,   0 } }, // inside witch forest, when going to the room where the walking rock is
+    { GID_KQ5,            55,    55,  0,         "helpScript", "doit",           -1,    0, { WORKAROUND_FAKE,   0 } }, // when giving the tambourine to the monster in the labyrinth (only happens at one of the locations) - bug #3041262
 	{ GID_KQ6,            -1,    30,  0,               "rats", "changeState",    -1,   -1, { WORKAROUND_FAKE,   0 } }, // rats in the catacombs (temps 1 - 5) - bugs #3034597, #3035495, #3035824
 	{ GID_KQ6,           210,   210,  0,              "rm210", "scriptCheck",    -1,    0, { WORKAROUND_FAKE,   1 } }, // using inventory in that room - bug #3034565
 	{ GID_KQ6,           500,   500,  0,              "rm500", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // going to island of the beast

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-09 21:57:49 UTC (rev 51949)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-10 13:18:13 UTC (rev 51950)
@@ -243,6 +243,8 @@
 			}
 		}
 
+		//warning("%s", _s->_segMan->getObjectName(curObject));
+
 		if (!view->isScaleable()) {
 			// Laura Bow 2 (especially floppy) depends on this, some views are not supposed to be scaleable
 			//  this "feature" was removed in later versions of SCI1.1


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