diff options
| author | Max Horn | 2003-05-24 16:45:49 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-24 16:45:49 +0000 |
| commit | f75c148c8ca02ddd176c5251cc2b06ca0844ac85 (patch) | |
| tree | aa96d7ef415f56bc206e7d1c91c1afa51d0f59ef /scumm/script_v6.cpp | |
| parent | 07df5bd181efe00c6a7341bd3fdc74239080b057 (diff) | |
| download | scummvm-rg350-f75c148c8ca02ddd176c5251cc2b06ca0844ac85.tar.gz scummvm-rg350-f75c148c8ca02ddd176c5251cc2b06ca0844ac85.tar.bz2 scummvm-rg350-f75c148c8ca02ddd176c5251cc2b06ca0844ac85.zip | |
corrected FIXME
svn-id: r7891
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 50cf973a5a..a990368f10 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1006,10 +1006,8 @@ void Scumm_v6::o6_walkActorToObj() { a2 = derefActorSafe(obj, "o6_walkActorToObj(2)"); if (a2 == 0) { // FIXME: This is a hack to work around bug #742676 SAM: Fish Farm. - // However, that this ever happens seems to be due to a bug in - // ScummVM, esp. since even with this hack the behaviour of Sam - // is not correct (when using the fish he says "This is a completely - // unusable thingamabob", but should say "Wow, he's blowing bubbles". + // Note quite sure why it happens, though, if it's normal or due to + // a bug in the ScummVM code. warning("o6_walkActorToObj: invalid actor %d\n", obj); return; } @@ -1094,7 +1092,7 @@ void Scumm_v6::o6_doSentence() { objectB = pop(); if (!(_features & GF_AFTER_V8)) - dummy = pop(); // dummy pop + dummy = pop(); // dummy pop (in Sam&Max, seems to be always 0 or 130) objectA = pop(); verb = pop(); |