diff options
Diffstat (limited to 'engines/lab/engine.cpp')
| -rw-r--r-- | engines/lab/engine.cpp | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index 54050f2ffd..34ca89c192 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -69,7 +69,7 @@ int followCrumbs(); void mayShowCrumbIndicator(); void mayShowCrumbIndicatorOff(); -bool Alternate = false, ispal = false, noupdatediff = false, MainDisplay = true, QuitLab = false, DoNotReset = false; +bool Alternate = false, ispal = false, noupdatediff = false, MainDisplay = true, QuitLab = false; extern const char *NewFileName; /* When ProcessRoom.c decides to change the filename of the current picture. */ @@ -118,11 +118,6 @@ extern char *GOFORWARDDIR, *NOPATH, *TAKEITEM, *USEONWHAT, *TAKEWHAT, *MOVEWHAT, #define LEVERSMONITOR 82 -#define CLOWNROOM 123 -#define DIMROOM 80 - - - static byte *MovePanelBuffer, *InvPanelBuffer; static uint32 MovePanelBufferSize, InvPanelBufferSize; static Image *MoveImages[20], *InvImages[10]; @@ -398,27 +393,6 @@ void eatMessages() { return; } -static uint16 lastmusicroom = 1; - - -/******************************************************************************/ -/* Checks the music that should be playing in a particular room. */ -/******************************************************************************/ -static void checkRoomMusic() { - if ((lastmusicroom == RoomNum) || !g_music->_musicOn) - return; - - if (RoomNum == CLOWNROOM) - g_music->changeMusic("Music:Laugh"); - else if (RoomNum == DIMROOM) - g_music->changeMusic("Music:Rm81"); - else if (!DoNotReset) - g_music->resetMusic(); - - lastmusicroom = RoomNum; -} - - /******************************************************************************/ /* Checks whether the close up is one of the special case closeups. */ /******************************************************************************/ @@ -791,7 +765,7 @@ static void mainGameLoop() { if (Msg == NULL) { /* Does music load and next animation frame when you've run out of messages */ GotMessage = false; - checkRoomMusic(); + g_music->checkRoomMusic(); g_music->updateMusic(); diffNextFrame(); |