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

pass parent to preview dialog

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-04-30 13:38:33 -05:00
parent 0911d35696
commit 20373acf68
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dialogxml/dialogs/3choice.cpp
View File

@@ -174,14 +174,14 @@ std::string cThreeChoice::show(){
return "**ERROR**"; // shouldn't be reached
}
short custom_choice_dialog(std::array<std::string, 6>& strs,short pic_num,ePicType pic_type,std::array<short, 3>& buttons,bool anim_pict,short anim_loops, int anim_fps) {
short custom_choice_dialog(std::array<std::string, 6>& strs,short pic_num,ePicType pic_type,std::array<short, 3>& buttons,bool anim_pict,short anim_loops, int anim_fps, cDialog* parent) {
set_cursor(sword_curs);
std::vector<std::string> vec(strs.begin(), strs.end());
// Strip off trailing empty strings
while(!vec.empty() && vec.back().empty())
vec.pop_back();
cThreeChoice customDialog(vec, buttons, pic_num, pic_type);
cThreeChoice customDialog(vec, buttons, pic_num, pic_type, parent);
if(anim_pict)
setup_dialog_pict_anim(*(customDialog.operator->()), "pict", anim_loops, anim_fps);
@@ -195,7 +195,7 @@ short custom_choice_dialog(std::array<std::string, 6>& strs,short pic_num,ePicTy
return -1;
}
short once_dialog(cUniverse& univ, cSpecial& spec, eSpecCtxType cur_type) {
short once_dialog(cUniverse& univ, cSpecial& spec, eSpecCtxType cur_type, cDialog* parent) {
std::array<std::string, 6> strs;
std::array<short, 3> buttons = {-1,-1,-1};
@@ -220,5 +220,5 @@ short once_dialog(cUniverse& univ, cSpecial& spec, eSpecCtxType cur_type) {
showError("Dialog box ended up with no buttons.");
return -1;
}
return custom_choice_dialog(strs, spec.pic, ePicType(spec.pictype), buttons, true, spec.ex1c, spec.ex2c);
return custom_choice_dialog(strs, spec.pic, ePicType(spec.pictype), buttons, true, spec.ex1c, spec.ex2c, parent);
}

4
src/dialogxml/dialogs/3choice.hpp
View File

@@ -75,7 +75,7 @@ public:
std::string show();
};
short custom_choice_dialog(std::array<std::string, 6>& strs,short pic_num,ePicType pic_type,std::array<short, 3>& buttons, bool anim_pict = false, short anim_loops = -1, int anim_fps = -1);
short once_dialog(cUniverse& univ, cSpecial& spec, eSpecCtxType cur_type);
short custom_choice_dialog(std::array<std::string, 6>& strs,short pic_num,ePicType pic_type,std::array<short, 3>& buttons, bool anim_pict = false, short anim_loops = -1, int anim_fps = -1, cDialog* parent = nullptr);
short once_dialog(cUniverse& univ, cSpecial& spec, eSpecCtxType cur_type, cDialog* parent = nullptr);
#endif