up

Author: kebiao

kbe/src/lib/entitydef/entity_component.cpp

@@ -150,6 +150,16 @@ PyObject* EntityComponent::owner(bool attempt)
 	return owner_;
 }
 
+//-------------------------------------------------------------------------------------
+void EntityComponent::updateOwner(ENTITY_ID id, PyObject* pOwner)
+{
+	ownerID_ = id;
+	owner_ = pOwner;
+
+	if (owner_)
+		Py_INCREF(owner_);
+}
+
 //-------------------------------------------------------------------------------------
 PyObject* EntityComponent::pyGetOwner()
 {
@@ -1344,7 +1354,7 @@ void EntityComponent::updateFromDict(PyObject* pyDict)
 }
 
 //-------------------------------------------------------------------------------------
-void EntityComponent::convertDictDataToEntityComponent(ENTITY_ID entityID, ScriptDefModule* pEntityScriptDescrs, PyObject* cellData)
+void EntityComponent::convertDictDataToEntityComponent(ENTITY_ID entityID, PyObject* pEntity, ScriptDefModule* pEntityScriptDescrs, PyObject* cellData)
 {
 	ScriptDefModule::COMPONENTDESCRIPTION_MAP& componentDescrs = pEntityScriptDescrs->getComponentDescrs();
 
@@ -1380,7 +1390,10 @@ void EntityComponent::convertDictDataToEntityComponent(ENTITY_ID entityID, Scrip
 
 		PropertyDescription* pPropertyDescription = pEntityScriptDescrs->findCellPropertyDescription(comps_iter->first.c_str());
 		KBE_ASSERT(pPropertyDescription);
+
 		pEntityComponent->pPropertyDescription(pPropertyDescription);
+		pEntityComponent->updateOwner(entityID, pEntity);
+
 		PyDict_SetItemString(cellData, comps_iter->first.c_str(), pEntityComponent);
 		Py_DECREF(pEntityComponent);
 	}

kbe/src/lib/entitydef/entity_component.h

@@ -80,6 +80,7 @@ class EntityComponent : public script::ScriptObject
 	DECLARE_PY_GET_MOTHOD(pyGetOwnerID);
 
 	PyObject* owner(bool attempt = false);
+	void updateOwner(ENTITY_ID id, PyObject* pOwner);
 
 	DECLARE_PY_GET_MOTHOD(pyIsDestroyed);
 
@@ -185,7 +186,7 @@ class EntityComponent : public script::ScriptObject
 	void createFromDict(PyObject* pyDict);
 	void updateFromDict(PyObject* pyDict);
 
-	static void convertDictDataToEntityComponent(ENTITY_ID entityID, ScriptDefModule* pEntityScriptDescrs, PyObject* cellData);
+	static void convertDictDataToEntityComponent(ENTITY_ID entityID, PyObject* pEntity, ScriptDefModule* pEntityScriptDescrs, PyObject* cellData);
 	static std::vector<EntityComponent*> getComponents(const std::string& name, PyObject* pEntity, ScriptDefModule* pEntityScriptDescrs);
 
 	/**

kbe/src/lib/entitydef/entity_macro.h

@@ -417,7 +417,7 @@ public:																										\
 		if(cellDataDict == NULL)																			\
 		{																									\
 			PyErr_Clear();																					\
-			EntityComponent::convertDictDataToEntityComponent(id(), pScriptModule_, dictData);				\
+			EntityComponent::convertDictDataToEntityComponent(id(), this, pScriptModule_, dictData);		\
 		}																									\
 																											\
 		while(PyDict_Next(dictData, &pos, &key, &value))													\