bump library versions

EclipseMenu · Jan 23, 2025 · c8d983d · c8d983d
1 parent 3357798
commit c8d983d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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<int64_t>(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: {