Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LURE: Enable the optional use of TTS to read descriptions as a narrator in "Lure of the Temptress" #1977

Merged
merged 4 commits into from Dec 20, 2019
Merged

Conversation

neuromancer
Copy link
Contributor

LURE: Enable the optional use of TTS to read descriptions as a narrator in Lure of the Temptress

Added an option to use TTS to read descriptions in Lure of the Temptress.
Following the discussion in #1953, this option will only appear if the user
compiles with TTS support. It will read scene and object descriptions but
omit any character dialog.

@@ -73,7 +91,11 @@ static const LureGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
#ifdef USE_TTS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting is off in a lot of places - mixed spaces and tabs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be fixed. Thanks!

@dreammaster
Copy link
Member

The commit text also isn't conforming to naming requirements.. it should have a "LURE: " in front of them. At this point, it would be a good idea for you to squash your branch into a single commit, and have it have the LURE: prefix

@neuromancer
Copy link
Contributor Author

I'm ok with squashing this PR as a single commit (same for #1953 )

@@ -467,13 +472,31 @@ Surface *Surface::newDialog(uint16 width, uint8 numLines, const char **lines, bo

Surface *s = new Surface(width, size.y);
s->createDialog();
#ifdef USE_TTS
char *text = (char*) malloc(1024*sizeof(char));
memset(text, 0, 1024);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using a char * here, you could use Common::String. The string manipulation code later on will be much easier and straightforward, and you won't need to have a hard limit of characters

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@neuromancer
Copy link
Contributor Author

It seems that one of the Travis CI tests from the latest commit failed fetching some packages. Can someone rerun it?

@bluegr
Copy link
Member

bluegr commented Dec 20, 2019

Thanks for your work, and for fixing the remaining issues. I have requested a fresh Travis build and it worked fine.

Merging

@bluegr bluegr merged commit d0571e6 into scummvm:master Dec 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants