summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/bgfx/statereader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/render/bgfx/statereader.cpp')
-rw-r--r--src/osd/modules/render/bgfx/statereader.cpp27
1 files changed, 23 insertions, 4 deletions
diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp
index 0f43ad71b09..277e6815185 100644
--- a/src/osd/modules/render/bgfx/statereader.cpp
+++ b/src/osd/modules/render/bgfx/statereader.cpp
@@ -9,7 +9,26 @@
#include "statereader.h"
-#include <math.h>
+#include "osdcore.h"
+
+#include <cmath>
+
+
+bool state_reader::V_READER_CHECK(bool condition, const util::format_argument_pack<char> &args)
+{
+ if (!condition)
+ 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;
+}
uint64_t state_reader::get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count)
{
@@ -101,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;
}
@@ -112,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
@@ -130,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());
}
}