olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

entdata.cc: avoid exception-throwing std::stod/stoi 

mostly because it's annoying when debugging with "break on first
exception thrown"
This commit is contained in:
Eric Wasylishen 2023-06-11 21:33:29 -06:00
parent 35fa5bd129
commit 0dfb4e52ab
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/entdata.cc
View File

@ -20,6 +20,7 @@
#include <common/entdata.h>
#include <sstream>
#include <cstdlib> // atoi()
#include <common/bsputils.hh>
#include <common/parser.hh>
@ -50,32 +51,24 @@ const std::string &entdict_t::get(const std::string_view &key) const
vec_t entdict_t::get_float(const std::string_view &key) const
{
auto s = get(key);
const std::string &s = get(key);
if (s.empty()) {
return 0;
}
try {
return std::stod(s);
} catch (std::exception &) {
return 0.0;
}
return atof(s.data());
}
int32_t entdict_t::get_int(const std::string_view &key) const
{
auto s = get(key);
const std::string &s = get(key);
if (s.empty()) {
return 0;
}
try {
return std::stoi(s);
} catch (std::exception &) {
return 0;
}
return atoi(s.data());
}
int32_t entdict_t::get_vector(const std::string_view &key, qvec3d &vec) const