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

add methods get_shop to check access bounds,

Browse Source 
+ Scenario Editor: display all talk messages
This commit is contained in:
ALONSO Laurent
2021-10-21 16:20:00 +02:00
committed by Celtic Minstrel
parent f997771dbe
commit 0c269c420c
6 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scenedit/scen.actions.cpp
View File

@@ -659,9 +659,9 @@ static bool handle_rb_action(location the_point, bool option_hit) {
if(option_hit) {
if(j == scenario.shops.size() - 1)
scenario.shops.pop_back();
else scenario.shops[j] = cShop("Unused Shop");
else scenario.get_shop(j) = cShop("Unused Shop");
} else {
if(!edit_shop(j) && j == size_before && scenario.shops[j].getName() == "New Shop")
if(!edit_shop(j) && j == size_before && scenario.get_shop(j).getName() == "New Shop")
scenario.shops.pop_back();
}
start_shops_editing(size_before == scenario.shops.size());
@@ -2516,7 +2516,7 @@ void start_shops_editing(bool just_redo_text) {
std::string title;
if(i == scenario.shops.size())
title = "Create New Shop";
else title = scenario.shops[i].getName();
else title = scenario.get_shop(i).getName();
title = std::to_string(i) + " - " + title;
set_rb(i, RB_SHOP, i, title);
}
@@ -2657,17 +2657,17 @@ void start_dialogue_editing(short restoring) {
right_sbar->show();
pal_sbar->hide();
size_t n_nodes = town->talking.talk_nodes.size();
if(restoring == 0) {
right_sbar->setPosition(0);
reset_rb();
right_sbar->setMaximum(70 - NRSONPAGE);
right_sbar->setMaximum(10+n_nodes+1 - NRSONPAGE);
}
for(short i = 0; i < 10; i++) {
std::ostringstream strb;
strb << "Personality " << (i + cur_town * 10) << " - " << town->talking.people[i].title;
set_rb(i,RB_PERSONALITY, i, strb.str());
}
size_t n_nodes = town->talking.talk_nodes.size();
for(short i = 0; i < n_nodes; i++) {
for(short j = 0; j < 4; j++) {
s[j] = town->talking.talk_nodes[i].link1[j];

6
src/scenedit/scen.core.cpp
View File

@@ -2215,7 +2215,7 @@ static bool save_shop_from_dlog(cDialog& me, cShop& shop, size_t which_shop, boo
shop.setFace(dynamic_cast<cPict&>(me["face"]).getPicNum());
// Items are filled in as they're added by the dialog, so that's all we need to do here
scenario.shops[which_shop] = shop;
scenario.get_shop(which_shop) = shop;
if(!close) me.untoast();
return true;
}
@@ -2234,7 +2234,7 @@ static bool change_shop_dlog_page(cDialog& me, std::string dir, cShop& shop, siz
which_shop = 0;
}
shop = scenario.shops[which_shop];
shop = scenario.get_shop(which_shop);
put_shop_in_dlog(me, shop, which_shop);
return true;
}
@@ -2465,7 +2465,7 @@ bool edit_shop(size_t which_shop, cDialog* parent) {
using namespace std::placeholders;
if(which_shop == scenario.shops.size())
scenario.shops.emplace_back("New Shop");
cShop shop = scenario.shops[which_shop];
cShop shop = scenario.get_shop(which_shop);
cDialog shop_dlg("edit-shop", parent);
shop_dlg["cancel"].attachClickHandler(std::bind(&cDialog::toast, _1, false));