openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix talk mode key shortcuts when preset words may be hidden

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-15 12:58:09 -05:00
parent c325e01e92
commit 8940489b31
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/boe.actions.cpp
View File

@@ -2719,6 +2719,8 @@ static bool handle_debug_key(char key) {
return false;
}
extern std::vector<std::string> preset_words;
bool handle_keystroke(const sf::Event& event, cFramerateLimiter& fps_limiter){
bool are_done = false;
location pass_point; // TODO: This isn't needed
@@ -2828,11 +2830,26 @@ bool handle_keystroke(const sf::Event& event, cFramerateLimiter& fps_limiter){
chr2 = Key::G;
for(short i = 0; i < 9; i++)
if(chr2 == talk_chars[i] && (!talk_end_forced || i == 6 || i == 5)) {
// related to talk_area_rect, unsure why adding +9 is needed?
pass_point = talk_words[i].rect.topLeft();
pass_point.x += talk_area_rect.left+9;
pass_point.y += talk_area_rect.top+9;
are_done = handle_talk_event(pass_point, fps_limiter);
short j = 0;
bool word_shown = false;
for(std::string preset : preset_words){
if(preset == preset_words[i]) {
word_shown = talk_words[j].word == preset;
break;
}
else if(talk_words[j].word == preset){
j++;
}
}
if(word_shown){
pass_point = talk_words[j].rect.topLeft();
// related to talk_area_rect, unsure why adding +9 is needed?
pass_point.x += talk_area_rect.left+9;
pass_point.y += talk_area_rect.top+9;
are_done = handle_talk_event(pass_point, fps_limiter);
}else{
are_done = true;
}
}
return are_done;
}