incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 11/2000 set data table

Browse Source
This commit is contained in:
Martin Michelsen
2024-04-12 18:36:04 -07:00
parent 34751f99e9
commit 04982d919c
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Map.cc
+4 -3
View File
@@ -2184,9 +2184,7 @@ pair<uint32_t, uint32_t> SetDataTableDC112000::num_free_roam_variations_for_floo
string SetDataTableDC112000::map_filename_for_variation( string SetDataTableDC112000::map_filename_for_variation(
uint8_t floor, uint32_t var1, uint32_t var2, Episode, GameMode, FilenameType type) const { uint8_t floor, uint32_t var1, uint32_t var2, Episode, GameMode, FilenameType type) const {
if (floor >= this->NAMES.size()) { try {
return "";
}
string basename = this->NAMES.at(floor).at(var1).at(var2); string basename = this->NAMES.at(floor).at(var1).at(var2);
switch (type) { switch (type) {
case FilenameType::ENEMIES: case FilenameType::ENEMIES:
@@ -2202,6 +2200,9 @@ string SetDataTableDC112000::map_filename_for_variation(
throw logic_error("invalid map filename type"); throw logic_error("invalid map filename type");
} }
return basename; return basename;
} catch (const out_of_range&) {
return "";
}
} }
static const vector<AreaMapFileInfo> map_file_info_dc_nte = { static const vector<AreaMapFileInfo> map_file_info_dc_nte = {