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

LAB: Move checkRoomMusic to the Music class. Some cleanup

Browse source
This commit is contained in:
Filippos Karapetis 2015-07-21 22:26:06 +03:00 • committed by Eugene Sandulenko
parent f085a3187e
commit d0171440df
3 changed files with 44 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

30
engines/lab/engine.cpp
View file

@ -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();