LAB: Rename _music, delete it in engine destructor

10 files changed, 127 insertions, 126 deletions

diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index d7561d1e8f..5de7e8f4e0 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -678,7 +678,7 @@ void LabEngine::mainGameLoop() {
 				break;
 			}
 
-			g_music->resumeBackMusic();
+			_music->resumeBackMusic();
 
 			/* Sees what kind of close up we're in and does the appropriate stuff, if any. */
 			if (doCloseUp(CPtr)) {
@@ -734,15 +734,15 @@ void LabEngine::mainGameLoop() {
 			}
 		}
 
-		g_music->updateMusic();  /* Make sure we check the music at least after every message */
+		_music->updateMusic();  /* Make sure we check the music at least after every message */
 		interfaceOn();
 		Msg = getMsg();
 
 		Common::Point curPos;
 		if (Msg == NULL) { /* Does music load and next animation frame when you've run out of messages */
 			GotMessage = false;
-			g_music->checkRoomMusic();
-			g_music->updateMusic();
+			_music->checkRoomMusic();
+			_music->updateMusic();
 			diffNextFrame();
 
 			if (FollowingCrumbs) {
@@ -836,11 +836,11 @@ from_crumbs:
 					interfaceOff();
 
 					while (1) {
-						g_music->updateMusic();  /* Make sure we check the music at least after every message */
+						_music->updateMusic();  /* Make sure we check the music at least after every message */
 						Msg = getMsg();
 
 						if (Msg == NULL) { /* Does music load and next animation frame when you've run out of messages */
-							g_music->updateMusic();
+							_music->updateMusic();
 							diffNextFrame();
 						} else {
 							if (Msg->msgClass == RAWKEY) {
@@ -1326,7 +1326,7 @@ void LabEngine::go() {
 	mem = mem && initRoomBuffer();
 
 	if (!dointro)
-		g_music->initMusic();
+		_music->initMusic();
 
 	MsgFont = _resource->getFont("P:AvanteG.12");
 
@@ -1349,7 +1349,7 @@ void LabEngine::go() {
 		readPict("P:End/L2In.1", true);
 
 		for (uint16 i = 0; i < 120; i++) {
-			g_music->updateMusic();
+			_music->updateMusic();
 			waitTOF();
 		}
 
@@ -1358,7 +1358,7 @@ void LabEngine::go() {
 
 		warning("STUB: waitForPress");
 		while (!1) { // 1 means ignore SDL_ProcessInput calls
-			g_music->updateMusic();
+			_music->updateMusic();
 			diffNextFrame();
 			waitTOF();
 		}
@@ -1369,7 +1369,7 @@ void LabEngine::go() {
 	freeRoomBuffer();
 	freeBuffer();
 
-	g_music->freeMusic();
+	_music->freeMusic();
 }
 
 /*****************************************************************************/
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp
index 4d19f61baa..9f689bd57c 100644
--- a/engines/lab/graphics.cpp
+++ b/engines/lab/graphics.cpp
@@ -68,7 +68,7 @@ bool readPict(const char *filename, bool PlayOnce) {
 
 	stopDiff();
 
-	file = g_lab->g_music->newOpen(filename);
+	file = g_lab->_music->newOpen(filename);
 
 	if (file == NULL) {
 		if ((filename[0] == 'p') || (filename[0] == 'P'))
@@ -94,9 +94,9 @@ bool readPict(const char *filename, bool PlayOnce) {
 /*****************************************************************************/
 bool readMusic(const char *filename, bool waitTillFinished) {
 	Common::File *file = g_lab->_resource->openDataFile(filename, MKTAG('D', 'I', 'F', 'F'));
-	g_lab->g_music->updateMusic();
-	if (!g_lab->g_music->_doNotFilestopSoundEffect)
-		g_lab->g_music->stopSoundEffect();
+	g_lab->_music->updateMusic();
+	if (!g_lab->_music->_doNotFilestopSoundEffect)
+		g_lab->_music->stopSoundEffect();
 	if (!file)
 		return false;
 
@@ -121,7 +121,7 @@ byte *readPictToMem(const char *filename, uint16 x, uint16 y) {
 	allocFile((void **)&Mem, (int32) x * (int32) y, "Bitmap");
 	CurMem = Mem;
 
-	file = g_lab->g_music->newOpen(filename);
+	file = g_lab->_music->newOpen(filename);
 
 	if (file == NULL)
 		return NULL;
@@ -425,9 +425,9 @@ void LabEngine::doScrollBlack() {
 	Im.Width = width;
 	Im.Height = height;
 	Im.ImageData = mem;
-	g_music->updateMusic();
+	_music->updateMusic();
 	g_lab->readScreenImage(&Im, 0, 0);
-	g_music->updateMusic();
+	_music->updateMusic();
 
 	BaseAddr = (uint32 *)g_lab->getVGABaseAddr();
 
@@ -435,7 +435,7 @@ void LabEngine::doScrollBlack() {
 	nheight = height;
 
 	while (nheight) {
-		g_music->updateMusic();
+		_music->updateMusic();
 
 		if (!_isHiRes)
 			g_lab->waitTOF();
@@ -523,8 +523,8 @@ void LabEngine::doScrollWipe(char *filename) {
 	width = VGAScaleX(320);
 	height = VGAScaleY(149) + SVGACord(2);
 
-	while (g_music->isSoundEffectActive()) {
-		g_music->updateMusic();
+	while (_music->isSoundEffectActive()) {
+		_music->updateMusic();
 		g_lab->waitTOF();
 	}
 
@@ -534,12 +534,12 @@ void LabEngine::doScrollWipe(char *filename) {
 	IsBM = false;
 	mem = RawDiffBM.Planes[0];
 
-	g_music->updateMusic();
+	_music->updateMusic();
 	by      = VGAScaleX(3);
 	nheight = height;
 
 	while (onrow < headerdata.y) {
-		g_music->updateMusic();
+		_music->updateMusic();
 
 		if ((by > nheight) && nheight)
 			by = nheight;
@@ -593,11 +593,11 @@ void LabEngine::doScrollBounce() {
 	int height = VGAScaleY(149) + SVGACord(2);
 	byte *mem = RawDiffBM.Planes[0];
 
-	g_music->updateMusic();
+	_music->updateMusic();
 	int startline = headerdata.y - height - 1;
 
 	for (int i = 0; i < 5; i++) {
-		g_music->updateMusic();
+		_music->updateMusic();
 		startline -= newby[i];
 		copyPage(width, height, 0, startline, mem);
 
@@ -606,7 +606,7 @@ void LabEngine::doScrollBounce() {
 	}
 
 	for (int i = 8; i > 0; i--) {
-		g_music->updateMusic();
+		_music->updateMusic();
 		startline += newby1[i - 1];
 		copyPage(width, height, 0, startline, mem);
 
@@ -638,7 +638,7 @@ void LabEngine::doTransWipe(CloseDataPtr *CPtr, char *filename) {
 
 		while (CurY < LastY) {
 			if (linesdone >= lineslast) {
-				g_music->updateMusic();
+				_music->updateMusic();
 				g_lab->waitTOF();
 				linesdone = 0;
 			}
@@ -656,7 +656,7 @@ void LabEngine::doTransWipe(CloseDataPtr *CPtr, char *filename) {
 
 		while (CurY <= LastY) {
 			if (linesdone >= lineslast) {
-				g_music->updateMusic();
+				_music->updateMusic();
 				g_lab->waitTOF();
 				linesdone = 0;
 			}
@@ -691,7 +691,7 @@ void LabEngine::doTransWipe(CloseDataPtr *CPtr, char *filename) {
 
 			while (CurY < LastY) {
 				if (linesdone >= lineslast) {
-					g_music->updateMusic();
+					_music->updateMusic();
 					g_lab->waitTOF();
 					linesdone = 0;
 				}
@@ -710,7 +710,7 @@ void LabEngine::doTransWipe(CloseDataPtr *CPtr, char *filename) {
 
 			while (CurY <= LastY) {
 				if (linesdone >= lineslast) {
-					g_music->updateMusic();
+					_music->updateMusic();
 					g_lab->waitTOF();
 					linesdone = 0;
 				}
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index eaf1aa928b..36137becf5 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -90,10 +90,10 @@ void Intro::doPictText(const char *filename, bool isscreen) {
 	strcat(path, filename);
 
 	if (isscreen) {
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 		timedelay = 35;
 	} else {
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 		timedelay = 7;
 	}
 
@@ -105,7 +105,7 @@ void Intro::doPictText(const char *filename, bool isscreen) {
 			if (begin) {
 				begin = false;
 
-				tfile = g_lab->g_music->newOpen(path);
+				tfile = g_lab->_music->newOpen(path);
 
 				if (!tfile)
 					return;
@@ -144,7 +144,7 @@ void Intro::doPictText(const char *filename, bool isscreen) {
 		msg = g_lab->getMsg();
 
 		if (msg == NULL) {
-			g_lab->g_music->updateMusic();
+			g_lab->_music->updateMusic();
 			g_lab->diffNextFrame();
 			g_lab->getTime(&secs, &micros);
 			g_lab->anyTimeDiff(lastsecs, lastmicros, secs, micros, &secs, &micros);
@@ -216,13 +216,13 @@ void Intro::doPictText(const char *filename, bool isscreen) {
 /* Does a one second delay, but checks the music while doing it.             */
 /*****************************************************************************/
 void Intro::musicDelay() {
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 
 	if (_quitIntro)
 		return;
 
 	for (uint16 i = 0; i < 20; i++) {
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 		g_lab->waitTOF();
 		g_lab->waitTOF();
 		g_lab->waitTOF();
@@ -234,7 +234,7 @@ void Intro::musicDelay() {
 void Intro::nReadPict(const char *filename, bool playOnce) {
 	Common::String finalFileName = Common::String("P:Intro/") + filename;
 
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 	introEatMessages();
 
 	if (_quitIntro)
@@ -277,7 +277,7 @@ void Intro::introSequence() {
 
 	blackAllScreen();
 
-	g_lab->g_music->initMusic();
+	g_lab->_music->initMusic();
 
 	nopalchange = true;
 	if (g_lab->getPlatform() != Common::kPlatformWindows)
@@ -297,14 +297,14 @@ void Intro::introSequence() {
 		                   (diffcmap[i * 3 + 2] >> 2);
 	}
 
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 	fade(true, 0);
 
 	for (int times = 0; times < 150; times++) {
 		if (_quitIntro)
 			break;
 
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 		uint16 temp = palette[2];
 
 		for (uint16 i = 2; i < 15; i++)
@@ -319,7 +319,7 @@ void Intro::introSequence() {
 	fade(false, 0);
 	blackAllScreen();
 
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 
 	nReadPict("Title.A", true);
 	nReadPict("AB", true);
@@ -341,11 +341,11 @@ void Intro::introSequence() {
 	nReadPict("DA", true);
 	musicDelay();
 
-	g_lab->g_music->newOpen("p:Intro/Intro.1");  /* load the picture into the buffer */
+	g_lab->_music->newOpen("p:Intro/Intro.1");  /* load the picture into the buffer */
 
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 	blackAllScreen();
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 
 	_msgfont = g_lab->_resource->getFont("P:Map.fon");
 
@@ -366,7 +366,7 @@ void Intro::introSequence() {
 	freeAllStolenMem();
 
 	blackAllScreen();
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 
 	_introDoBlack = true;
 	nReadPict("Station1", true);
@@ -398,7 +398,7 @@ void Intro::introSequence() {
 			for (uint16 idx = (8 * 3); idx < (255 * 3); idx++)
 				diffcmap[idx] = 255 - diffcmap[idx];
 
-			g_lab->g_music->updateMusic();
+			g_lab->_music->updateMusic();
 			g_lab->waitTOF();
 			g_lab->VGASetPal(diffcmap, 256);
 			g_lab->	waitTOF();
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 745bb74f94..9ad51fd4a7 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -76,7 +76,7 @@ LabEngine::LabEngine(OSystem *syst, const ADGameDescription *gameDesc)
 
 	_event = nullptr;
 	_resource = nullptr;
-	g_music = nullptr;
+	_music = nullptr;
 
 	//const Common::FSNode gameDataDir(ConfMan.get("path"));
 	//SearchMan.addSubDirectoryMatching(gameDataDir, "game");
@@ -91,6 +91,7 @@ LabEngine::~LabEngine() {
 
 	delete _event;
 	delete _resource;
+	delete _music;
 }
 
 Common::Error LabEngine::run() {
@@ -101,7 +102,7 @@ Common::Error LabEngine::run() {
 
 	_event = new EventManager(this);
 	_resource = new Resource(this);
-	g_music = new Music(this);
+	_music = new Music(this);
 
 	if (getPlatform() == Common::kPlatformWindows) {
 		// Check if this is the Wyrmkeep trial
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index dd0c204dbc..e7c230368f 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -101,7 +101,7 @@ private:
 public:
 	EventManager *_event;
 	Resource *_resource;
-	Music *g_music;
+	Music *_music;
 
 	byte *_currentDsplayBuffer;
 	Common::Point _mousePos;
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 6c2201608e..ac612fb881 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -84,9 +84,9 @@ char *getText(const char *filename) {
 	bool dodecrypt;
 	byte **tfile;
 
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 	dodecrypt = (isBuffered(filename) == NULL);
-	tfile = g_lab->g_music->newOpen(filename);
+	tfile = g_lab->_music->newOpen(filename);
 
 	if (!tfile)
 		return NULL;
@@ -200,7 +200,7 @@ static bool loadMapData() {
 		BigMsgFont = MsgFont;
 
 	resetBuffer();  /* Make images load into start of buffer */
-	buffer = g_lab->g_music->newOpen("P:MapImage", Size);
+	buffer = g_lab->_music->newOpen("P:MapImage", Size);
 
 	if (!buffer)
 		return false;
@@ -252,9 +252,9 @@ static bool loadMapData() {
 	Common::File *mapFile = g_lab->_resource->openDataFile("Lab:Maps", MKTAG('M', 'A', 'P', '0'));
 	if (!mapFile)
 		error("Corrupt map file");
-	g_lab->g_music->updateMusic();
-	if (!g_lab->g_music->_doNotFilestopSoundEffect)
-		g_lab->g_music->stopSoundEffect();
+	g_lab->_music->updateMusic();
+	if (!g_lab->_music->_doNotFilestopSoundEffect)
+		g_lab->_music->stopSoundEffect();
 
 	MaxRooms = mapFile->readUint16LE();
 	Maps = new MapData[MaxRooms];	// will be freed when the user exits the map
@@ -309,7 +309,7 @@ void fade(bool fadein, uint16 res) {
 
 		setAmigaPal(newpal, 16);
 		g_lab->waitTOF();
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 	}
 }
 
@@ -572,7 +572,7 @@ void LabEngine::drawMap(uint16 CurRoom, uint16 CurMsg, uint16 Floor, bool fadeou
 	for (uint16 i = 1; i <= MaxRooms; i++) {
 		if ((Maps[i].PageNumber == Floor) && _roomsFound->in(i) && Maps[i].x) {
 			drawRoom(i, (bool)(i == CurRoom));
-			g_music->updateMusic();
+			_music->updateMusic();
 		}
 	}
 
@@ -669,11 +669,11 @@ void LabEngine::processMap(uint16 CurRoom) {
 	CurFloor = Maps[CurRoom].PageNumber;
 
 	while (1) {
-		g_music->updateMusic();  /* Make sure we check the music at least after every message */
+		_music->updateMusic();  /* Make sure we check the music at least after every message */
 		Msg = getMsg();
 
 		if (Msg == NULL) {
-			g_music->updateMusic();
+			_music->updateMusic();
 
 			if (place <= 14) {
 				newcolor[0] = 14 << 2;
@@ -833,7 +833,7 @@ void LabEngine::processMap(uint16 CurRoom) {
 void LabEngine::doMap(uint16 CurRoom) {
 	FadePalette = AmigaMapPalette;
 
-	g_music->updateMusic();
+	_music->updateMusic();
 	loadMapData();
 	blackAllScreen();
 
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 2939d8af5d..bc62aacaf9 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -333,26 +333,26 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
 	uint32 StartSecs, StartMicros, CurSecs, CurMicros;
 
 	while (APtr) {
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 
 		switch (APtr->ActionType) {
 		case PLAYSOUND:
-			g_lab->g_music->_loopSoundEffect = false;
-			g_lab->g_music->_waitTillFinished = true;
+			g_lab->_music->_loopSoundEffect = false;
+			g_lab->_music->_waitTillFinished = true;
 			readMusic((char *)APtr->Data, true);
-			g_lab->g_music->_waitTillFinished = false;
+			g_lab->_music->_waitTillFinished = false;
 			break;
 
 		case PLAYSOUNDB:
-			g_lab->g_music->_loopSoundEffect = false;
-			g_lab->g_music->_waitTillFinished = false;
+			g_lab->_music->_loopSoundEffect = false;
+			g_lab->_music->_waitTillFinished = false;
 			readMusic((char *)APtr->Data, false);
 			break;
 
 		case PLAYSOUNDCONT:
-			g_lab->g_music->_doNotFilestopSoundEffect = true;
-			g_lab->g_music->_loopSoundEffect = true;
-			readMusic((char *)APtr->Data, g_lab->g_music->_waitTillFinished);
+			g_lab->_music->_doNotFilestopSoundEffect = true;
+			g_lab->_music->_loopSoundEffect = true;
+			readMusic((char *)APtr->Data, g_lab->_music->_waitTillFinished);
 			break;
 
 		case SHOWDIFF:
@@ -370,7 +370,7 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
 			}
 
 			if (APtr->Data)
-				g_lab->g_music->newOpen((char *)APtr->Data);          /* Puts a file into memory */
+				g_lab->_music->newOpen((char *)APtr->Data);          /* Puts a file into memory */
 
 			break;
 
@@ -485,7 +485,7 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
 			g_lab->WSDL_UpdateScreen();
 
 			while (1) {
-				g_lab->g_music->updateMusic();
+				g_lab->_music->updateMusic();
 				g_lab->diffNextFrame();
 				g_lab->getTime(&CurSecs, &CurMicros);
 
@@ -497,30 +497,30 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
 			break;
 
 		case STOPMUSIC:
-			g_lab->g_music->setMusic(false);
+			g_lab->_music->setMusic(false);
 			break;
 
 		case STARTMUSIC:
-			g_lab->g_music->setMusic(true);
+			g_lab->_music->setMusic(true);
 			break;
 
 		case CHANGEMUSIC:
-			g_lab->g_music->changeMusic((const char *)APtr->Data);
-			g_lab->g_music->setMusicReset(false);
+			g_lab->_music->changeMusic((const char *)APtr->Data);
+			g_lab->_music->setMusicReset(false);
 			break;
 
 		case RESETMUSIC:
-			g_lab->g_music->resetMusic();
-			g_lab->g_music->setMusicReset(true);
+			g_lab->_music->resetMusic();
+			g_lab->_music->setMusicReset(true);
 			break;
 
 		case FILLMUSIC:
-			g_lab->g_music->updateMusic();
+			g_lab->_music->updateMusic();
 			break;
 
 		case WAITSOUND:
-			while (g_lab->g_music->isSoundEffectActive()) {
-				g_lab->g_music->updateMusic();
+			while (g_lab->_music->isSoundEffectActive()) {
+				g_lab->_music->updateMusic();
 				g_lab->diffNextFrame();
 				g_lab->waitTOF();
 			}
@@ -528,18 +528,18 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
 			break;
 
 		case CLEARSOUND:
-			if (g_lab->g_music->_loopSoundEffect) {
-				g_lab->g_music->_loopSoundEffect = false;
-				g_lab->g_music->stopSoundEffect();
-			} else if (g_lab->g_music->isSoundEffectActive())
-				g_lab->g_music->stopSoundEffect();
+			if (g_lab->_music->_loopSoundEffect) {
+				g_lab->_music->_loopSoundEffect = false;
+				g_lab->_music->stopSoundEffect();
+			} else if (g_lab->_music->isSoundEffectActive())
+				g_lab->_music->stopSoundEffect();
 
 			break;
 
 		case WINMUSIC:
-			g_lab->g_music->_winmusic = true;
-			g_lab->g_music->freeMusic();
-			g_lab->g_music->initMusic();
+			g_lab->_music->_winmusic = true;
+			g_lab->_music->freeMusic();
+			g_lab->_music->initMusic();
 			break;
 
 		case WINGAME:
@@ -590,18 +590,18 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
 		APtr = APtr->NextAction;
 	}
 
-	if (g_lab->g_music->_loopSoundEffect) {
-		g_lab->g_music->_loopSoundEffect = false;
-		g_lab->g_music->stopSoundEffect();
+	if (g_lab->_music->_loopSoundEffect) {
+		g_lab->_music->_loopSoundEffect = false;
+		g_lab->_music->stopSoundEffect();
 	} else {
-		while (g_lab->g_music->isSoundEffectActive()) {
-			g_lab->g_music->updateMusic();
+		while (g_lab->_music->isSoundEffectActive()) {
+			g_lab->_music->updateMusic();
 			g_lab->diffNextFrame();
 			g_lab->waitTOF();
 		}
 	}
 
-	g_lab->g_music->_doNotFilestopSoundEffect = false;
+	g_lab->_music->_doNotFilestopSoundEffect = false;
 }
 
 /*****************************************************************************/
diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp
index 88b4c1805d..926ef359f9 100644
--- a/engines/lab/readdiff.cpp
+++ b/engines/lab/readdiff.cpp
@@ -166,7 +166,7 @@ void LabEngine::diffNextFrame() {
 			return; /* done with the next frame. */
 		}
 
-		g_music->updateMusic();
+		_music->updateMusic();
 		readBlock(&header, 4L, difffile);
 		swapULong(&header);
 		readBlock(&size, 4L, difffile);
@@ -227,8 +227,8 @@ void LabEngine::diffNextFrame() {
 		case 30L:
 		case 31L: {
 			if (waitForEffect) {
-				while (g_music->isSoundEffectActive()) {
-					g_music->updateMusic();
+				while (_music->isSoundEffectActive()) {
+					_music->updateMusic();
 					waitTOF();
 				}
 			}
@@ -245,7 +245,7 @@ void LabEngine::diffNextFrame() {
 			uint32 musicsize = size;
 			(*difffile) += size;
 
-			g_music->playSoundEffect(samplespeed, musicsize, music);
+			_music->playSoundEffect(samplespeed, musicsize, music);
 			break;
 		}
 		case 65535L:
@@ -253,8 +253,8 @@ void LabEngine::diffNextFrame() {
 				int didTOF = 0;
 
 				if (waitForEffect) {
-					while (g_music->isSoundEffectActive()) {
-						g_music->updateMusic();
+					while (_music->isSoundEffectActive()) {
+						_music->updateMusic();
 						waitTOF();
 
 						if (DispBitMap->Flags & BITMAPF_VIDEO)
@@ -393,7 +393,7 @@ void stopDiff() {
 void stopDiffEnd() {
 	if (IsPlaying) {
 		while (IsPlaying) {
-			g_lab->g_music->updateMusic();
+			g_lab->_music->updateMusic();
 			g_lab->diffNextFrame();
 		}
 	}
@@ -431,14 +431,14 @@ void readSound(bool waitTillFinished, Common::File *file) {
 		return;
 
 	while (soundTag != 65535) {
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 		soundTag = file->readUint32LE();
 		soundSize = file->readUint32LE() - 8;
 
 		if ((soundTag == 30) || (soundTag == 31)) {
 			if (waitTillFinished) {
-				while (g_lab->g_music->isSoundEffectActive()) {
-					g_lab->g_music->updateMusic();
+				while (g_lab->_music->isSoundEffectActive()) {
+					g_lab->_music->updateMusic();
 					g_lab->waitTOF();
 				}
 			}
@@ -449,11 +449,11 @@ void readSound(bool waitTillFinished, Common::File *file) {
 			file->skip(2);
 			byte *soundData = (byte *)malloc(soundSize);
 			file->read(soundData, soundSize);
-			g_lab->g_music->playSoundEffect(sampleRate, soundSize, soundData);
+			g_lab->_music->playSoundEffect(sampleRate, soundSize, soundData);
 		} else if (soundTag == 65535L) {
 			if (waitTillFinished) {
-				while (g_lab->g_music->isSoundEffectActive()) {
-					g_lab->g_music->updateMusic();
+				while (g_lab->_music->isSoundEffectActive()) {
+					g_lab->_music->updateMusic();
 					g_lab->waitTOF();
 				}
 			}
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index 1e0ac6bbe9..290216c5e8 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -65,7 +65,7 @@ TextFont *Resource::getFont(const char *fileName) {
 	if (fileSize <= headerSize)
 		return NULL;
 
-	_vm->g_music->updateMusic();
+	_vm->_music->updateMusic();
 
 	TextFont *textfont = (TextFont *)malloc(sizeof(TextFont));
 	textfont->DataLength = fileSize - headerSize;
@@ -142,7 +142,7 @@ bool Resource::readViews(uint16 roomNum) {
 	_rooms[roomNum]._westView = readView(dataFile);
 	_rooms[roomNum]._rules = readRule(dataFile);
 
-	_vm->g_music->updateMusic();
+	_vm->_music->updateMusic();
 
 	delete dataFile;
 	return true;
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 417f854b84..7519ad1988 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -153,7 +153,7 @@ void showCombination(const char *filename) {
 
 	blackScreen();
 
-	buffer = g_lab->g_music->newOpen("P:Numbers");
+	buffer = g_lab->_music->newOpen("P:Numbers");
 
 	for (uint16 CurBit = 0; CurBit < 10; CurBit++)
 		readImage(buffer, &(Images[CurBit]));
@@ -297,10 +297,10 @@ void showTile(const char *filename, bool showsolution) {
 
 	if (showsolution) {
 		start  = 0;
-		buffer = g_lab->g_music->newOpen("P:TileSolution");
+		buffer = g_lab->_music->newOpen("P:TileSolution");
 	} else {
 		start  = 1;
-		buffer = g_lab->g_music->newOpen("P:Tile");
+		buffer = g_lab->_music->newOpen("P:Tile");
 	}
 
 	if (!buffer)
@@ -553,7 +553,7 @@ static bool loadJournalData() {
 		return false;
 	}
 
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 
 	strcpy(filename, "Lab:Rooms/j0");
 	bridge = g_lab->_conditions->in(BRIDGE0) || g_lab->_conditions->in(BRIDGE1);
@@ -586,7 +586,7 @@ static bool loadJournalData() {
 	if ((journaltexttitle = getText("Lab:Rooms/jt")) == NULL)
 		return false;
 
-	buffer = g_lab->g_music->newOpen("P:JImage");
+	buffer = g_lab->_music->newOpen("P:JImage");
 
 	if (!buffer)
 		return false;
@@ -628,7 +628,7 @@ static void drawJournalText() {
 	char *CurText = journaltext;
 
 	while (DrawingToPage < JPage) {
-		g_lab->g_music->updateMusic();
+		g_lab->_music->updateMusic();
 		CurText = (char *)(journaltext + CharsDrawn);
 		CharsDrawn += flowText(BigMsgFont, -2, 2, 0, false, false, false, false, VGAScaleX(52), VGAScaleY(32), VGAScaleX(152), VGAScaleY(148), CurText);
 
@@ -648,7 +648,7 @@ static void drawJournalText() {
 		CharsDrawn += flowTextToMem(&JBackImage, BigMsgFont, -2, 2, 0, false, false, false, true, VGAScaleX(52), VGAScaleY(32), VGAScaleX(152), VGAScaleY(148), CurText);
 	}
 
-	g_lab->g_music->updateMusic();
+	g_lab->_music->updateMusic();
 	CurText = (char *)(journaltext + CharsDrawn);
 	lastpage = (*CurText == 0);
 	flowTextToMem(&JBackImage, BigMsgFont, -2, 2, 0, false, false, false, true, VGAScaleX(171), VGAScaleY(32), VGAScaleX(271), VGAScaleY(148), CurText);
@@ -663,14 +663,14 @@ static void drawJournalText() {
 static void turnPage(bool FromLeft) {
 	if (FromLeft) {
 		for (int i = 0; i < g_lab->_screenWidth; i += 8) {
-			g_lab->g_music->updateMusic();
+			g_lab->_music->updateMusic();
 			g_lab->waitTOF();
 			ScreenImage.ImageData = g_lab->getVGABaseAddr();
 			g_lab->bltBitMap(&JBackImage, i, 0, &ScreenImage, i, 0, 8, g_lab->_screenHeight);
 		}
 	} else {
 		for (int i = (g_lab->_screenWidth - 8); i > 0; i -= 8) {
-			g_lab->g_music->updateMusic();
+			g_lab->_music->updateMusic();
 			g_lab->waitTOF();
 			ScreenImage.ImageData = g_lab->getVGABaseAddr();
 			g_lab->bltBitMap(&JBackImage, i, 0, &ScreenImage, i, 0, 8, g_lab->_screenHeight);
@@ -685,7 +685,7 @@ static void turnPage(bool FromLeft) {
 void LabEngine::drawJournal(uint16 wipenum, bool needFade) {
 	_event->mouseHide();
 
-	g_music->updateMusic();
+	_music->updateMusic();
 
 	if (!GotBackImage)
 		JBackImage.ImageData = loadBackPict("P:Journal.pic", true);
@@ -732,11 +732,11 @@ void LabEngine::processJournal() {
 	uint16 Qualifier, GadID;
 
 	while (1) {
-		g_music->updateMusic();  /* Make sure we check the music at least after every message */
+		_music->updateMusic();  /* Make sure we check the music at least after every message */
 		Msg = getMsg();
 
 		if (Msg == NULL) {
-			g_music->updateMusic();
+			_music->updateMusic();
 		} else {
 			Class     = Msg->msgClass;
 			Qualifier = Msg->qualifier;
@@ -785,7 +785,7 @@ void LabEngine::doJournal() {
 	ScreenImage = JBackImage;
 	ScreenImage.ImageData = getVGABaseAddr();
 
-	g_music->updateMusic();
+	_music->updateMusic();
 	loadJournalData();
 
 	drawJournal(0, true);
@@ -837,7 +837,7 @@ bool saveRestoreGame() {
 		if (slot >= 0) {
 			isOK = loadGame(&RoomNum, &Direction, &(Inventory[QUARTERNUM].Many), slot);
 			if (isOK)
-				g_lab->g_music->resetMusic();
+				g_lab->_music->resetMusic();
 		}
 	}
 
@@ -855,7 +855,7 @@ static void getMonImages() {
 
 	resetBuffer();
 
-	buffer = g_lab->g_music->newOpen("P:MonImage", bufferSize);
+	buffer = g_lab->_music->newOpen("P:MonImage", bufferSize);
 
 	if (!buffer)
 		return;
@@ -906,7 +906,7 @@ void LabEngine::drawMonText(char *text, uint16 x1, uint16 y1, uint16 x2, uint16
 	}
 
 	while (DrawingToPage < monitorPage) {
-		g_music->updateMusic();
+		_music->updateMusic();
 		CurText = (char *)(text + CharsDrawn);
 		CharsDrawn += flowText(BigMsgFont, yspacing, 0, 0, false, false, false, false, x1, y1, x2, y2, CurText);
 		lastpage = (*CurText == 0);
@@ -960,11 +960,11 @@ void LabEngine::processMonitor(char *ntext, bool isinteractive, uint16 x1, uint1
 			}
 		}
 
-		g_music->updateMusic();  /* Make sure we check the music at least after every message */
+		_music->updateMusic();  /* Make sure we check the music at least after every message */
 		Msg = getMsg();
 
 		if (Msg == NULL) {
-			g_music->updateMusic();
+			_music->updateMusic();
 		} else {
 			Class     = Msg->msgClass;
 			Qualifier = Msg->qualifier;