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

When shops are empty, don't go into shop mode. Fix #216

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-01-21 17:13:41 -06:00
committed by Celtic Minstrel
parent 5dcdd18b3c
commit c27789eaa0
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,11 +103,11 @@ std::vector<int> shop_array;
cShop active_shop; cShop active_shop;
short active_shop_num; short active_shop_num;
void start_shop_mode(short which,short cost_adj,std::string store_name) { bool start_shop_mode(short which,short cost_adj,std::string store_name, bool cancel_when_empty) {
rectangle area_rect; rectangle area_rect;
if(which < 0 || which >= univ.scenario.shops.size()) { if(which < 0 || which >= univ.scenario.shops.size()) {
showError("The scenario tried to place you in a nonexistent shop!"); showError("The scenario tried to place you in a nonexistent shop!");
return; return false;
} }
// This would be a place to hide the text box, if I add it. // This would be a place to hide the text box, if I add it.
@@ -117,14 +117,6 @@ void start_shop_mode(short which,short cost_adj,std::string store_name) {
active_shop.setCostAdjust(cost_adj); active_shop.setCostAdjust(cost_adj);
active_shop.setName(store_name); active_shop.setName(store_name);
area_rect = talk_area_rect;
talk_gworld.create(area_rect.width(), area_rect.height());
store_pre_shop_mode = overall_mode;
overall_mode = MODE_SHOPPING;
stat_screen_mode = MODE_SHOP;
shop_sbar->setPosition(0);
// Check if the shop's stock has been reduced yet // Check if the shop's stock has been reduced yet
if(univ.party.store_limited_stock.find(active_shop_num) != univ.party.store_limited_stock.end()) { if(univ.party.store_limited_stock.find(active_shop_num) != univ.party.store_limited_stock.end()) {
for(auto p : univ.party.store_limited_stock[active_shop_num]) { for(auto p : univ.party.store_limited_stock[active_shop_num]) {
@@ -143,12 +135,25 @@ void start_shop_mode(short which,short cost_adj,std::string store_name) {
} }
set_up_shop_array(); set_up_shop_array();
if(shop_array.empty() && cancel_when_empty){
return false;
}
area_rect = talk_area_rect;
talk_gworld.create(area_rect.width(), area_rect.height());
store_pre_shop_mode = overall_mode;
overall_mode = MODE_SHOPPING;
stat_screen_mode = MODE_SHOP;
shop_sbar->setPosition(0);
put_background(); put_background();
draw_shop_graphics(0,area_rect); draw_shop_graphics(0,area_rect);
put_item_screen(stat_window); put_item_screen(stat_window);
give_help(26,27); give_help(26,27);
return true;
} }
static void update_last_talk(int new_node) { static void update_last_talk(int new_node) {
@@ -881,7 +886,9 @@ void handle_talk_node(int which_talk_entry) {
return; return;
case eTalkNode::SHOP: case eTalkNode::SHOP:
start_shop_mode(b,a,save_talk_str1); if(!start_shop_mode(b,a,save_talk_str1,true))
save_talk_str1 = "There is nothing to buy from " + save_talk_str1 + ".";
else
can_save_talk = false; can_save_talk = false;
return; return;
case eTalkNode::JOB_BANK: case eTalkNode::JOB_BANK:

2
src/game/boe.dlgutil.hpp
View File

@@ -5,7 +5,7 @@
#include "dialogxml/dialogs/dialog.hpp" #include "dialogxml/dialogs/dialog.hpp"
#include "scenario/shop.hpp" #include "scenario/shop.hpp"
void start_shop_mode(short which,short cost_adj,std::string store_name); bool start_shop_mode(short which,short cost_adj,std::string store_name, bool cancel_when_empty = false);
void end_shop_mode(); void end_shop_mode();
void handle_shop_event(location p, cFramerateLimiter& fps_limiter); void handle_shop_event(location p, cFramerateLimiter& fps_limiter);
void handle_sale(int i); void handle_sale(int i);