From d0bae5b805797fa44dc6a68f925fdad718d36284 Mon Sep 17 00:00:00 2001
From: Bendegúz Nagy
Date: Sat, 3 Sep 2016 15:52:59 +0200
Subject: DM: Replace _vm->_system with g_system

---
 engines/dm/dm.cpp       | 6 +++---
 engines/dm/eventman.cpp | 8 ++++----
 engines/dm/gfx.cpp      | 6 +++---
 engines/dm/text.cpp     | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index a0adf5e91b..9d9e44a2e4 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -815,9 +815,9 @@ void DMEngine::openEntranceDoors() {
 
 		_displayMan->blitToScreen(_savedScreenForOpenEntranceDoors, &screenBox, 160, kM1_ColorNoTransparency, 200);
 		_displayMan->blitToBitmap(leftDoorBitmap, _displayMan->_bitmapScreen, leftDoorBox, leftDoorBlitFrom, 0, 64, k160_byteWidthScreen,
-									   kM1_ColorNoTransparency, 161, k200_heightScreen);
+								  kM1_ColorNoTransparency, 161, k200_heightScreen);
 		_displayMan->blitToBitmap(rightDoorBitmap, _displayMan->_bitmapScreen, rightDoorBox, 0, 0, 64, k160_byteWidthScreen,
-									   kM1_ColorNoTransparency, 161, k200_heightScreen);
+								  kM1_ColorNoTransparency, 161, k200_heightScreen);
 		_eventMan->discardAllInput();
 		_displayMan->updateScreen();
 
@@ -938,7 +938,7 @@ void DMEngine::fuseSequence() {
 	int16 fluxCageMapX = _dungeonMan->_partyMapX;
 	int16 fluxcageMapY = _dungeonMan->_partyMapY;
 
-	for(;;) {
+	for (;;) {
 		Thing curThing = _dungeonMan->getSquareFirstObject(fluxCageMapX, fluxcageMapY);
 		while (curThing != Thing::_endOfList) {
 			if (curThing.getType() == k15_ExplosionThingType) {
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index 5d9c04b95c..d478d4cd7f 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -597,12 +597,12 @@ bool EventManager::isMouseButtonDown(MouseButton button) {
 }
 
 void EventManager::setMousePos(Common::Point pos) {
-	_vm->_system->warpMouse(pos.x, pos.y);
+	g_system->warpMouse(pos.x, pos.y);
 }
 
 Common::EventType EventManager::processInput(Common::Event *grabKey, Common::Event *grabMouseClick) {
 	Common::Event event;
-	while (_vm->_system->getEventManager()->pollEvent(event)) {
+	while (g_system->getEventManager()->pollEvent(event)) {
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN: {
 			if (event.synthetic)
@@ -1420,7 +1420,7 @@ void EventManager::drawSleepScreen() {
 
 void EventManager::discardAllInput() {
 	Common::Event event;
-	while (_vm->_system->getEventManager()->pollEvent(event) && !_vm->_engineShouldQuit) {
+	while (g_system->getEventManager()->pollEvent(event) && !_vm->_engineShouldQuit) {
 		if (event.type == Common::EVENT_QUIT)
 			_vm->_engineShouldQuit = true;
 	}
@@ -1626,7 +1626,7 @@ void EventManager::waitForMouseOrKeyActivity() {
 	discardAllInput();
 	Common::Event event;
 	while (true) {
-		if (_vm->_system->getEventManager()->pollEvent(event)) {
+		if (g_system->getEventManager()->pollEvent(event)) {
 			switch (event.type) {
 			case Common::EVENT_QUIT:
 				_vm->_engineShouldQuit = true;
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index 0b5fa47656..00bf044893 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -919,9 +919,9 @@ void DisplayMan::updateScreen() {
 	// apply copper
 	for (uint32 i = 320 * 30; i < 320 * 170; ++i)
 		_bitmapScreen[i] += 16;
-	_vm->_system->copyRectToScreen(_bitmapScreen, _screenWidth, 0, 0, _screenWidth, _screenHeight);
+	g_system->copyRectToScreen(_bitmapScreen, _screenWidth, 0, 0, _screenWidth, _screenHeight);
 	_vm->_console->onFrame();
-	_vm->_system->updateScreen();
+	g_system->updateScreen();
 	for (uint32 i = 320 * 30; i < 320 * 170; ++i)
 		_bitmapScreen[i] -= 16;
 }
@@ -3861,7 +3861,7 @@ void DisplayMan::buildPaletteChangeCopperList(uint16* middleScreen, uint16* topA
 		colorPalette[i * 3 + 1] = (middleScreen[i - 16] >> 4) * (256 / 16);
 		colorPalette[i * 3 + 2] = middleScreen[i - 16] * (256 / 16);
 	}
-	_vm->_system->getPaletteManager()->setPalette(colorPalette, 0, 32);
+	g_system->getPaletteManager()->setPalette(colorPalette, 0, 32);
 }
 
 }
diff --git a/engines/dm/text.cpp b/engines/dm/text.cpp
index 16955bacd8..52e83d1db2 100644
--- a/engines/dm/text.cpp
+++ b/engines/dm/text.cpp
@@ -254,10 +254,10 @@ void TextMan::clearAllRows() {
 void TextMan::updateMessageArea() {
 	if (_isScrolling) {
 		if (_startedScrollingAt == -1) {
-			_startedScrollingAt = _vm->_system->getMillis();
+			_startedScrollingAt = g_system->getMillis();
 			memcpy(_messageAreaCopy, _vm->_displayMan->_bitmapScreen + (200 - 7 * 4) * 320, 320 * 7 * 4);
 		}
-		int linesToCopy = (_vm->_system->getMillis() - _startedScrollingAt) / 50;
+		int linesToCopy = (g_system->getMillis() - _startedScrollingAt) / 50;
 		if (linesToCopy >= 7) {
 			linesToCopy = 7;
 			_startedScrollingAt = -1;
-- 
cgit v1.2.3