diff options
Diffstat (limited to 'utils/gen_adldata/file_formats')
| -rw-r--r-- | utils/gen_adldata/file_formats/load_bnk.h | 3 | ||||
| -rw-r--r-- | utils/gen_adldata/file_formats/load_bnk2.h | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/utils/gen_adldata/file_formats/load_bnk.h b/utils/gen_adldata/file_formats/load_bnk.h index a41185a..38793a7 100644 --- a/utils/gen_adldata/file_formats/load_bnk.h +++ b/utils/gen_adldata/file_formats/load_bnk.h @@ -69,7 +69,8 @@ static bool LoadBNK(const char *fn, unsigned bank, const char *prefix, bool is_f if(name[2] == 'O' || name[2] == 'S') { - gmno = 128 + std::stoi(name.substr(3)); + std::string n = name.substr(3); + gmno = 128 + std::atoi(n.c_str()); } } diff --git a/utils/gen_adldata/file_formats/load_bnk2.h b/utils/gen_adldata/file_formats/load_bnk2.h index 1f3d4a1..a44b689 100644 --- a/utils/gen_adldata/file_formats/load_bnk2.h +++ b/utils/gen_adldata/file_formats/load_bnk2.h @@ -3,6 +3,11 @@ #include "../progs_cache.h" +inline int stdstoi(const std::string& str) +{ + return std::atoi(str.c_str()); +} + static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix, const std::string &melo_filter, const std::string &perc_filter) @@ -43,9 +48,9 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix, int gmno = 0; if(name.substr(0, melo_filter.size()) == melo_filter) - gmno = std::stoi(name.substr(melo_filter.size())); + gmno = stdstoi(name.substr(melo_filter.size())); else if(name.substr(0, perc_filter.size()) == perc_filter) - gmno = std::stoi(name.substr(perc_filter.size())) + 128; + gmno = stdstoi(name.substr(perc_filter.size())) + 128; else continue; |