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

add methods get_special_string to check access bounds of spec_strs...

Browse Source
This commit is contained in:
ALONSO Laurent
2021-10-22 13:39:28 +02:00
committed by Celtic Minstrel
parent 0c269c420c
commit a51ba34650
16 changed files with 143 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,11 +446,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
scenario.spec_strs.pop_back();
else if(j == size_before)
scenario.spec_strs.resize(size_before + 8, "*");
else scenario.spec_strs[j] = "*";
else scenario.get_special_string(j) = "*";
} else {
if(j == size_before)
scenario.spec_strs.emplace_back("*");
if(!edit_text_str(j,STRS_SCEN) && j == size_before && scenario.spec_strs[j] == "*")
if(!edit_text_str(j,STRS_SCEN) && j == size_before && scenario.get_special_string(j) == "*")
scenario.spec_strs.pop_back();
}
start_string_editing(STRS_SCEN,size_before == scenario.spec_strs.size());
@@ -465,11 +465,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
current_terrain->spec_strs.pop_back();
else if(j == size_before)
current_terrain->spec_strs.resize(size_before + 8, "*");
else current_terrain->spec_strs[j] = "*";
else current_terrain->get_special_string(j) = "*";
} else {
if(j == size_before)
current_terrain->spec_strs.emplace_back("*");
if(!edit_text_str(j,STRS_OUT) && j == size_before && current_terrain->spec_strs[j] == "*")
if(!edit_text_str(j,STRS_OUT) && j == size_before && current_terrain->get_special_string(j) == "*")
current_terrain->spec_strs.pop_back();
}
start_string_editing(STRS_OUT,size_before == current_terrain->spec_strs.size());
@@ -484,11 +484,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
town->spec_strs.pop_back();
else if(j == size_before)
town->spec_strs.resize(size_before + 8, "*");
else town->spec_strs[j] = "*";
else town->get_special_string(j) = "*";
} else {
if(j == size_before)
town->spec_strs.emplace_back("*");
if(!edit_text_str(j,STRS_TOWN) && j == size_before && town->spec_strs[j] == "*")
if(!edit_text_str(j,STRS_TOWN) && j == size_before && town->get_special_string(j) == "*")
town->spec_strs.pop_back();
}
start_string_editing(STRS_TOWN,size_before == town->spec_strs.size());
@@ -2547,15 +2547,15 @@ void start_string_editing(eStrMode mode,short just_redo_text) {
std::ostringstream str;
switch(mode) {
case 0:
str << i << " - " << scenario.spec_strs[i].substr(0,30);
str << i << " - " << scenario.get_special_string(i).substr(0,30);
set_rb(i,RB_SCEN_STR, i,str.str());
break;
case 1:
str << i << " - " << current_terrain->spec_strs[i].substr(0,30);
str << i << " - " << current_terrain->get_special_string(i).substr(0,30);
set_rb(i,RB_OUT_STR, i,str.str());
break;
case 2:
str << i << " - " << town->spec_strs[i].substr(0,30);
str << i << " - " << town->get_special_string(i).substr(0,30);
set_rb(i,RB_TOWN_STR, i,str.str());
break;
case 3:

2
src/scenedit/scen.fileio.cpp
View File

@@ -227,7 +227,7 @@ void writeScenarioToXml(ticpp::Printer&& data, cScenario& scenario) {
data.CloseElement("quest");
}
for(size_t i = 0; i < scenario.shops.size(); i++) {
cShop& shop = scenario.shops[i];
cShop const &shop = scenario.shops[i];
data.OpenElement("shop");
data.PushElement("name", shop.getName());
data.PushElement("type", shop.getType());

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

@@ -68,9 +68,9 @@ static void ensure_str(eStrMode str_mode, size_t which) {
static std::string& fetch_str(eStrMode str_mode, size_t which) {
ensure_str(str_mode, which);
switch(str_mode) {
case 0: return scenario.spec_strs[which];
case 1: return current_terrain->spec_strs[which];
case 2: return town->spec_strs[which];
case 0: return scenario.get_special_string(which);
case 1: return current_terrain->get_special_string(which);
case 2: return town->get_special_string(which);
case 3: return scenario.journal_strs[which];
case 4: return current_terrain->sign_locs[which].text;
case 5: return town->sign_locs[which].text;