Two fixmes - one for iMUSE bug in Sam and Max, the other for MI1VGA scaling

svn-id: r4270

2 files changed, 12 insertions, 0 deletions

diff --git a/actor.cpp b/actor.cpp
index 2ee25a12c5..092a6cbf8a 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -322,6 +322,10 @@ void Scumm::setupActorScale(Actor * a)
 	byte *resptr;
 	int y;
 
+	// FIXME: Special 'no scaling' class for MI1 VGA Floppy
+	//	      Not totally sure if this is correct.
+	if(_gameId == GID_MONKEY_VGA && getClass(a->number, 0x96)) 
+		return;
 
 	if (_features & GF_NO_SCALLING) {
 		a->scalex = 0xFF;
diff --git a/script_v2.cpp b/script_v2.cpp
index 863aa99320..b48356bf9b 100644
--- a/script_v2.cpp
+++ b/script_v2.cpp
@@ -1651,6 +1651,14 @@ void Scumm::o6_setObjectName()
 void Scumm::o6_isSoundRunning()
 {
 	int snd = pop();
+
+	// FIXME: This fixes wak-a-rat until we figure out why
+	//		  iMUSE fails to locate certain sounds.
+	if (_gameId == GID_SAMNMAX && _currentRoom == 18 && snd == 23) {
+		push(0);
+		return; 
+	}
+
 	if (snd)
 		snd = isSoundRunning(snd);