HOPKINS: Some more similar cleanup

scummvm · Feb 15, 2013 · 3554224 · 3554224
1 parent c5f800a
commit 3554224
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
@@ -320,7 +320,7 @@ void DialogsManager::showInventory() {
 		_vm->_eventsManager.getMouseY();
 		_vm->_eventsManager.VBL();
 	}
-	_vm->_dialogsManager._inventWin1 = g_PTRNUL;
+	_inventWin1 = g_PTRNUL;
 
 	bool loopFl;
 	do {
@@ -352,18 +352,18 @@ void DialogsManager::showInventory() {
 			error("Error opening file - %s", filename.c_str());
 
 		size_t filesize = f.size();
-		_vm->_dialogsManager._inventWin1 = _vm->_globals.allocMemory(filesize);
-		_vm->_fileManager.readStream(f, _vm->_dialogsManager._inventWin1, filesize);
+		_inventWin1 = _vm->_globals.allocMemory(filesize);
+		_vm->_fileManager.readStream(f, _inventWin1, filesize);
 		f.close();
 
 		_inventBuf2 = _vm->_fileManager.loadFile("INVENT2.SPR");
 
 		_inventX = _vm->_graphicsManager._scrollOffset + 152;
 		_inventY = 114;
-		_inventWidth = _vm->_objectsManager.getWidth(_vm->_dialogsManager._inventWin1, 0);
-		_inventHeight = _vm->_objectsManager.getHeight(_vm->_dialogsManager._inventWin1, 0);
+		_inventWidth = _vm->_objectsManager.getWidth(_inventWin1, 0);
+		_inventHeight = _vm->_objectsManager.getHeight(_inventWin1, 0);
 
-		_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager._vesaBuffer, _vm->_dialogsManager._inventWin1, _inventX + 300, 414, 0, 0, 0, false);
+		_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager._vesaBuffer, _inventWin1, _inventX + 300, 414, 0, 0, 0, false);
 		int curPosY = 0;
 		int inventCount = 0;
 		for (int inventLine = 1; inventLine <= 5; inventLine++) {
@@ -382,7 +382,7 @@ void DialogsManager::showInventory() {
 			};
 			curPosY += 38;
 		}
-		_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager._vesaBuffer, _vm->_dialogsManager._inventWin1, _inventX, _inventY, _inventWidth, _inventHeight);
+		_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager._vesaBuffer, _inventWin1, _inventX, _inventY, _inventWidth, _inventHeight);
 		_vm->_eventsManager._curMouseButton = 0;
 		int newInventoryItem = 0;
 
@@ -433,7 +433,7 @@ void DialogsManager::showInventory() {
 
 					_vm->_globals._exitId = 0;
 					_inventBuf2 = _vm->_globals.freeMemory(_inventBuf2);
-					_vm->_dialogsManager._inventWin1 = _vm->_globals.freeMemory(_vm->_dialogsManager._inventWin1);
+					_inventWin1 = _vm->_globals.freeMemory(_inventWin1);
 					loopFl = true;
 					break;
 				} else
@@ -455,15 +455,15 @@ void DialogsManager::showInventory() {
 		_vm->_objectsManager.BOBTOUS = true;
 	}
 
-	_vm->_dialogsManager._inventWin1 = _vm->_globals.freeMemory(_vm->_dialogsManager._inventWin1);
+	_inventWin1 = _vm->_globals.freeMemory(_inventWin1);
 	_inventBuf2 = _vm->_globals.freeMemory(_inventBuf2);
 
 	if (_vm->_eventsManager._mouseCursorId == 1)
 		showOptionsDialog();
 	else if (_vm->_eventsManager._mouseCursorId == 3)
-		_vm->_dialogsManager.showLoadGame();
+		showLoadGame();
 	else if (_vm->_eventsManager._mouseCursorId == 2)
-		_vm->_dialogsManager.showSaveGame();
+		showSaveGame();
 
 	_vm->_eventsManager._mouseCursorId = 4;
 	_vm->_eventsManager.changeMouseCursor(4);
@@ -535,21 +535,21 @@ void DialogsManager::testDialogOpening() {
 
 	switch (key) {
 	case KEY_INVENTORY:
-		_vm->_dialogsManager.showInventory();
+		showInventory();
 		break;
 	case KEY_OPTIONS:
 		_vm->_graphicsManager._scrollStatus = 1;
-		_vm->_dialogsManager.showOptionsDialog();
+		showOptionsDialog();
 		_vm->_graphicsManager._scrollStatus = 0;
 		break;
 	case KEY_LOAD:
 		_vm->_graphicsManager._scrollStatus = 1;
-		_vm->_dialogsManager.showLoadGame();
+		showLoadGame();
 		_vm->_graphicsManager._scrollStatus = 0;
 		break;
 	case KEY_SAVE:
 		_vm->_graphicsManager._scrollStatus = 1;
-		_vm->_dialogsManager.showSaveGame();
+		showSaveGame();
 		_vm->_graphicsManager._scrollStatus = 0;
 		break;
 	default:

diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
@@ -3244,7 +3244,7 @@ void LinesManager::checkZone() {
 		_vm->_globals.compteur_71 = 0;
 		int zoneId;
 		if (_vm->_globals._oldMouseX != mouseX || _vm->_globals._oldMouseY != oldMouseY) {
-			zoneId = MZONE();-
+			zoneId = MZONE();
 		} else {
 			zoneId = _vm->_globals._oldMouseZoneId;
 		}

diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
@@ -361,7 +361,7 @@ void SoundManager::WSOUND_OFF() {
 	stopVoice(0);
 	stopVoice(1);
 	stopVoice(2);
-	if (_vm->_soundManager._soundFl)
+	if (_soundFl)
 		delWav(_currentSoundIndex);
 
 	for (int i = 1; i <= 48; ++i)
@@ -583,7 +583,7 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode) {
 	oldMusicVol = _musicVolume;
 	if (!_musicOffFl && _musicVolume > 2) {
 		_musicVolume = (signed int)((long double)_musicVolume - (long double)_musicVolume / 100.0 * 45.0);
-		_vm->_soundManager.MODSetMusicVolume(_vm->_soundManager._musicVolume);
+		MODSetMusicVolume(_musicVolume);
 	}
 
 	playVoice();
@@ -611,7 +611,7 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode) {
 	// Speech is over, set the music volume back to normal
 	_musicVolume = oldMusicVol;
 	if (!_musicOffFl && _musicVolume > 2) {
-		_vm->_soundManager.MODSetMusicVolume(_vm->_soundManager._musicVolume);
+		MODSetMusicVolume(_musicVolume);
 	}
 	_vm->_eventsManager._escKeyFl = false;
 	_skipRefreshFl = false;