Merge serializable interfaces.

Author: nitrocaster

res/gamedata/scripts/lua_help.script

@@ -1275,13 +1275,7 @@ C++ class property_evaluator_const : property_evaluator {
 
 };
 
-C++ class ipure_alife_load_object {
-};
-
-C++ class ipure_alife_save_object {
-};
-
-C++ class ipure_alife_load_save_object : ipure_alife_load_object,ipure_alife_save_object {
+C++ class iserializable {
 };
 
 C++ class Fbox {

src/Common/object_interfaces.h

@@ -22,36 +22,18 @@ class IPureDestroyableObject {
 
 IC IPureDestroyableObject::~IPureDestroyableObject() {}
 
-template <typename _storage_type>
-class IPureLoadableObject {
+class ISerializable
+{
 public:
-    virtual ~IPureLoadableObject() = 0;
-	virtual void					load(_storage_type	&storage)						= 0;
+    virtual ~ISerializable() = 0;
+    virtual void load(IReader &reader) = 0;
+    virtual void save(IWriter &writer) = 0;
 };
 
-template <typename _storage_type>
-IC IPureLoadableObject<_storage_type>::~IPureLoadableObject() {}
+IC ISerializable::~ISerializable() {}
 
-template <typename _storage_type>
-class IPureSavableObject {
-public:
-    virtual ~IPureSavableObject() = 0;
-	virtual void					save(_storage_type	&storage)						= 0;
-};
-
-template <typename _storage_type>
-IC IPureSavableObject<_storage_type>::~IPureSavableObject() {}
-
-template <typename _storage_type_load, typename _storage_type_save>
-class IPureSerializeObject : public IPureLoadableObject<_storage_type_load>, public IPureSavableObject<_storage_type_save> {
-public:
-    virtual ~IPureSerializeObject() = 0;
-};
-
-template <typename _storage_type_load, typename _storage_type_save>
-IC IPureSerializeObject<typename _storage_type_load, typename _storage_type_save>::~IPureSerializeObject() {}
-
-class IPureServerObject : public IPureSerializeObject<IReader,IWriter> {
+class IPureServerObject : public ISerializable
+{
 public:
     virtual ~IPureServerObject() = 0;
 	virtual void					STATE_Write	(NET_Packet &tNetPacket)				= 0;

src/Common/object_loader.h

@@ -36,8 +36,8 @@ struct CLoader {
 		IC	static void load_data(T &data, M &stream, const P &p)
 		{
 			CHelper1<T>::load_data<
-				object_type_traits::is_base_and_derived_or_same_from_template<
-					IPureLoadableObject,
+				object_type_traits::is_base_and_derived<
+					ISerializable,
 					T
 				>::value
 			>(data,stream,p);

src/Common/object_saver.h

@@ -36,8 +36,8 @@ struct CSaver {
 		IC	static void save_data(const T &data, M &stream, const P &p)
 		{
 			CHelper1<T>::save_data<
-				object_type_traits::is_base_and_derived_or_same_from_template<
-					IPureSavableObject,
+				object_type_traits::is_base_and_derived<
+					ISerializable,
 					T
 				>::value
 			>(data,stream,p);

src/utils/xrAI/server_entity_wrapper.h

@@ -12,7 +12,8 @@
 
 class CSE_Abstract;
 
-class CServerEntityWrapper : public IPureSerializeObject<IReader,IWriter> {
+class CServerEntityWrapper : public ISerializable
+{
 private:
 	CSE_Abstract			*m_object;
 

src/xrGame/GameTask.h

@@ -10,7 +10,7 @@ class CGameTask;
 
 typedef xr_vector<luabind::functor<bool> > task_state_functors;
 
-class SScriptTaskHelper: public IPureSerializeObject<IReader,IWriter>
+class SScriptTaskHelper: public ISerializable
 {
 public:
 	xr_vector<shared_str>					m_s_complete_lua_functions;

src/xrGame/GameTaskDefs.h

@@ -21,7 +21,7 @@ enum ETaskType{
 extern shared_str	g_active_task_id;
 class CGameTask;
 
-struct SGameTaskKey : public IPureSerializeObject<IReader,IWriter>,public IPureDestroyableObject 
+struct SGameTaskKey : public ISerializable, public IPureDestroyableObject
 {
 	shared_str		task_id;
 	CGameTask*		game_task;

src/xrGame/LevelFogOfWar.h

@@ -10,7 +10,7 @@
 class CUICustomMap;
 class CFogOfWarWrapper;
 
-class CLevelFogOfWar: public IPureSerializeObject<IReader,IWriter>, public CUIWindow
+class CLevelFogOfWar: public ISerializable, public CUIWindow
 {
 public:
 	ref_shader			hShader;

src/xrGame/actor_statistic_defs.h

@@ -4,7 +4,7 @@
 extern xr_token actor_stats_token[];
 
 
-struct SStatDetailBData: public IPureSerializeObject<IReader,IWriter>
+struct SStatDetailBData: public ISerializable
 {
 	shared_str				key;
 	s32						int_count;
@@ -18,7 +18,7 @@ struct SStatDetailBData: public IPureSerializeObject<IReader,IWriter>
 
 typedef xr_vector<SStatDetailBData>	vStatDetailData;
 
-struct SStatSectionData: public IPureSerializeObject<IReader,IWriter>
+struct SStatSectionData: public ISerializable
 {
 	shared_str				key;
 	vStatDetailData			data;

src/xrGame/alife_abstract_registry.h

@@ -12,7 +12,8 @@
 #include "Common/object_broker.h"
 
 template <typename _index_type, typename _data_type>
-class CALifeAbstractRegistry : public IPureSerializeObject<IReader,IWriter> {
+class CALifeAbstractRegistry : public ISerializable
+{
 public:
 	typedef xr_map<_index_type,_data_type>					OBJECT_REGISTRY;
 	typedef typename OBJECT_REGISTRY::iterator				iterator;