[Scummvm-git-logs] scummvm master -> 80e134a912de30baab88c68a2e96accb673a3a92

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
80e134a912 SCUMM: Let it build again without ENABLE_SCUMM_7_8


Commit: 80e134a912de30baab88c68a2e96accb673a3a92
    https://github.com/scummvm/scummvm/commit/80e134a912de30baab88c68a2e96accb673a3a92
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-20T19:38:18+02:00

Commit Message:
SCUMM: Let it build again without ENABLE_SCUMM_7_8

Changed paths:
    engines/scumm/cursor.cpp
    engines/scumm/gfx_gui.cpp
    engines/scumm/input.cpp
    engines/scumm/scumm.cpp
    engines/scumm/sound.cpp


diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 39b27189dfb..175e7599e7a 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -91,6 +91,7 @@ static const byte default_v6_cursor[] = {
 	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
 };
 
+#ifdef ENABLE_SCUMM_7_8
 static const byte default_v7_cursor[] = {
 	0x01,0x01,0x01,0x01, 0x00,0x0F,0x00, 0x01,0x01,0x01,0x01,
 	0x01,0x01,0x01,0x01, 0x00,0x0F,0x00, 0x01,0x01,0x01,0x01,
@@ -128,6 +129,7 @@ static const byte default_v8_cursor[] = {
 	0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE, 0x00,0x0F,0x0F,0x00, 0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,
 	0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE, 0x00,0x0F,0x0F,0x00, 0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,
 };
+#endif
 
 void ScummEngine_v5::animateCursor() {
 	if (_cursor.animate) {
diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index bae908e959c..42e4ffc73e3 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -21,14 +21,17 @@
 
 #include "scumm/scumm.h"
 #include "scumm/scumm_v4.h"
+#include "scumm/scumm_v6.h"
 #include "scumm/scumm_v8.h"
 #include "scumm/gfx.h"
 #include "scumm/dialogs.h"
 #include "scumm/charset.h"
 #include "scumm/string_v7.h"
+#include "scumm/sound.h"
 #include "scumm/smush/smush_player.h"
 #include "scumm/imuse_digi/dimuse_engine.h"
 
+#include "audio/mixer.h"
 #include "graphics/cursorman.h"
 #include "graphics/thumbnail.h"
 
@@ -1872,8 +1875,10 @@ bool ScummEngine::executeMainMenuOperation(int op, int mouseX, int mouseY, bool
 				if (loadState(curSlot - 1, false)) {
 					hasLoadedState = true;
 
+#ifdef ENABLE_SCUMM_7_8
 					if (!_spooledMusicIsToBeEnabled)
 						_imuseDigital->diMUSEDisableSpooledMusic();
+#endif
 
 					setSkipVideo(0);
 					_saveScriptParam = GAME_PROPER_LOAD;
@@ -1987,6 +1992,7 @@ bool ScummEngine::executeMainMenuOperation(int op, int mouseX, int mouseY, bool
 	case GUI_CTRL_SPOOLED_MUSIC_CHECKBOX:
 		_spooledMusicIsToBeEnabled ^= 1;
 
+#ifdef ENABLE_SCUMM_7_8
 		// Just for safety, this should never be nullptr...
 		if (_imuseDigital) {
 			if (_spooledMusicIsToBeEnabled) {
@@ -1995,6 +2001,7 @@ bool ScummEngine::executeMainMenuOperation(int op, int mouseX, int mouseY, bool
 				_imuseDigital->diMUSEDisableSpooledMusic();
 			}
 		}
+#endif
 		updateMainMenuControls();
 		ScummEngine::drawDirtyScreenParts();
 		break;
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 17e517aab77..b9d36092f5d 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -602,7 +602,11 @@ void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) {
 
 				pt = pauseEngine();
 
+#ifdef ENABLE_SCUMM_7_8
 				int volume = (_game.version > 6) ? _imuseDigital->diMUSEGetMusicGroupVol() : getMusicVolume();
+#else
+				int volume = getMusicVolume();
+#endif
 				do {
 					if (ks.keycode == Common::KEYCODE_o) {
 						volume -= 16;
@@ -636,7 +640,11 @@ void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) {
 
 				pt = pauseEngine();
 
+#ifdef ENABLE_SCUMM_7_8
 				int volume = (_game.version > 6) ? _imuseDigital->diMUSEGetVoiceGroupVol() : getSpeechVolume();
+#else
+				int volume = getSpeechVolume();
+#endif
 				do {
 					if (ks.keycode == Common::KEYCODE_k) {
 						volume -= 16;
@@ -670,7 +678,11 @@ void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) {
 
 				pt = pauseEngine();
 
+#ifdef ENABLE_SCUMM_7_8
 				int volume = (_game.version > 6) ? _imuseDigital->diMUSEGetSFXGroupVol() : getSFXVolume();
+#else
+				int volume = getSFXVolume();
+#endif
 				do {
 					if (ks.keycode == Common::KEYCODE_n) {
 						volume -= 16;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index cc25320bb9b..3265b4713fc 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2131,11 +2131,13 @@ void ScummEngine::syncSoundSettings() {
 				VAR(VAR_CHARINC) = 9 - _defaultTextSpeed;
 		}
 
+#ifdef ENABLE_SCUMM_7_8
 		if (_game.version >= 7 && _imuseDigital) {
 			_imuseDigital->diMUSESetMusicGroupVol(ConfMan.getInt("music_volume") / 2);
 			_imuseDigital->diMUSESetVoiceGroupVol(ConfMan.getInt("speech_volume") / 2);
 			_imuseDigital->diMUSESetSFXGroupVol(ConfMan.getInt("sfx_volume") / 2);
 		}
+#endif
 		return;
 	}
 
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 34cd12c99cb..bca8581cc30 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1567,9 +1567,11 @@ void Sound::restoreAfterLoad() {
 }
 
 bool Sound::isAudioDisabled() {
+#ifdef ENABLE_SCUMM_7_8
 	if (_vm->_game.version > 6) {
 		return _vm->_imuseDigital->isEngineDisabled();
 	}
+#endif
 
 	return false;
 }