diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines/scumm/room.cpp | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'engines/scumm/room.cpp')
| -rw-r--r-- | engines/scumm/room.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp index bb0e0c88f8..dc3af6354d 100644 --- a/engines/scumm/room.cpp +++ b/engines/scumm/room.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/boxes.h" @@ -83,8 +83,8 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { if (_game.id == GID_SAMNMAX) { // WORKAROUND bug #85373 SAM: Overlapping music at Bigfoot convention // Added sound queue processing between execution of exit - // script and entry script. In the case of this bug, the - // entry script required that the iMuse state be fully up + // script and entry script. In the case of this bug, the + // entry script required that the iMuse state be fully up // to date, including last-moment changes from the previous // exit script. _sound->processSound(); @@ -423,8 +423,8 @@ void ScummEngine::setupRoomSubBlocks() { _HEV7ActorPalette[i] = i; } } - - + + // WORKAROUND bug #1074444: The dreaded DOTT "Can't get teeth" bug // makes it impossible to go on playing w/o cheating in some way. // It's not quite clear what causes it, but the effect is that object @@ -729,7 +729,7 @@ void ScummEngine_v3old::resetRoomSubBlocks() { numOfBoxes++; ptr += 5; } - + ptr = roomptr + *(roomptr + 0x15); size = numOfBoxes * SIZEOF_BOX_C64 + 1; |