-
Notifications
You must be signed in to change notification settings - Fork 108
Add ambient and noise subtitle options #853
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
base: master
Are you sure you want to change the base?
Conversation
- Add flag `showSubtitlesAmbient` and `showSubtitlesNoise` for enabling/disabling ambient and noise subtitles. - Modify `DialogMenu::setupSettings` to set the new flags - Modify `DialogMenu::haveToShowSubtitles` to use the new flags to decide if subtiltes need to be shown. Changes are made similar to #PR810 Try#810
|
Hi, @Tavlin ! I've noticed you been working on this draft for quite a bit. Is it something you still looking into, or should I close this PR? |
|
Hey @Try , Sorry for the long pause. I tried to do this PR on my Mac, but I could not get the compilation running. I am now working on it on a linux machine. Once I get the main build working I will continue updating this PR with a working version. Cheers |
- Fix build crashes
- fix `case default:` -> `default:`
|
So I got the build running, however, even on the main master branch Gothic is immediately crashing for me. :/ Its also not working baseline from steam using Proton GE for me, so I dunno whats wrong there. |
Do you have a crash-log? |
No, it was basically just telling me the process got killed. I think the issue was that I did not reboot after installing the vulkan drivers. It seems to be working now. 👍 Cheers |
| Gothic::inst().onSettingsChanged.ubind(this,&DialogMenu::setupSettings); | ||
| } | ||
|
|
||
| void DialogMenu::setupSettings() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing alignment for both lines in this function
|
|
||
| bool DialogMenu::haveToShowSubtitles(bool isPl) const { | ||
| return showSubtitles && (showSubtitlesPlayer || !isPl); | ||
| if(!showSubtitles){ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code-style: { } have to be similar to other code. No need to wrap single-lines into backets
| if(isPl){ | ||
| return showSubtitlesPlayer; | ||
| } else if(other != nullptr) { | ||
| switch (other->processPolicy()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you check on how those option are function in vanilla? processPolicy is only for large distances, what is not a thing in original game.
| } | ||
| if(isPl){ | ||
| return showSubtitlesPlayer; | ||
| } else if(other != nullptr) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
else after return
showSubtitlesAmbientandshowSubtitlesNoisefor enabling/disabling ambient and noise subtitles.DialogMenu::setupSettingsto set the new flagsDialogMenu::haveToShowSubtitlesto use the new flags to decide if subtitles need to be shown.Since the distinction between ambient and noise was not 100% clear to me, I thought making it based on the ProcessPolicy seemed like a good estimate to me.
Related PR: #810
Fixes: #713 (hopefully)