[Scummvm-git-logs] scummvm master -> 616492be3d4715b046207cd6d87c099b069213d8
bluegr
noreply at scummvm.org
Tue Apr 26 18:08:48 UTC 2022
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5cba8f9242 Revert "GUI: honor tts_enabled option in some more places"
eb29aea4b4 TTS: (Windows) - implement better way to disable the option
bd1dbecde9 TTS: (ENGINES) - add support for tts enable function
ee336d348b TTS: (Testbed) - implement tts enable option
2b62215267 TTS: (Windows) - reduce number of calls to updateVoices()
616492be3d TTS: cleanup (whitespace)
Commit: 5cba8f92424e59019363ae5364b8ad0ad3d19c34
https://github.com/scummvm/scummvm/commit/5cba8f92424e59019363ae5364b8ad0ad3d19c34
Author: athrxx (athrxx at scummvm.org)
Date: 2022-04-26T21:08:41+03:00
Commit Message:
Revert "GUI: honor tts_enabled option in some more places"
This reverts commit 5969a2667a85b81a8b78b75fdf6d2d5364068155.
Changed paths:
base/main.cpp
engines/engine.cpp
diff --git a/base/main.cpp b/base/main.cpp
index 7d937552bde..a3ee5c6f28d 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -619,13 +619,12 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
}
#endif
Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
- if (ttsMan != nullptr && ConfMan.hasKey("tts_enabled", "scummvm") && ConfMan.getBool("tts_enabled", "scummvm")) {
+ if (ttsMan != nullptr) {
ttsMan->pushState();
}
-
// Try to run the game
Common::Error result = runGame(plugin, enginePlugin, system, specialDebug);
- if (ttsMan != nullptr && ConfMan.hasKey("tts_enabled", "scummvm") && ConfMan.getBool("tts_enabled", "scummvm")) {
+ if (ttsMan != nullptr) {
ttsMan->popState();
}
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 87e560e9cf7..b421f8e0d23 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -666,7 +666,7 @@ void Engine::openMainMenuDialog() {
if (!_mainMenuDialog)
_mainMenuDialog = new MainMenuDialog(this);
Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
- if (ttsMan != nullptr && ConfMan.hasKey("tts_enabled", "scummvm") && ConfMan.getBool("tts_enabled", "scummvm")) {
+ if (ttsMan != nullptr) {
ttsMan->pushState();
g_gui.initTextToSpeech();
}
@@ -697,7 +697,7 @@ void Engine::openMainMenuDialog() {
}
}
- if (ttsMan != nullptr && ConfMan.hasKey("tts_enabled", "scummvm") && ConfMan.getBool("tts_enabled", "scummvm"))
+ if (ttsMan != nullptr)
ttsMan->popState();
g_system->applyBackendSettings();
Commit: eb29aea4b48781c14e6fdbe0f3415ab9de604f6d
https://github.com/scummvm/scummvm/commit/eb29aea4b48781c14e6fdbe0f3415ab9de604f6d
Author: athrxx (athrxx at scummvm.org)
Date: 2022-04-26T21:08:41+03:00
Commit Message:
TTS: (Windows) - implement better way to disable the option
Currently, the text-to-speech manager will try to update the voices whenever TextToSpeechManager::pushState()/popState() is called. This causes lags of 4 - 5 seconds on Windows. Also, a warning is triggered each time. This commit prevents that from happening if the tts option is not enabled.
This commit currently affects only Windows. Other backends don't make use of the new _enabled setting. I don't know if it would make sense for any of these and I also wouldn't be able to test it.
Changed paths:
backends/text-to-speech/windows/windows-text-to-speech.cpp
common/text-to-speech.cpp
common/text-to-speech.h
gui/gui-manager.cpp
gui/options.cpp
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp
index 88232680777..0d0701ec231 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.cpp
+++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp
@@ -178,7 +178,8 @@ DWORD WINAPI startSpeech(LPVOID parameters) {
bool WindowsTextToSpeechManager::say(const Common::U32String &str, Action action) {
if (_speechState == BROKEN || _speechState == NO_VOICE) {
- warning("The text to speech cannot speak in this state");
+ if (_ttsState->_enabled)
+ warning("The text to speech cannot speak in this state");
return true;
}
@@ -424,8 +425,14 @@ Common::String WindowsTextToSpeechManager::lcidToLocale(LCID locale) {
}
void WindowsTextToSpeechManager::updateVoices() {
+ if (!_ttsState->_enabled) {
+ _speechState = NO_VOICE;
+ return;
+ }
+
if (_speechState == BROKEN)
return;
+
_ttsState->_availableVoices.clear();
ISpObjectToken *cpVoiceToken = nullptr;
IEnumSpObjectTokens *cpEnum = nullptr;
diff --git a/common/text-to-speech.cpp b/common/text-to-speech.cpp
index 405b417f20a..2e22b9777d6 100644
--- a/common/text-to-speech.cpp
+++ b/common/text-to-speech.cpp
@@ -82,6 +82,7 @@ TextToSpeechManager::TextToSpeechManager() {
_ttsState->_rate = 0;
_ttsState->_activeVoice = 0;
_ttsState->_language = "en";
+ _ttsState->_enabled = false;
_ttsState->_next = nullptr;
}
@@ -93,6 +94,7 @@ void TextToSpeechManager::pushState() {
newState->_rate = _ttsState->_rate;
newState->_activeVoice = _ttsState->_activeVoice;
newState->_language = _ttsState->_language;
+ newState->_enabled = _ttsState->_enabled;
newState->_next = _ttsState;
_ttsState = newState;
updateVoices();
@@ -115,9 +117,17 @@ bool TextToSpeechManager::popState() {
setVolume(_ttsState->_volume);
setRate(_ttsState->_rate);
setVoice(voice);
+
return false;
}
+void TextToSpeechManager::enable(bool on) {
+ if (_ttsState->_enabled == on)
+ return;
+ _ttsState->_enabled = on;
+ updateVoices();
+}
+
void TextToSpeechManager::clearState() {
TTSState *tmp = _ttsState;
while (tmp != nullptr) {
diff --git a/common/text-to-speech.h b/common/text-to-speech.h
index 2ab3d9cdca6..ba3699786c7 100644
--- a/common/text-to-speech.h
+++ b/common/text-to-speech.h
@@ -135,6 +135,7 @@ struct TTSState {
String _language;
int _activeVoice;
Array<TTSVoice> _availableVoices;
+ bool _enabled;
TTSState *_next;
};
@@ -336,6 +337,11 @@ public:
*/
virtual void freeVoiceData(void *data) {}
+ /**
+ * Enables/disables the TTS
+ */
+ void enable(bool on);
+
protected:
TTSState *_ttsState;
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index b02d8e64d89..534b7b4e625 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -846,6 +846,7 @@ void GuiManager::initTextToSpeech() {
Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
if (ttsMan == nullptr)
return;
+ ttsMan->enable(ConfMan.hasKey("tts_enabled", "scummvm") ? ConfMan.getBool("tts_enabled", "scummvm") : false);
#ifdef USE_TRANSLATION
Common::String currentLanguage = TransMan.getCurrentLanguage();
ttsMan->setLanguage(currentLanguage);
diff --git a/gui/options.cpp b/gui/options.cpp
index 9bdfd4bac2c..7e398af3b4e 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2792,6 +2792,7 @@ void GlobalOptionsDialog::apply() {
#ifdef USE_TTS
Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
if (ttsMan) {
+ ttsMan->enable(_ttsCheckbox->getState());
#ifdef USE_TRANSLATION
if (newLang != oldLang) {
ttsMan->setLanguage(newLang);
Commit: bd1dbecde90053b1172f59aeffd9100c1713e8c9
https://github.com/scummvm/scummvm/commit/bd1dbecde90053b1172f59aeffd9100c1713e8c9
Author: athrxx (athrxx at scummvm.org)
Date: 2022-04-26T21:08:41+03:00
Commit Message:
TTS: (ENGINES) - add support for tts enable function
The new option only works as intended if the engine that have TTS support apply their own settings. It cannot be globally implemented before and after runGame(), since the engines don't all use the same config manager variables (sometimes "tts_enabled_speech", "tts_enabled" or "tts_narrator, sometimes more than one of these).
Changed paths:
engines/cge/cge.cpp
engines/cge2/cge2.cpp
engines/dreamweb/dreamweb.cpp
engines/glk/speech.cpp
engines/griffon/griffon.cpp
engines/lure/lure.cpp
engines/mads/mads.cpp
engines/mortevielle/sound.cpp
engines/sci/engine/tts.cpp
engines/sherlock/sherlock.cpp
engines/supernova/supernova.cpp
engines/twine/twine.cpp
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index fc9943aea78..21a14f36ac9 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -161,6 +161,10 @@ void CGEEngine::init() {
_offUseCount = atoi(_text->getText(kOffUseCount));
_startGameSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
+
+ Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
+ if (ttsMan != nullptr)
+ ttsMan->enable(ConfMan.getBool("tts_enabled"));
}
void CGEEngine::deinit() {
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index 8514a013eac..10061169b4c 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -139,7 +139,7 @@ void CGE2Engine::init() {
_sys = new System(this);
_eventManager = new EventManager(this);
_map = new Map(this);
- _startGameSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
+ _startGameSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
}
void CGE2Engine::deinit() {
@@ -183,8 +183,10 @@ bool CGE2Engine::hasFeature(EngineFeature f) const {
Common::Error CGE2Engine::run() {
Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
- if (ttsMan != nullptr)
+ if (ttsMan != nullptr) {
ttsMan->setLanguage(Common::getLanguageCode(getLanguage()));
+ ttsMan->enable(ConfMan.getBool("tts_enabled_speech") || ConfMan.getBool("tts_enabled_objects"));
+ }
syncSoundSettings();
initGraphics(kScrWidth, kScrHeight);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 6d4bacb31df..9be12996d68 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -397,6 +397,7 @@ Common::Error DreamWebEngine::run() {
if (_ttsMan != nullptr) {
Common::String languageString = Common::getLanguageCode(getLanguage());
_ttsMan->setLanguage(languageString);
+ _ttsMan->enable(ConfMan.getBool("tts_enabled_objects") || ConfMan.getBool("tts_enabled_speech"));
switch (getLanguage()) {
case Common::RU_RUS:
_textEncoding = Common::kDos866;
diff --git a/engines/glk/speech.cpp b/engines/glk/speech.cpp
index 655c22aec92..21372227dd5 100644
--- a/engines/glk/speech.cpp
+++ b/engines/glk/speech.cpp
@@ -77,6 +77,8 @@ SpeechManager::SpeechManager() :
if (_ttsMan != nullptr) {
// Language
_ttsMan->setLanguage(ConfMan.get("language"));
+ // Enable
+ _ttsMan->enable(true);
// Volume
int volume = (ConfMan.getInt("speech_volume") * 100) / 256;
if (ConfMan.hasKey("mute") && ConfMan.getBool("mute"))
@@ -91,8 +93,9 @@ SpeechManager::SpeechManager() :
} else
voice = _ttsMan->getDefaultVoice();
_ttsMan->setVoice(voice);
- } else
+ } else {
debugC(kDebugSpeech, "Text to Speech is not available");
+ }
#endif
}
diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp
index 99ec2c46f47..f2d177ca9c6 100644
--- a/engines/griffon/griffon.cpp
+++ b/engines/griffon/griffon.cpp
@@ -131,8 +131,10 @@ void GriffonEngine::saveConfig() {
Common::Error GriffonEngine::run() {
Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
- if (ttsMan != nullptr)
+ if (ttsMan != nullptr) {
ttsMan->setLanguage("en");
+ ttsMan->enable(ConfMan.getBool("tts_enabled"));
+ }
initGraphics(320, 240, new Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0));
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 04e940d8fb4..15d2062d120 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -24,6 +24,7 @@
#include "common/system.h"
#include "common/savefile.h"
#include "common/translation.h"
+#include "common/text-to-speech.h"
#include "engines/util.h"
@@ -88,6 +89,10 @@ Common::Error LureEngine::init() {
// Setup mixer
syncSoundSettings();
+ Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
+ if (ttsMan != nullptr)
+ ttsMan->enable(ConfMan.getBool("tts_narrator"));
+
return Common::kNoError;
}
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index b7808bd35a5..ed531bb5d62 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -23,6 +23,7 @@
#include "common/config-manager.h"
#include "common/debug-channels.h"
#include "common/events.h"
+#include "common/text-to-speech.h"
#include "engines/util.h"
#include "mads/mads.h"
#include "mads/game.h"
@@ -132,6 +133,10 @@ void MADSEngine::loadOptions() {
// otherwise all sound, music and sfx, is controlled by the SFX volume slider.
int soundVolume = MIN(255, ConfMan.getInt("sfx_volume"));
_sound->setVolume(soundVolume);
+
+ Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
+ if (ttsMan != nullptr)
+ ttsMan->enable(ConfMan.getBool("tts_narrator"));
}
void MADSEngine::saveOptions() {
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 6d8a9f3619f..0be268b13da 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -67,6 +67,7 @@ SoundManager::SoundManager(MortevielleEngine *vm, Audio::Mixer *mixer) {
_ttsMan = g_system->getTextToSpeechManager();
if (_ttsMan) {
_ttsMan->setLanguage(ConfMan.get("language"));
+ _ttsMan->enable(true);
_ttsMan->stop();
_ttsMan->setRate(0);
_ttsMan->setPitch(0);
diff --git a/engines/sci/engine/tts.cpp b/engines/sci/engine/tts.cpp
index 3b1a21f6244..e6b10f235e1 100644
--- a/engines/sci/engine/tts.cpp
+++ b/engines/sci/engine/tts.cpp
@@ -30,8 +30,10 @@ namespace Sci {
SciTTS::SciTTS() : _curMessage("") {
_ttsMan = ConfMan.getBool("tts_enabled") ? g_system->getTextToSpeechManager() : nullptr;
- if (_ttsMan != nullptr)
+ if (_ttsMan != nullptr) {
_ttsMan->setLanguage(ConfMan.get("language"));
+ _ttsMan->enable(true);
+ }
}
void SciTTS::button(const Common::String &text) {
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index f9bbee4d8f5..81c5a55cde0 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -24,6 +24,7 @@
#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/debug-channels.h"
+#include "common/text-to-speech.h"
namespace Sherlock {
@@ -245,6 +246,10 @@ void SherlockEngine::loadConfig() {
_ui->_helpStyle = ConfMan.getBool("help_style");
_ui->_slideWindows = ConfMan.getBool("window_style");
_people->_portraitsOn = ConfMan.getBool("portraits_on");
+
+ Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
+ if (ttsMan != nullptr)
+ ttsMan->enable(ConfMan.getBool("tts_narrator"));
}
void SherlockEngine::saveConfig() {
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index a44eeb16eb2..0648843746d 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -113,8 +113,10 @@ SupernovaEngine::~SupernovaEngine() {
Common::Error SupernovaEngine::run() {
Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
- if (ttsMan != nullptr)
+ if (ttsMan != nullptr) {
ttsMan->setLanguage(ConfMan.get("language"));
+ ttsMan->enable(ConfMan.getBool("tts_enabled"));
+ }
init();
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 1f9356b586b..8b79948ec4d 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -31,6 +31,7 @@
#include "common/stream.h"
#include "common/system.h"
#include "common/textconsole.h"
+#include "common/text-to-speech.h"
#include "engines/metaengine.h"
#include "engines/util.h"
#include "graphics/cursorman.h"
@@ -478,6 +479,10 @@ void TwinEEngine::initConfigurations() {
_cfgfile.SceZoom = ConfGetBoolOrDefault("scezoom", false);
_cfgfile.PolygonDetails = ConfGetIntOrDefault("polygondetails", 2);
+ Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
+ if (ttsMan != nullptr)
+ ttsMan->enable(ConfGetBoolOrDefault("tts_narrator", false));
+
debug(1, "UseCD: %s", (_cfgfile.UseCD ? "true" : "false"));
debug(1, "Sound: %s", (_cfgfile.Sound ? "true" : "false"));
debug(1, "Movie: %i", _cfgfile.Movie);
Commit: ee336d348b496759947351c696760445d59a1115
https://github.com/scummvm/scummvm/commit/ee336d348b496759947351c696760445d59a1115
Author: athrxx (athrxx at scummvm.org)
Date: 2022-04-26T21:08:41+03:00
Commit Message:
TTS: (Testbed) - implement tts enable option
Changed paths:
engines/testbed/speech.cpp
diff --git a/engines/testbed/speech.cpp b/engines/testbed/speech.cpp
index c620e83d347..1cb8e938531 100644
--- a/engines/testbed/speech.cpp
+++ b/engines/testbed/speech.cpp
@@ -540,7 +540,10 @@ TestExitStatus Speechtests::testQueueNoRepeat() {
SpeechTestSuite::SpeechTestSuite() {
_isTsEnabled = true;
- if (!g_system->getTextToSpeechManager())
+ Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
+ if (ttsMan)
+ ttsMan->enable(true);
+ else
_isTsEnabled = false;
addTest("testMale", &Speechtests::testMale, true);
addTest("testFemale", &Speechtests::testFemale, true);
Commit: 2b62215267100586c270e6fdd0ec8b250a72b3d3
https://github.com/scummvm/scummvm/commit/2b62215267100586c270e6fdd0ec8b250a72b3d3
Author: athrxx (athrxx at scummvm.org)
Date: 2022-04-26T21:08:41+03:00
Commit Message:
TTS: (Windows) - reduce number of calls to updateVoices()
Changed paths:
backends/text-to-speech/windows/windows-text-to-speech.cpp
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp
index 0d0701ec231..b0c2c7ccbe5 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.cpp
+++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp
@@ -153,7 +153,7 @@ DWORD WINAPI startSpeech(LPVOID parameters) {
break;
}
WCHAR *currentSpeech = params->queue->front();
- _voice->Speak(currentSpeech, SPF_PURGEBEFORESPEAK | SPF_ASYNC | SPF_PARSE_SAPI, nullptr);
+ _voice->Speak(currentSpeech, SPF_PURGEBEFORESPEAK | SPF_ASYNC | SPF_PARSE_SAPI, nullptr);
ReleaseMutex(*params->mutex);
while (*(params->state) != WindowsTextToSpeechManager::PAUSED)
@@ -340,8 +340,12 @@ void WindowsTextToSpeechManager::setVolume(unsigned volume) {
}
void WindowsTextToSpeechManager::setLanguage(Common::String language) {
- Common::TextToSpeechManager::setLanguage(language);
- updateVoices();
+ if (_ttsState->_language != language.substr(0, 2) || _ttsState->_availableVoices.empty()) {
+ Common::TextToSpeechManager::setLanguage(language);
+ updateVoices();
+ } else if (_speechState == NO_VOICE) {
+ _speechState = READY;
+ }
setVoice(0);
}
Commit: 616492be3d4715b046207cd6d87c099b069213d8
https://github.com/scummvm/scummvm/commit/616492be3d4715b046207cd6d87c099b069213d8
Author: athrxx (athrxx at scummvm.org)
Date: 2022-04-26T21:08:41+03:00
Commit Message:
TTS: cleanup (whitespace)
Co-authored-by: Filippos Karapetis <bluegr at gmail.com>
Changed paths:
backends/text-to-speech/windows/windows-text-to-speech.cpp
engines/cge2/cge2.cpp
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp
index b0c2c7ccbe5..c17175857a9 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.cpp
+++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp
@@ -153,7 +153,7 @@ DWORD WINAPI startSpeech(LPVOID parameters) {
break;
}
WCHAR *currentSpeech = params->queue->front();
- _voice->Speak(currentSpeech, SPF_PURGEBEFORESPEAK | SPF_ASYNC | SPF_PARSE_SAPI, nullptr);
+ _voice->Speak(currentSpeech, SPF_PURGEBEFORESPEAK | SPF_ASYNC | SPF_PARSE_SAPI, nullptr);
ReleaseMutex(*params->mutex);
while (*(params->state) != WindowsTextToSpeechManager::PAUSED)
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index 10061169b4c..116e8e7d9a3 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -139,7 +139,7 @@ void CGE2Engine::init() {
_sys = new System(this);
_eventManager = new EventManager(this);
_map = new Map(this);
- _startGameSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
+ _startGameSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
}
void CGE2Engine::deinit() {
More information about the Scummvm-git-logs
mailing list