Merge pull request #22 from defold/use-new-property-options-api

Use new propertyoptions API

Author: Jhonnyg

defold-simpledata/src/comp_simple_data.cpp

@@ -139,6 +139,9 @@ namespace dmSimpleData
         SimpleDataComponent* component = GetComponentFromIndex(world, *params.m_UserData);
         dmGameSystemDDF::SimpleDataDesc* ddf = component->m_Resource->m_DDF;
 
+        int32_t value_index = 0;
+        bool has_key = dmGameObject::GetPropertyOptionsIndex(params.m_Options, 0, &value_index) != dmGameObject::PROPERTY_RESULT_OK;
+
     #define HANDLE_PROP(NAME, VALUE) \
         if (params.m_PropertyId == NAME) \
         { \
@@ -149,14 +152,14 @@ namespace dmSimpleData
     #define HANDLE_ARRAY_PROP(NAME, VALUE) \
         if (params.m_PropertyId == NAME) \
         { \
-            if (params.m_Options.m_HasKey) \
+            if (has_key) \
                 return dmGameObject::PROPERTY_RESULT_INVALID_INDEX; \
-            if (params.m_Options.m_Index < 0 || params.m_Options.m_Index >= (VALUE).m_Count) \
+            if (value_index < 0 || value_index >= (VALUE).m_Count) \
             { \
-                dmLogError("Index %u is out of bounds. Array %s only has %u elements.", params.m_Options.m_Index, dmHashReverseSafe64(params.m_PropertyId), (VALUE).m_Count); \
+                dmLogError("Index %u is out of bounds. Array %s only has %u elements.", value_index, dmHashReverseSafe64(params.m_PropertyId), (VALUE).m_Count); \
                 return dmGameObject::PROPERTY_RESULT_INVALID_INDEX; \
             } \
-            float value = (VALUE).m_Data[params.m_Options.m_Index]; \
+            float value = (VALUE).m_Data[value_index]; \
             out_value.m_Variant = dmGameObject::PropertyVar(value); \
             return dmGameObject::PROPERTY_RESULT_OK; \
         }

game.project

@@ -16,6 +16,7 @@ title = extension-simpledata
 
 [library]
 include_dirs = defold-simpledata
+defold_min_version = 1.12.2
 
 [input]
 game_binding = /builtins/input/all.input_bindingc