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

DRY advanced town help. Fix #611

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-02-15 17:41:06 -06:00
committed by Celtic Minstrel
parent 0f6aa4f139
commit 8cff2428a9
7 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dialogxml/dialogs/strdlog.cpp
View File

@@ -127,11 +127,17 @@ void showFatalError(std::string str1, std::string str2, cDialog* parent) {
static void give_help(short help1,short help2,cDialog* parent,bool help_forced) {
std::string str1,str2;
if(!help_forced && (!get_bool_pref("ShowInstantHelp", true) || get_iarray_pref_contains("ReceivedHelp", help1)))
if(help_text_rsrc.empty()){
throw std::string {"Tried to call give_help() without setting help_text_rsrc!"};
}
if(!help_forced && help_text_rsrc == "help" &&
(!get_bool_pref("ShowInstantHelp", true) || get_iarray_pref_contains("ReceivedHelp", help1))){
return;
}
append_iarray_pref("ReceivedHelp", help1);
append_iarray_pref("ReceivedHelp", help2);
str1 = get_str("help",help1);
str1 = get_str(help_text_rsrc,help1);
if(help2 > 0)
str2 = get_str("help",help2);
cStrDlog display_strings(str1,str2,"Instant Help",24,PIC_DLOG, parent);

2
src/dialogxml/dialogs/strdlog.hpp
View File

@@ -87,6 +87,8 @@ void showWarning(std::string str1, std::string str2, cDialog* parent = nullptr);
/// @param parent Optionally, a parent dialog.
void showWarning(std::string str1, cDialog* parent = nullptr);
extern std::string help_text_rsrc;
// Show a help window with the given messages from rsrc/strings/help.txt:
void give_help(short help1, short help2, bool help_forced = false);
void give_help(short help1, short help2, cDialog& parent, bool help_forced = false);