aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/map.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-27 21:12:41 +0200
committerFilippos Karapetis2015-12-27 21:16:43 +0200
commitc5f5fbc208d473d87d42edd64113728bf26153b1 (patch)
tree3c8adca326cb484297b5a0901b5b23e3b5df0b5e /engines/lab/map.cpp
parent29342b1331533b2e85057e4cf0a2d2acffd3d56d (diff)
downloadscummvm-rg350-c5f5fbc208d473d87d42edd64113728bf26153b1.tar.gz
scummvm-rg350-c5f5fbc208d473d87d42edd64113728bf26153b1.tar.bz2
scummvm-rg350-c5f5fbc208d473d87d42edd64113728bf26153b1.zip
LAB: Refactor the music code
Diffstat (limited to 'engines/lab/map.cpp')
-rw-r--r--engines/lab/map.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index f7b2cfe9ea..ee47c2b14b 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -82,7 +82,7 @@ void LabEngine::loadMapData() {
delete mapImages;
Common::File *mapFile = _resource->openDataFile("Lab:Maps", MKTAG('M', 'A', 'P', '0'));
- updateMusicAndEvents();
+ updateEvents();
_maxRooms = mapFile->readUint16LE();
_maps = new MapData[_maxRooms + 1]; // will be freed when the user exits the map
@@ -340,7 +340,7 @@ void LabEngine::drawMap(uint16 curRoom, uint16 curMsg, uint16 floorNum, bool fad
}
}
- updateMusicAndEvents();
+ updateEvents();
// Makes sure the X is drawn in corridors
// NOTE: this here on purpose just in case there's some weird
@@ -391,7 +391,7 @@ void LabEngine::processMap(uint16 curRoom) {
while (1) {
// Make sure we check the music at least after every message
- updateMusicAndEvents();
+ updateEvents();
IntuiMessage *msg = _event->getMsg();
if (shouldQuit()) {
_quitLab = true;
@@ -399,7 +399,7 @@ void LabEngine::processMap(uint16 curRoom) {
}
if (!msg) {
- updateMusicAndEvents();
+ updateEvents();
byte newcolor[3];
@@ -541,7 +541,7 @@ void LabEngine::doMap(uint16 curRoom) {
_graphics->_fadePalette = amigaMapPalette;
- updateMusicAndEvents();
+ updateEvents();
loadMapData();
_graphics->blackAllScreen();
_event->attachButtonList(&_mapButtonList);