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

Adjust the hilited string rendering to be less reliant on mysterious magic numbers

Browse Source 
It still adds a mysterious offset to all text, but the returned rectns are now perfectly aligned to redraw the hilited string.
This commit is contained in:
Celtic Minstrel
2020-12-19 17:32:46 -05:00
parent 0585e9cbc6
commit 259e4ac125
5 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/boe.dlgutil.cpp
View File

@@ -682,7 +682,10 @@ void handle_talk_event(location p) {
int which_talk_entry = TALK_DUNNO;
for(word_rect_t& word : talk_words) {
if(word.node == -1) continue;
if(!p.in(word.rect)) continue;
rectangle wordRect(word.rect);
wordRect.offset(talk_area_rect.topLeft());
wordRect.offset(-1, -10); // TODO: This corrects for the byzantine offsets that win_draw_string applies for some reason...
if(!p.in(wordRect)) continue;
click_talk_rect(word);
which_talk_entry = word.node;
break;

5
src/game/boe.newgraph.cpp
View File

@@ -828,7 +828,7 @@ void click_talk_rect(word_rect_t word) {
style.pointSize = 18;
style.lineHeight = 18;
style.colour = word.on;
win_draw_string(mainPtr, wordRect, word.word, eTextMode::LEFT_TOP, style);
win_draw_string(mainPtr, wordRect, word.word, eTextMode::WRAP, style);
place_talk_face();
mainPtr.display();
play_sound(37, time_in_ticks(5));
@@ -972,7 +972,6 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col
}
}
dest_rect = word_place_rect;
style.colour = Colours::NAVY;
// First determine the offsets of clickable words.
// The added spaces ensure that end-of-word boundaries are found
@@ -994,7 +993,7 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col
}
}
std::vector<rectangle> word_rects = draw_string_hilite(talk_gworld, dest_rect, str, style, hilites, color ? Colours::DARK_BLUE : Colours::DARK_RED);
std::vector<rectangle> word_rects = draw_string_hilite(talk_gworld, word_place_rect, str, style, hilites, color ? Colours::DARK_BLUE : Colours::DARK_RED);
if(!talk_end_forced) {
// Now build the list of word rects