diff options
Diffstat (limited to 'src/osd/modules/render/bgfx/statereader.cpp')
-rw-r--r-- | src/osd/modules/render/bgfx/statereader.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp index acaeddd35b5..277e6815185 100644 --- a/src/osd/modules/render/bgfx/statereader.cpp +++ b/src/osd/modules/render/bgfx/statereader.cpp @@ -13,17 +13,20 @@ #include <cmath> -bool state_reader::READER_CHECK(bool condition, const char* format, ...) + +bool state_reader::V_READER_CHECK(bool condition, const util::format_argument_pack<char> &args) { if (!condition) - { - va_list ap; - va_start(ap, format); - char buf[2048]; - vsnprintf(buf, 2048, format, ap); - osd_printf_error("Error: %s\n", buf); - va_end(ap); - } + osd_printf_error("Error: %s\n", util::string_format(args)); + + return condition; +} + +bool state_reader::V_READER_WARN(bool condition, const util::format_argument_pack<char> &args) +{ + if (!condition) + osd_printf_warning("Warning: %s\n", util::string_format(args)); + return condition; } @@ -117,7 +120,7 @@ float state_reader::get_float(const Value& value, const std::string name, const { if (value.HasMember(name.c_str())) { - return (float)value[name.c_str()].GetDouble(); + return float(value[name.c_str()].GetDouble()); } return default_value; } @@ -128,7 +131,7 @@ void state_reader::get_float(const Value& value, const std::string name, float* { if (count == 1) { - *out = (float) value[name.c_str()].GetDouble(); + *out = float(value[name.c_str()].GetDouble()); return; } else @@ -146,7 +149,7 @@ void state_reader::get_vec_values(const Value& value_array, float* data, const u { for (unsigned int i = 0; i < count && i < value_array.Size(); i++) { - data[i] = (float) value_array[i].GetDouble(); + data[i] = float(value_array[i].GetDouble()); } } |