up

kebiao · kebiao · commit b73bb271eb15 · 2018-05-11T16:36:36.000+08:00
diff --git a/kbe/src/server/baseapp/entity.cpp b/kbe/src/server/baseapp/entity.cpp
@@ -355,18 +355,18 @@ void Entity::addCellDataToStream(COMPONENT_TYPE sendTo, uint32 flags, MemoryStre
 			}
 			else
 			{
-				if (!propertyDescription->getDataType()->isSameType(pyVal))
+				if (!propertyDescription->isSameType(pyVal))
 				{
 					ERROR_MSG(fmt::format("{}::addCellDataToStream: {}({}) not is ({})!\n", this->scriptName(),
 						propertyDescription->getName(), (pyVal ? pyVal->ob_type->tp_name : "unknown"), propertyDescription->getDataType()->getName()));
 
-					PyObject* pydefval = propertyDescription->getDataType()->parseDefaultStr("");
-					propertyDescription->getDataType()->addToStream(s, pydefval);
+					PyObject* pydefval = propertyDescription->parseDefaultStr("");
+					propertyDescription->addToStream(s, pydefval);
 					Py_DECREF(pydefval);
 				}
 				else
 				{
-					propertyDescription->getDataType()->addToStream(s, pyVal);
+					propertyDescription->addToStream(s, pyVal);
 				}
 			}
 
diff --git a/kbe/src/server/cellapp/entity.cpp b/kbe/src/server/cellapp/entity.cpp
@@ -1096,18 +1096,18 @@ void Entity::addCellDataToStream(COMPONENT_TYPE sendTo, uint32 flags, MemoryStre
 				(*mstream) << propertyDescription->getUType();
 			}
 
-			if (!propertyDescription->getDataType()->isSameType(pyVal))
+			if (!propertyDescription->isSameType(pyVal))
 			{
 				ERROR_MSG(fmt::format("{}::addCellDataToStream: {}({}) not is ({})!\n", this->scriptName(),
 					propertyDescription->getName(), (pyVal ? pyVal->ob_type->tp_name : "unknown"), propertyDescription->getDataType()->getName()));
 
-				PyObject* pydefval = propertyDescription->getDataType()->parseDefaultStr("");
-				propertyDescription->getDataType()->addToStream(mstream, pydefval);
+				PyObject* pydefval = propertyDescription->parseDefaultStr("");
+				propertyDescription->addToStream(mstream, pydefval);
 				Py_DECREF(pydefval);
 			}
 			else
 			{
-				propertyDescription->getDataType()->addToStream(mstream, pyVal);
+				propertyDescription->addToStream(mstream, pyVal);
 			}
 
 			if (PyErr_Occurred())

Original file line number	Diff line number	Diff line change
`@@ -355,18 +355,18 @@ void Entity::addCellDataToStream(COMPONENT_TYPE sendTo, uint32 flags, MemoryStre`
`355`	`355`	`}`
`356`	`356`	`else`
`357`	`357`	`{`
`358`		`- if (!propertyDescription->getDataType()->isSameType(pyVal))`
	`358`	`+ if (!propertyDescription->isSameType(pyVal))`
`359`	`359`	`{`
`360`	`360`	`ERROR_MSG(fmt::format("{}::addCellDataToStream: {}({}) not is ({})!\n", this->scriptName(),`
`361`	`361`	`propertyDescription->getName(), (pyVal ? pyVal->ob_type->tp_name : "unknown"), propertyDescription->getDataType()->getName()));`
`362`	`362`
`363`		`- PyObject* pydefval = propertyDescription->getDataType()->parseDefaultStr("");`
`364`		`- propertyDescription->getDataType()->addToStream(s, pydefval);`
	`363`	`+ PyObject* pydefval = propertyDescription->parseDefaultStr("");`
	`364`	`+ propertyDescription->addToStream(s, pydefval);`
`365`	`365`	`Py_DECREF(pydefval);`
`366`	`366`	`}`
`367`	`367`	`else`
`368`	`368`	`{`
`369`		`- propertyDescription->getDataType()->addToStream(s, pyVal);`
	`369`	`+ propertyDescription->addToStream(s, pyVal);`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
Original file line number	Diff line number	Diff line change
`@@ -1096,18 +1096,18 @@ void Entity::addCellDataToStream(COMPONENT_TYPE sendTo, uint32 flags, MemoryStre`
`1096`	`1096`	`(*mstream) << propertyDescription->getUType();`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`		`- if (!propertyDescription->getDataType()->isSameType(pyVal))`
	`1099`	`+ if (!propertyDescription->isSameType(pyVal))`
`1100`	`1100`	`{`
`1101`	`1101`	`ERROR_MSG(fmt::format("{}::addCellDataToStream: {}({}) not is ({})!\n", this->scriptName(),`
`1102`	`1102`	`propertyDescription->getName(), (pyVal ? pyVal->ob_type->tp_name : "unknown"), propertyDescription->getDataType()->getName()));`
`1103`	`1103`
`1104`		`- PyObject* pydefval = propertyDescription->getDataType()->parseDefaultStr("");`
`1105`		`- propertyDescription->getDataType()->addToStream(mstream, pydefval);`
	`1104`	`+ PyObject* pydefval = propertyDescription->parseDefaultStr("");`
	`1105`	`+ propertyDescription->addToStream(mstream, pydefval);`
`1106`	`1106`	`Py_DECREF(pydefval);`
`1107`	`1107`	`}`
`1108`	`1108`	`else`
`1109`	`1109`	`{`
`1110`		`- propertyDescription->getDataType()->addToStream(mstream, pyVal);`
	`1110`	`+ propertyDescription->addToStream(mstream, pyVal);`
`1111`	`1111`	`}`
`1112`	`1112`
`1113`	`1113`	`if (PyErr_Occurred())`