From c8d983dfed3f62361aa0fb143236a899b9548e8b Mon Sep 17 00:00:00 2001 From: prevter Date: Thu, 23 Jan 2025 16:30:53 +0200 Subject: [PATCH] bump library versions --- CMakeLists.txt | 4 ++-- src/value.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bda4c99..df15816 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(rift) include(cmake/CPM.cmake) CPMAddPackage("gh:fmtlib/fmt#11.0.2") -CPMAddPackage("gh:geode-sdk/result#64792cc") +CPMAddPackage("gh:geode-sdk/result#4106d12") set(CMAKE_CXX_STANDARD 20) @@ -14,7 +14,7 @@ target_link_libraries(rift fmt GeodeResult) # Allows an easier conversion of rift::Value to JSON and vice versa if (RIFT_INCLUDE_MATJSON) - CPMAddPackage("gh:geode-sdk/json#82b1552") + CPMAddPackage("gh:geode-sdk/json#0ea6009") target_compile_definitions(rift PUBLIC RIFT_INCLUDE_MATJSON) target_link_libraries(rift mat-json) endif() diff --git a/src/value.cpp b/src/value.cpp index d79e9dc..762e238 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -21,13 +21,12 @@ namespace rift { m_data = value.asBool().unwrap(); } break; case matjson::Type::Number: { - double num = value.asDouble().unwrap(); - if (num == static_cast(num)) { + if (value.isExactlyDouble()) { + m_type = Type::Float; + m_data = value.asDouble().unwrap(); + } else { m_type = Type::Integer; m_data = value.asInt().unwrap(); - } else { - m_type = Type::Float; - m_data = num; } } break; case matjson::Type::Array: {