fix error of DT_USERDATA

Former-commit-id: eddb5efac4ae593d7bd5299a84301e530f5874f9
Former-commit-id: 93d03030cff39de4507c5c1d2466fd67b0538773

Author: Nick2781

Frame/SDK/Base/AFCData.h

@@ -343,105 +343,57 @@ class AFBaseData : public AFIData
     //Get data
     virtual bool GetBool() const
     {
-        assert(mnType == DT_BOOLEAN);
-
-        if(mnType != DT_BOOLEAN)
-        {
-            return NULL_BOOLEAN;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_BOOLEAN, NULL_BOOLEAN);
         return mbValue;
     }
 
     virtual int GetInt() const
     {
-        assert(mnType == DT_INT);
-
-        if(mnType != DT_INT)
-        {
-            return NULL_INT;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_INT, NULL_INT);
         return mnValue;
     }
 
     virtual int64_t GetInt64() const
     {
-        assert(mnType == DT_INT64);
-
-        if(mnType != DT_INT64)
-        {
-            return NULL_INT64;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_INT64, NULL_INT64);
         return mn64Value;
     }
 
     virtual float GetFloat() const
     {
-        assert(mnType == DT_FLOAT);
-
-        if(mnType != DT_FLOAT)
-        {
-            return NULL_FLOAT;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_FLOAT, NULL_FLOAT);
         return mfValue;
     }
 
     virtual double GetDouble() const
     {
-        assert(mnType == DT_DOUBLE);
-
-        if(mnType != DT_DOUBLE)
-        {
-            return NULL_DOUBLE;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_DOUBLE, NULL_DOUBLE);
         return mdValue;
     }
 
     virtual const char* GetString() const
     {
-        assert(mnType == DT_STRING);
-
-        if(mnType != DT_STRING)
-        {
-            return NULL_STR.c_str();
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_STRING, NULL_STR.c_str());
         return mstrValue;
     }
 
     virtual AFGUID GetObject() const
     {
-        assert(mnType == DT_OBJECT);
-
-        if(mnType != DT_OBJECT)
-        {
-            return NULL_GUID;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_OBJECT, NULL_GUID);
         return AFGUID(mnHigh, mnLow);
     }
 
     virtual void* GetPointer() const
     {
-        assert(mnType == DT_POINTER);
-
-        if(mnType != DT_POINTER)
-        {
-            return NULL;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_POINTER, NULL);
         return mpVaule;
     }
 
     virtual const void* GetUserData(size_t& size) const
     {
-        assert(mnType == DT_POINTER);
+        assert(mnType == DT_USERDATA);
 
-        if(mnType != DT_POINTER)
+        if(mnType != DT_USERDATA)
         {
             size = 0;
             return NULL;
@@ -453,13 +405,7 @@ class AFBaseData : public AFIData
 
     virtual void* GetRawUserData() const
     {
-        assert(mnType == DT_POINTER);
-
-        if(mnType != DT_POINTER)
-        {
-            return NULL;
-        }
-
+        ARK_ASSERT_RET_VAL(mnType == DT_USERDATA, NULL);
         return mpUserData;
     }
 

Frame/SDK/Base/AFIData.h

@@ -25,18 +25,18 @@
 
 enum AF_DATA_TYPE
 {
-    DT_UNKNOWN, //unknown type
-    DT_BOOLEAN, //bool
-    DT_INT, //int32_t
-    DT_INT64, //int64_t
-    DT_FLOAT, //float
-    DT_DOUBLE, //double
-    DT_STRING, //string(char*)
-    DT_OBJECT, //object(ident + serial)
-    DT_POINTER, //pointer(void*)
-    DT_USERDATA, //user data(char*)
-    DT_TABLE, //table
-    DT_MAX, //max
+    DT_UNKNOWN,     //unknown type
+    DT_BOOLEAN,     //bool
+    DT_INT,         //int32_t
+    DT_INT64,       //int64_t
+    DT_FLOAT,       //float
+    DT_DOUBLE,      //double
+    DT_STRING,      //string(char*)
+    DT_OBJECT,      //object(ident + serial)
+    DT_POINTER,     //pointer(void*)
+    DT_USERDATA,    //user data(char*)
+    DT_TABLE,       //table
+    DT_MAX,         //max
 };
 
 const static bool NULL_BOOLEAN = false;

Frame/SDK/Core/AFCEntity.cpp

@@ -61,7 +61,7 @@ bool AFCEntity::Execute()
 
 bool AFCEntity::AddHeartBeat(const std::string& strHeartBeatName, const HEART_BEAT_FUNCTOR_PTR& cb, const int64_t nTime, const int nCount, const bool bForever)
 {
-    return GetHeartBeatManager()->AddHeartBeat(mSelf, strHeartBeatName, cb, nTime, nCount,  bForever);
+    return GetHeartBeatManager()->AddHeartBeat(mSelf, strHeartBeatName, cb, nTime, nCount, bForever);
 }
 
 bool AFCEntity::FindHeartBeat(const std::string& strHeartBeatName)

Frame/SDK/Core/AFCPropertyMgr.cpp

@@ -84,7 +84,7 @@ size_t AFCPropertyMgr::GetPropertyCount()
 
 AFProperty* AFCPropertyMgr::GetPropertyByIndex(size_t index)
 {
-    ARK_ASSERT_RET_VAL(index > 0 && index <= mxPropertys.size(), NULL);
+    ARK_ASSERT_RET_VAL(index >= 0 && index <= mxPropertys.size(), NULL);
 
     return mxPropertys[index];
 }