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

Fix already_started arg

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-03-14 15:00:51 -05:00
committed by Celtic Minstrel
parent 16703ae7a2
commit 48ab580993
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ short store_cur_pc = -1;
// For healing shops, other PCs might be able to buy something if
// the active PC can't
static bool start_shop_mode_other_pc(bool allow_empty = false) {
static bool start_shop_mode_other_pc(bool allow_empty = false, bool already_started = false) {
// The shop might change the current PC multiple times, but we want to restore
// it to the original active PC when shopping ends, so only store if we're
// not yet storing
@@ -122,7 +122,7 @@ static bool start_shop_mode_other_pc(bool allow_empty = false) {
for(int i = 0; i < 6; ++i){
if(univ.party[i].main_status != eMainStatus::ABSENT){
univ.cur_pc = i;
if(start_shop_mode(active_shop_num,active_shop.getCostAdjust(),save_talk_str1,true,true)){
if(start_shop_mode(active_shop_num,active_shop.getCostAdjust(),save_talk_str1,true,already_started)){
other_pc_can_buy = true;
break;
}
@@ -130,7 +130,7 @@ static bool start_shop_mode_other_pc(bool allow_empty = false) {
}
if(!other_pc_can_buy && allow_empty){
univ.cur_pc = pc_buying;
start_shop_mode(active_shop_num,active_shop.getCostAdjust(),save_talk_str1,false,true);
start_shop_mode(active_shop_num,active_shop.getCostAdjust(),save_talk_str1,false,already_started);
}
return other_pc_can_buy;
}
@@ -472,7 +472,7 @@ void handle_sale(int i) {
// When buying from a healer, we want to select the next PC who needs healing
if(shop_array.empty()){
start_shop_mode_other_pc(true);
start_shop_mode_other_pc(true, true);
}
}