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

6-str may request an out of range string, and it's fine

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-09 15:17:05 -05:00
parent 813edf0c64
commit dde840fafb
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/universe/universe.cpp
View File

@@ -1519,7 +1519,7 @@ cPlayer& cUniverse::current_pc() {
void(* cUniverse::print_result)(std::string) = nullptr;
bool cUniverse::get_str(std::string& str,eSpecCtxType cur_type,short which_str) {
bool cUniverse::get_str(std::string& str,eSpecCtxType cur_type,short which_str, bool out_of_range_error) {
std::vector<std::string>* string_list = &scenario.spec_strs;
if(cur_type == eSpecCtxType::OUTDOOR)
string_list = &out->spec_strs;
@@ -1527,7 +1527,8 @@ bool cUniverse::get_str(std::string& str,eSpecCtxType cur_type,short which_str)
string_list = &town->spec_strs;
if((which_str >= 0 && which_str >= string_list->size()) || (which_str < -1 && which_str != BUFFER_STR)){
showError("The scenario attempted to access a message out of range.");
if(out_of_range_error)
showError("The scenario attempted to access a message out of range.");
return false;
}
@@ -1548,7 +1549,10 @@ void cUniverse::get_strs(std::string& str1,std::string& str2,eSpecCtxType cur_ty
}
void cUniverse::get_strs(std::array<std::string,6>& strs,eSpecCtxType cur_type,short which_str1) {
for(int i = 0; i < 6; ++i)
if (!get_str(strs[i],cur_type, which_str1 + i)) return;
// If the first string is out of range we are in trouble:
if(!get_str(strs[0],cur_type, which_str1)) return;
// The other ones may be out of range if the starting text is near the end and there are less than 6
for(int i = 1; i < 6; ++i)
if(!get_str(strs[i],cur_type, which_str1 + i, false)) return;
}

2
src/universe/universe.hpp
View File

@@ -235,7 +235,7 @@ public:
static void(* print_result)(std::string);
// Assign a string with text from the current scenario, or the game's buffer by passing BUFFER_STR.
bool get_str(std::string& str, eSpecCtxType cur_type,short which_str);
bool get_str(std::string& str, eSpecCtxType cur_type,short which_str, bool out_of_range_error = true);
void get_strs(std::string& str1, std::string& str2,eSpecCtxType cur_type,short which_str1,short which_str2);
void get_strs(std::array<std::string,6>& strs,eSpecCtxType cur_type,short which_str1);
};