WAGE: Add text-to-speech (TTS) #6546
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sev-
requested changes
Apr 8, 2025
| @@ -197,6 +197,14 @@ bool Gui::processSceneEvents(WindowClick click, Common::Event &event) { | |||
|
|
|||
| return true; | |||
| } | |||
| if (event.type = Common::EVENT_MOUSEMOVE) { | |||
There was a problem hiding this comment.
Suggested change
| if (event.type = Common::EVENT_MOUSEMOVE) { | |
| if (event.type = Common::EVENT_MOUSEMOVE) { |
There was a problem hiding this comment.
E.g. it is best to split the blocks with an empty line, so there is a visual cue to the reader.
There was a problem hiding this comment.
Also, this should be a check for equality, not an assignment, i.e:
Suggested change
| if (event.type = Common::EVENT_MOUSEMOVE) { | |
| if (event.type == Common::EVENT_MOUSEMOVE) { |
engines/wage/gui.cpp
Outdated
| if (event.type = Common::EVENT_MOUSEMOVE) { | ||
| Designed *obj = _scene->lookUpEntity(event.mouse.x, event.mouse.y); | ||
|
|
||
| if (obj != nullptr) |
There was a problem hiding this comment.
Suggested change
| if (obj != nullptr) | |
| if (obj) |
This is a common practice to make it less comprehensive
engines/wage/wage.h
Outdated
| @@ -219,6 +223,11 @@ class WageEngine : public Engine { | |||
| void updateSoundTimerForScene(Scene *scene, bool firstTime); | |||
| void setMenu(Common::String soundName); | |||
| void appendText(const char *str); | |||
| void sayText(const Common::String str) { | |||
| sayText(str, Common::TextToSpeechManager::INTERRUPT_NO_REPEAT); | |||
There was a problem hiding this comment.
It is better to move this to C++ code and as such, eliminate #include "common/text-to-speech.h" which increases header dependency -> longer compilation time
engines/wage/wage.h
Outdated
| @@ -47,6 +47,7 @@ | |||
| #ifndef WAGE_WAGE_H | |||
| #define WAGE_WAGE_H | |||
|
|
|||
| #include "engines/advancedDetector.h" | |||
engines/wage/wage.cpp
Outdated
| @@ -118,6 +119,12 @@ Common::Error WageEngine::run() { | |||
| height = 768; | |||
| } | |||
|
|
|||
| Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager(); | |||
| if (ttsMan != nullptr) { | |||
There was a problem hiding this comment.
Suggested change
| if (ttsMan != nullptr) { | |
| if (ttsMan) { |
engines/wage/wage.cpp
Outdated
| @@ -264,14 +271,28 @@ void WageEngine::setMenu(Common::String menu) { | |||
|
|
|||
| void WageEngine::appendText(const char *str) { | |||
| Common::String s(str); | |||
|
|
|||
engines/wage/wage.cpp
Outdated
| _inputText.clear(); | ||
| } | ||
|
|
||
| void WageEngine::sayText(const Common::String str, Common::TextToSpeechManager::Action action) { | ||
| Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager(); | ||
| if (ttsMan != nullptr && ConfMan.getBool("tts_enabled")) |
There was a problem hiding this comment.
Suggested change
| if (ttsMan != nullptr && ConfMan.getBool("tts_enabled")) | |
| if (ttsMan && ConfMan.getBool("tts_enabled")) |
and below
engines/wage/wage.cpp
Outdated
| @@ -574,7 +596,7 @@ void WageEngine::processTurn(Common::String *textInput, Designed *clickInput) { | |||
| processTurnInternal(&input, clickInput); | |||
| Scene *playerScene = _world->_player->_currentScene; | |||
|
|
|||
| if (prevScene != playerScene && playerScene != _world->_storageScene) { | |||
| if (prevScene != playerScene && playerScene != _world->_storageScene) { | |||
engines/wage/wage.cpp
Outdated
| @@ -605,5 +627,9 @@ void WageEngine::processTurn(Common::String *textInput, Designed *clickInput) { | |||
| _inputText.clear(); | |||
| } | |||
|
|
|||
| Common::Language WageEngine::getLanguage() const{ | |||
|
|
|||
engines/wage/wage.cpp
Outdated
| @@ -605,5 +627,9 @@ void WageEngine::processTurn(Common::String *textInput, Designed *clickInput) { | |||
| _inputText.clear(); | |||
| } | |||
|
|
|||
| Common::Language WageEngine::getLanguage() const{ | |||
There was a problem hiding this comment.
Suggested change
| Common::Language WageEngine::getLanguage() const{ | |
| Common::Language WageEngine::getLanguage() const { |
Please follow our code formatting guidelines. Adn you may see this formatting everywhere
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds text-to-speech to the following: