thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r4270
This commit is contained in:
Paweł Kołodziejski 2002-05-10 18:47:37 +00:00
parent 36acc99ae1
commit 939f9314fa
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
actor.cpp
View file

@ -322,6 +322,10 @@ void Scumm::setupActorScale(Actor * a)
byte *resptr; byte *resptr;
int y; 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) { if (_features & GF_NO_SCALLING) {
a->scalex = 0xFF; a->scalex = 0xFF;

8
script_v2.cpp
View file

@ -1651,6 +1651,14 @@ void Scumm::o6_setObjectName()
void Scumm::o6_isSoundRunning() void Scumm::o6_isSoundRunning()
{ {
int snd = pop(); 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) if (snd)
snd = isSoundRunning(snd); snd = isSoundRunning(snd);