Rename CScriptBinderObject->ScriptObjectBinder, CScriptBinderObjectWrapper->ScriptObjectBinderWrapper.

nitrocaster · nitrocaster · commit a941aee740a0 · 2015-11-14T15:07:27.000+03:00
diff --git a/src/xrGame/script_binder.cpp b/src/xrGame/script_binder.cpp
@@ -160,7 +160,7 @@ void CScriptBinder::net_Destroy		()
 	xr_delete				(m_object);
 }
 
-void CScriptBinder::set_object		(CScriptBinderObject *object)
+void CScriptBinder::set_object		(ScriptObjectBinder *object)
 {
 	if (IsGameTypeSingle()) {
 		VERIFY2				(!m_object,"Cannot bind to the object twice!");
diff --git a/src/xrGame/script_binder.h b/src/xrGame/script_binder.h
@@ -9,12 +9,12 @@
 #pragma once
 
 class CSE_Abstract;
-class CScriptBinderObject;
+class ScriptObjectBinder;
 class NET_Packet;
 // XXX: Merge into CGameObject
 class CScriptBinder {
 protected:
-	CScriptBinderObject			*m_object;
+    ScriptObjectBinder			*m_object;
 
 public:
 								CScriptBinder	();
@@ -30,8 +30,8 @@ class CScriptBinder {
 	virtual void				load			(IReader &input_packet);
 	virtual BOOL				net_SaveRelevant();
 	virtual void				net_Relcase		(CObject *object);
-			void				set_object		(CScriptBinderObject *object);
-	IC		CScriptBinderObject	*object			();
+			void				set_object		(ScriptObjectBinder *object);
+	IC		ScriptObjectBinder	*object			();
 };
 
 #include "script_binder_inline.h"
diff --git a/src/xrGame/script_binder_inline.h b/src/xrGame/script_binder_inline.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-IC	CScriptBinderObject	*CScriptBinder::object	()
+IC	ScriptObjectBinder	*CScriptBinder::object	()
 {
 	return			(m_object);
 }
diff --git a/src/xrGame/script_binder_object.cpp b/src/xrGame/script_binder_object.cpp
@@ -10,61 +10,61 @@
 #include "script_binder_object.h"
 #include "script_game_object.h"
 
-CScriptBinderObject::CScriptBinderObject	(CScriptGameObject *object)
+ScriptObjectBinder::ScriptObjectBinder(CScriptGameObject *object)
 {
 	m_object		= object;
 }
 
-CScriptBinderObject::~CScriptBinderObject	()
+ScriptObjectBinder::~ScriptObjectBinder()
 {
 #ifdef DEBUG
 	if (m_object)
 		Msg			("Destroying binded object %s",m_object->Name());
 #endif
 }
 
-void CScriptBinderObject::reinit			()
+void ScriptObjectBinder::reinit			()
 {
 }
 
-void CScriptBinderObject::reload			(LPCSTR section)
+void ScriptObjectBinder::reload			(LPCSTR section)
 {
 }
 
-bool CScriptBinderObject::net_Spawn			(SpawnType DC)
+bool ScriptObjectBinder::net_Spawn			(SpawnType DC)
 {
 	return			(true);
 }
 
-void CScriptBinderObject::net_Destroy		()
+void ScriptObjectBinder::net_Destroy		()
 {
 }
 
-void CScriptBinderObject::net_Import		(NET_Packet *net_packet)
+void ScriptObjectBinder::net_Import		(NET_Packet *net_packet)
 {
 }
 
-void CScriptBinderObject::net_Export		(NET_Packet *net_packet)
+void ScriptObjectBinder::net_Export		(NET_Packet *net_packet)
 {
 }
 
-void CScriptBinderObject::shedule_Update	(u32 time_delta)
+void ScriptObjectBinder::shedule_Update	(u32 time_delta)
 {
 }
 
-void CScriptBinderObject::save				(NET_Packet *output_packet)
+void ScriptObjectBinder::save				(NET_Packet *output_packet)
 {
 }
 
-void CScriptBinderObject::load				(IReader	*input_packet)
+void ScriptObjectBinder::load				(IReader	*input_packet)
 {
 }
 
-bool CScriptBinderObject::net_SaveRelevant	()
+bool ScriptObjectBinder::net_SaveRelevant	()
 {
 	return		(false);
 }
 
-void CScriptBinderObject::net_Relcase		(CScriptGameObject *object)
+void ScriptObjectBinder::net_Relcase		(CScriptGameObject *object)
 {
 }
diff --git a/src/xrGame/script_binder_object.h b/src/xrGame/script_binder_object.h
@@ -12,14 +12,15 @@ class CSE_ALifeObject;
 class CScriptGameObject;
 class NET_Packet;
 
-class CScriptBinderObject {
+class ScriptObjectBinder
+{
 public:
 	typedef CSE_ALifeObject*	SpawnType;
 	CScriptGameObject			*m_object;
 
 public:
-						CScriptBinderObject	(CScriptGameObject *object);
-	virtual				~CScriptBinderObject();
+    ScriptObjectBinder(CScriptGameObject *object);
+	virtual				~ScriptObjectBinder();
 	virtual void		reinit				();
 	virtual void		reload				(LPCSTR section);
 	virtual bool		net_Spawn			(SpawnType DC);
diff --git a/src/xrGame/script_binder_object_script.cpp b/src/xrGame/script_binder_object_script.cpp
@@ -14,23 +14,23 @@
 
 using namespace luabind;
 
-SCRIPT_EXPORT(CScriptBinderObject, (),
+SCRIPT_EXPORT(ScriptObjectBinder, (),
 {
 	module(luaState)
 	[
-		class_<CScriptBinderObject,CScriptBinderObjectWrapper>("object_binder")
-			.def_readonly("object",				&CScriptBinderObject::m_object)
+		class_<ScriptObjectBinder,ScriptObjectBinderWrapper>("object_binder")
+			.def_readonly("object",				&ScriptObjectBinder::m_object)
 			.def(								constructor<CScriptGameObject*>())
-			.def("reinit",						&CScriptBinderObject::reinit,			&CScriptBinderObjectWrapper::reinit_static)
-			.def("reload",						&CScriptBinderObject::reload,			&CScriptBinderObjectWrapper::reload_static)
-			.def("net_spawn",					&CScriptBinderObject::net_Spawn,		&CScriptBinderObjectWrapper::net_Spawn_static)
-			.def("net_destroy",					&CScriptBinderObject::net_Destroy,		&CScriptBinderObjectWrapper::net_Destroy_static)
-			.def("net_import",					&CScriptBinderObject::net_Import,		&CScriptBinderObjectWrapper::net_Import_static)
-			.def("net_export",					&CScriptBinderObject::net_Export,		&CScriptBinderObjectWrapper::net_Export_static)
-			.def("update",						&CScriptBinderObject::shedule_Update,	&CScriptBinderObjectWrapper::shedule_Update_static)
-			.def("save",						&CScriptBinderObject::save,				&CScriptBinderObjectWrapper::save_static)
-			.def("load",						&CScriptBinderObject::load,				&CScriptBinderObjectWrapper::load_static)
-			.def("net_save_relevant",			&CScriptBinderObject::net_SaveRelevant,	&CScriptBinderObjectWrapper::net_SaveRelevant_static)
-			.def("net_Relcase",					&CScriptBinderObject::net_Relcase,		&CScriptBinderObjectWrapper::net_Relcase_static)
+			.def("reinit",						&ScriptObjectBinder::reinit,			&ScriptObjectBinderWrapper::reinit_static)
+			.def("reload",						&ScriptObjectBinder::reload,			&ScriptObjectBinderWrapper::reload_static)
+			.def("net_spawn",					&ScriptObjectBinder::net_Spawn,		&ScriptObjectBinderWrapper::net_Spawn_static)
+			.def("net_destroy",					&ScriptObjectBinder::net_Destroy,		&ScriptObjectBinderWrapper::net_Destroy_static)
+			.def("net_import",					&ScriptObjectBinder::net_Import,		&ScriptObjectBinderWrapper::net_Import_static)
+			.def("net_export",					&ScriptObjectBinder::net_Export,		&ScriptObjectBinderWrapper::net_Export_static)
+			.def("update",						&ScriptObjectBinder::shedule_Update,	&ScriptObjectBinderWrapper::shedule_Update_static)
+			.def("save",						&ScriptObjectBinder::save,				&ScriptObjectBinderWrapper::save_static)
+			.def("load",						&ScriptObjectBinder::load,				&ScriptObjectBinderWrapper::load_static)
+			.def("net_save_relevant",			&ScriptObjectBinder::net_SaveRelevant,	&ScriptObjectBinderWrapper::net_SaveRelevant_static)
+			.def("net_Relcase",					&ScriptObjectBinder::net_Relcase,		&ScriptObjectBinderWrapper::net_Relcase_static)
 	];
 });
diff --git a/src/xrGame/script_binder_object_wrapper.cpp b/src/xrGame/script_binder_object_wrapper.cpp
@@ -11,121 +11,121 @@
 #include "script_game_object.h"
 #include "xrServer_Objects_ALife.h"
 
-CScriptBinderObjectWrapper::CScriptBinderObjectWrapper	(CScriptGameObject *object) :
-	CScriptBinderObject	(object)
+ScriptObjectBinderWrapper::ScriptObjectBinderWrapper(CScriptGameObject *object) :
+    ScriptObjectBinder(object)
 {
 }
 
-CScriptBinderObjectWrapper::~CScriptBinderObjectWrapper ()
+ScriptObjectBinderWrapper::~ScriptObjectBinderWrapper()
 {
 }
 
-void CScriptBinderObjectWrapper::reinit					()
+void ScriptObjectBinderWrapper::reinit					()
 {
 	luabind::call_member<void>		(this,"reinit");
 }
 
-void CScriptBinderObjectWrapper::reinit_static			(CScriptBinderObject *script_binder_object)
+void ScriptObjectBinderWrapper::reinit_static			(ScriptObjectBinder *script_binder_object)
 {
-	script_binder_object->CScriptBinderObject::reinit	();
+	script_binder_object->ScriptObjectBinder::reinit	();
 }
 
-void CScriptBinderObjectWrapper::reload					(LPCSTR section)
+void ScriptObjectBinderWrapper::reload					(LPCSTR section)
 {
 	luabind::call_member<void>		(this,"reload",section);
 }
 
-void CScriptBinderObjectWrapper::reload_static			(CScriptBinderObject *script_binder_object, LPCSTR section)
+void ScriptObjectBinderWrapper::reload_static			(ScriptObjectBinder *script_binder_object, LPCSTR section)
 {
-	script_binder_object->CScriptBinderObject::reload	(section);
+	script_binder_object->ScriptObjectBinder::reload	(section);
 }
 
-bool CScriptBinderObjectWrapper::net_Spawn				(SpawnType DC)
+bool ScriptObjectBinderWrapper::net_Spawn				(SpawnType DC)
 {
 	return							(luabind::call_member<bool>(this,"net_spawn",DC));
 }
 
-bool CScriptBinderObjectWrapper::net_Spawn_static		(CScriptBinderObject *script_binder_object, SpawnType DC)
+bool ScriptObjectBinderWrapper::net_Spawn_static		(ScriptObjectBinder *script_binder_object, SpawnType DC)
 {
-	return							(script_binder_object->CScriptBinderObject::net_Spawn(DC));
+	return							(script_binder_object->ScriptObjectBinder::net_Spawn(DC));
 }
 
-void CScriptBinderObjectWrapper::net_Destroy			()
+void ScriptObjectBinderWrapper::net_Destroy			()
 {
 	luabind::call_member<void>		(this,"net_destroy");
 }
 
-void CScriptBinderObjectWrapper::net_Destroy_static		(CScriptBinderObject *script_binder_object)
+void ScriptObjectBinderWrapper::net_Destroy_static		(ScriptObjectBinder *script_binder_object)
 {
-	script_binder_object->CScriptBinderObject::net_Destroy();
+	script_binder_object->ScriptObjectBinder::net_Destroy();
 }
 
-void CScriptBinderObjectWrapper::net_Import				(NET_Packet *net_packet)
+void ScriptObjectBinderWrapper::net_Import				(NET_Packet *net_packet)
 {
 	luabind::call_member<void>		(this,"net_import",net_packet);
 }
 
-void CScriptBinderObjectWrapper::net_Import_static		(CScriptBinderObject *script_binder_object, NET_Packet *net_packet)
+void ScriptObjectBinderWrapper::net_Import_static		(ScriptObjectBinder *script_binder_object, NET_Packet *net_packet)
 {
-	script_binder_object->CScriptBinderObject::net_Import	(net_packet);
+	script_binder_object->ScriptObjectBinder::net_Import	(net_packet);
 }
 
-void CScriptBinderObjectWrapper::net_Export				(NET_Packet *net_packet)
+void ScriptObjectBinderWrapper::net_Export				(NET_Packet *net_packet)
 {
 	luabind::call_member<void>		(this,"net_export",net_packet);
 }
 
-void CScriptBinderObjectWrapper::net_Export_static		(CScriptBinderObject *script_binder_object, NET_Packet *net_packet)
+void ScriptObjectBinderWrapper::net_Export_static		(ScriptObjectBinder *script_binder_object, NET_Packet *net_packet)
 {
-	script_binder_object->CScriptBinderObject::net_Export	(net_packet);
+	script_binder_object->ScriptObjectBinder::net_Export	(net_packet);
 }
 
-void CScriptBinderObjectWrapper::shedule_Update			(u32 time_delta)
+void ScriptObjectBinderWrapper::shedule_Update			(u32 time_delta)
 {
 	luabind::call_member<void>		(this,"update",time_delta);
 }
 
-void CScriptBinderObjectWrapper::shedule_Update_static	(CScriptBinderObject *script_binder_object, u32 time_delta)
+void ScriptObjectBinderWrapper::shedule_Update_static	(ScriptObjectBinder *script_binder_object, u32 time_delta)
 {
-	script_binder_object->CScriptBinderObject::shedule_Update	(time_delta);
+	script_binder_object->ScriptObjectBinder::shedule_Update	(time_delta);
 }
 
-void CScriptBinderObjectWrapper::save					(NET_Packet *output_packet)
+void ScriptObjectBinderWrapper::save					(NET_Packet *output_packet)
 {
 	luabind::call_member<void>		(this,"save",output_packet);
 }
 
-void CScriptBinderObjectWrapper::save_static			(CScriptBinderObject *script_binder_object, NET_Packet *output_packet)
+void ScriptObjectBinderWrapper::save_static			(ScriptObjectBinder *script_binder_object, NET_Packet *output_packet)
 {
-	script_binder_object->CScriptBinderObject::save		(output_packet);
+	script_binder_object->ScriptObjectBinder::save		(output_packet);
 }
 
-void CScriptBinderObjectWrapper::load					(IReader *input_packet)
+void ScriptObjectBinderWrapper::load					(IReader *input_packet)
 {
 	luabind::call_member<void>		(this,"load",input_packet);
 }
 
-void CScriptBinderObjectWrapper::load_static			(CScriptBinderObject *script_binder_object, IReader *input_packet)
+void ScriptObjectBinderWrapper::load_static			(ScriptObjectBinder *script_binder_object, IReader *input_packet)
 {
-	script_binder_object->CScriptBinderObject::load		(input_packet);
+	script_binder_object->ScriptObjectBinder::load		(input_packet);
 }
 
-bool CScriptBinderObjectWrapper::net_SaveRelevant		()
+bool ScriptObjectBinderWrapper::net_SaveRelevant		()
 {
 	return							(luabind::call_member<bool>(this,"net_save_relevant"));
 }
 
-bool CScriptBinderObjectWrapper::net_SaveRelevant_static(CScriptBinderObject *script_binder_object)
+bool ScriptObjectBinderWrapper::net_SaveRelevant_static(ScriptObjectBinder *script_binder_object)
 {
-	return							(script_binder_object->CScriptBinderObject::net_SaveRelevant());
+	return							(script_binder_object->ScriptObjectBinder::net_SaveRelevant());
 }
 
-void CScriptBinderObjectWrapper::net_Relcase			(CScriptGameObject *object)
+void ScriptObjectBinderWrapper::net_Relcase			(CScriptGameObject *object)
 {
 	luabind::call_member<void>		(this,"net_Relcase",object);
 }
 
-void CScriptBinderObjectWrapper::net_Relcase_static		(CScriptBinderObject *script_binder_object, CScriptGameObject *object)
+void ScriptObjectBinderWrapper::net_Relcase_static		(ScriptObjectBinder *script_binder_object, CScriptGameObject *object)
 {
-	script_binder_object->CScriptBinderObject::net_Relcase	(object);
+	script_binder_object->ScriptObjectBinder::net_Relcase	(object);
 }
diff --git a/src/xrGame/script_binder_object_wrapper.h b/src/xrGame/script_binder_object_wrapper.h
@@ -13,30 +13,30 @@
 
 class CScriptGameObject;
 
-class CScriptBinderObjectWrapper : public CScriptBinderObject, public luabind::wrap_base {
+class ScriptObjectBinderWrapper : public ScriptObjectBinder, public luabind::wrap_base {
 public:
-						CScriptBinderObjectWrapper	(CScriptGameObject *object);
-	virtual				~CScriptBinderObjectWrapper	();
+    ScriptObjectBinderWrapper(CScriptGameObject *object);
+	virtual				~ScriptObjectBinderWrapper();
 	virtual void		reinit						();
-	static  void		reinit_static				(CScriptBinderObject *script_binder_object);
+	static  void		reinit_static				(ScriptObjectBinder *script_binder_object);
 	virtual void		reload						(LPCSTR section);
-	static  void		reload_static				(CScriptBinderObject *script_binder_object, LPCSTR section);
+	static  void		reload_static				(ScriptObjectBinder *script_binder_object, LPCSTR section);
 	virtual bool		net_Spawn					(SpawnType DC);
-	static  bool		net_Spawn_static			(CScriptBinderObject *script_binder_object, SpawnType DC);
+	static  bool		net_Spawn_static			(ScriptObjectBinder *script_binder_object, SpawnType DC);
 	virtual void		net_Destroy					();
-	static  void		net_Destroy_static			(CScriptBinderObject *script_binder_object);
+	static  void		net_Destroy_static			(ScriptObjectBinder *script_binder_object);
 	virtual void		net_Import					(NET_Packet *net_packet);
-	static  void		net_Import_static			(CScriptBinderObject *script_binder_object, NET_Packet *net_packet);
+	static  void		net_Import_static			(ScriptObjectBinder *script_binder_object, NET_Packet *net_packet);
 	virtual void		net_Export					(NET_Packet *net_packet);
-	static  void		net_Export_static			(CScriptBinderObject *script_binder_object, NET_Packet *net_packet);
+	static  void		net_Export_static			(ScriptObjectBinder *script_binder_object, NET_Packet *net_packet);
 	virtual void		shedule_Update				(u32 time_delta);
-	static  void		shedule_Update_static		(CScriptBinderObject *script_binder_object, u32 time_delta);
+	static  void		shedule_Update_static		(ScriptObjectBinder *script_binder_object, u32 time_delta);
 	virtual void		save						(NET_Packet *output_packet);
-	static	void		save_static					(CScriptBinderObject *script_binder_object, NET_Packet *output_packet);
+	static	void		save_static					(ScriptObjectBinder *script_binder_object, NET_Packet *output_packet);
 	virtual void		load						(IReader *input_packet);
-	static	void		load_static					(CScriptBinderObject *script_binder_object, IReader *input_packet);
+	static	void		load_static					(ScriptObjectBinder *script_binder_object, IReader *input_packet);
 	virtual bool		net_SaveRelevant			();
-	static  bool		net_SaveRelevant_static		(CScriptBinderObject *script_binder_object);
+	static  bool		net_SaveRelevant_static		(ScriptObjectBinder *script_binder_object);
 	virtual void		net_Relcase					(CScriptGameObject *object);
-	static	void		net_Relcase_static			(CScriptBinderObject *script_binder_object, CScriptGameObject *object);
+	static	void		net_Relcase_static			(ScriptObjectBinder *script_binder_object, CScriptGameObject *object);
 };
diff --git a/src/xrGame/script_game_object.cpp b/src/xrGame/script_game_object.cpp
diff --git a/src/xrGame/script_game_object.h b/src/xrGame/script_game_object.h

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ void CScriptBinder::net_Destroy ()`
`160`	`160`	`xr_delete (m_object);`
`161`	`161`	`}`
`162`	`162`
`163`		`-void CScriptBinder::set_object (CScriptBinderObject *object)`
	`163`	`+void CScriptBinder::set_object (ScriptObjectBinder *object)`
`164`	`164`	`{`
`165`	`165`	`if (IsGameTypeSingle()) {`
`166`	`166`	`VERIFY2 (!m_object,"Cannot bind to the object twice!");`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`#pragma once`
`10`	`10`
`11`		`-IC CScriptBinderObject *CScriptBinder::object ()`
	`11`	`+IC ScriptObjectBinder *CScriptBinder::object ()`
`12`	`12`	`{`
`13`	`13`	`return (m_object);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,61 +10,61 @@`
`10`	`10`	`#include "script_binder_object.h"`
`11`	`11`	`#include "script_game_object.h"`
`12`	`12`
`13`		`-CScriptBinderObject::CScriptBinderObject (CScriptGameObject *object)`
	`13`	`+ScriptObjectBinder::ScriptObjectBinder(CScriptGameObject *object)`
`14`	`14`	`{`
`15`	`15`	`m_object = object;`
`16`	`16`	`}`
`17`	`17`
`18`		`-CScriptBinderObject::~CScriptBinderObject ()`
	`18`	`+ScriptObjectBinder::~ScriptObjectBinder()`
`19`	`19`	`{`
`20`	`20`	`#ifdef DEBUG`
`21`	`21`	`if (m_object)`
`22`	`22`	`Msg ("Destroying binded object %s",m_object->Name());`
`23`	`23`	`#endif`
`24`	`24`	`}`
`25`	`25`
`26`		`-void CScriptBinderObject::reinit ()`
	`26`	`+void ScriptObjectBinder::reinit ()`
`27`	`27`	`{`
`28`	`28`	`}`
`29`	`29`
`30`		`-void CScriptBinderObject::reload (LPCSTR section)`
	`30`	`+void ScriptObjectBinder::reload (LPCSTR section)`
`31`	`31`	`{`
`32`	`32`	`}`
`33`	`33`
`34`		`-bool CScriptBinderObject::net_Spawn (SpawnType DC)`
	`34`	`+bool ScriptObjectBinder::net_Spawn (SpawnType DC)`
`35`	`35`	`{`
`36`	`36`	`return (true);`
`37`	`37`	`}`
`38`	`38`
`39`		`-void CScriptBinderObject::net_Destroy ()`
	`39`	`+void ScriptObjectBinder::net_Destroy ()`
`40`	`40`	`{`
`41`	`41`	`}`
`42`	`42`
`43`		`-void CScriptBinderObject::net_Import (NET_Packet *net_packet)`
	`43`	`+void ScriptObjectBinder::net_Import (NET_Packet *net_packet)`
`44`	`44`	`{`
`45`	`45`	`}`
`46`	`46`
`47`		`-void CScriptBinderObject::net_Export (NET_Packet *net_packet)`
	`47`	`+void ScriptObjectBinder::net_Export (NET_Packet *net_packet)`
`48`	`48`	`{`
`49`	`49`	`}`
`50`	`50`
`51`		`-void CScriptBinderObject::shedule_Update (u32 time_delta)`
	`51`	`+void ScriptObjectBinder::shedule_Update (u32 time_delta)`
`52`	`52`	`{`
`53`	`53`	`}`
`54`	`54`
`55`		`-void CScriptBinderObject::save (NET_Packet *output_packet)`
	`55`	`+void ScriptObjectBinder::save (NET_Packet *output_packet)`
`56`	`56`	`{`
`57`	`57`	`}`
`58`	`58`
`59`		`-void CScriptBinderObject::load (IReader *input_packet)`
	`59`	`+void ScriptObjectBinder::load (IReader *input_packet)`
`60`	`60`	`{`
`61`	`61`	`}`
`62`	`62`
`63`		`-bool CScriptBinderObject::net_SaveRelevant ()`
	`63`	`+bool ScriptObjectBinder::net_SaveRelevant ()`
`64`	`64`	`{`
`65`	`65`	`return (false);`
`66`	`66`	`}`
`67`	`67`
`68`		`-void CScriptBinderObject::net_Relcase (CScriptGameObject *object)`
	`68`	`+void ScriptObjectBinder::net_Relcase (CScriptGameObject *object)`
`69`	`69`	`{`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,121 +11,121 @@`
`11`	`11`	`#include "script_game_object.h"`
`12`	`12`	`#include "xrServer_Objects_ALife.h"`
`13`	`13`
`14`		`-CScriptBinderObjectWrapper::CScriptBinderObjectWrapper (CScriptGameObject *object) :`
`15`		`- CScriptBinderObject (object)`
	`14`	`+ScriptObjectBinderWrapper::ScriptObjectBinderWrapper(CScriptGameObject *object) :`
	`15`	`+ ScriptObjectBinder(object)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`		`-CScriptBinderObjectWrapper::~CScriptBinderObjectWrapper ()`
	`19`	`+ScriptObjectBinderWrapper::~ScriptObjectBinderWrapper()`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
`23`		`-void CScriptBinderObjectWrapper::reinit ()`
	`23`	`+void ScriptObjectBinderWrapper::reinit ()`
`24`	`24`	`{`
`25`	`25`	`luabind::call_member<void> (this,"reinit");`
`26`	`26`	`}`
`27`	`27`
`28`		`-void CScriptBinderObjectWrapper::reinit_static (CScriptBinderObject *script_binder_object)`
	`28`	`+void ScriptObjectBinderWrapper::reinit_static (ScriptObjectBinder *script_binder_object)`
`29`	`29`	`{`
`30`		`- script_binder_object->CScriptBinderObject::reinit ();`
	`30`	`+ script_binder_object->ScriptObjectBinder::reinit ();`
`31`	`31`	`}`
`32`	`32`
`33`		`-void CScriptBinderObjectWrapper::reload (LPCSTR section)`
	`33`	`+void ScriptObjectBinderWrapper::reload (LPCSTR section)`
`34`	`34`	`{`
`35`	`35`	`luabind::call_member<void> (this,"reload",section);`
`36`	`36`	`}`
`37`	`37`
`38`		`-void CScriptBinderObjectWrapper::reload_static (CScriptBinderObject *script_binder_object, LPCSTR section)`
	`38`	`+void ScriptObjectBinderWrapper::reload_static (ScriptObjectBinder *script_binder_object, LPCSTR section)`
`39`	`39`	`{`
`40`		`- script_binder_object->CScriptBinderObject::reload (section);`
	`40`	`+ script_binder_object->ScriptObjectBinder::reload (section);`
`41`	`41`	`}`
`42`	`42`
`43`		`-bool CScriptBinderObjectWrapper::net_Spawn (SpawnType DC)`
	`43`	`+bool ScriptObjectBinderWrapper::net_Spawn (SpawnType DC)`
`44`	`44`	`{`
`45`	`45`	`return (luabind::call_member<bool>(this,"net_spawn",DC));`
`46`	`46`	`}`
`47`	`47`
`48`		`-bool CScriptBinderObjectWrapper::net_Spawn_static (CScriptBinderObject *script_binder_object, SpawnType DC)`
	`48`	`+bool ScriptObjectBinderWrapper::net_Spawn_static (ScriptObjectBinder *script_binder_object, SpawnType DC)`
`49`	`49`	`{`
`50`		`- return (script_binder_object->CScriptBinderObject::net_Spawn(DC));`
	`50`	`+ return (script_binder_object->ScriptObjectBinder::net_Spawn(DC));`
`51`	`51`	`}`
`52`	`52`
`53`		`-void CScriptBinderObjectWrapper::net_Destroy ()`
	`53`	`+void ScriptObjectBinderWrapper::net_Destroy ()`
`54`	`54`	`{`
`55`	`55`	`luabind::call_member<void> (this,"net_destroy");`
`56`	`56`	`}`
`57`	`57`
`58`		`-void CScriptBinderObjectWrapper::net_Destroy_static (CScriptBinderObject *script_binder_object)`
	`58`	`+void ScriptObjectBinderWrapper::net_Destroy_static (ScriptObjectBinder *script_binder_object)`
`59`	`59`	`{`
`60`		`- script_binder_object->CScriptBinderObject::net_Destroy();`
	`60`	`+ script_binder_object->ScriptObjectBinder::net_Destroy();`
`61`	`61`	`}`
`62`	`62`
`63`		`-void CScriptBinderObjectWrapper::net_Import (NET_Packet *net_packet)`
	`63`	`+void ScriptObjectBinderWrapper::net_Import (NET_Packet *net_packet)`
`64`	`64`	`{`
`65`	`65`	`luabind::call_member<void> (this,"net_import",net_packet);`
`66`	`66`	`}`
`67`	`67`
`68`		`-void CScriptBinderObjectWrapper::net_Import_static (CScriptBinderObject script_binder_object, NET_Packet net_packet)`
	`68`	`+void ScriptObjectBinderWrapper::net_Import_static (ScriptObjectBinder script_binder_object, NET_Packet net_packet)`
`69`	`69`	`{`
`70`		`- script_binder_object->CScriptBinderObject::net_Import (net_packet);`
	`70`	`+ script_binder_object->ScriptObjectBinder::net_Import (net_packet);`
`71`	`71`	`}`
`72`	`72`
`73`		`-void CScriptBinderObjectWrapper::net_Export (NET_Packet *net_packet)`
	`73`	`+void ScriptObjectBinderWrapper::net_Export (NET_Packet *net_packet)`
`74`	`74`	`{`
`75`	`75`	`luabind::call_member<void> (this,"net_export",net_packet);`
`76`	`76`	`}`
`77`	`77`
`78`		`-void CScriptBinderObjectWrapper::net_Export_static (CScriptBinderObject script_binder_object, NET_Packet net_packet)`
	`78`	`+void ScriptObjectBinderWrapper::net_Export_static (ScriptObjectBinder script_binder_object, NET_Packet net_packet)`
`79`	`79`	`{`
`80`		`- script_binder_object->CScriptBinderObject::net_Export (net_packet);`
	`80`	`+ script_binder_object->ScriptObjectBinder::net_Export (net_packet);`
`81`	`81`	`}`
`82`	`82`
`83`		`-void CScriptBinderObjectWrapper::shedule_Update (u32 time_delta)`
	`83`	`+void ScriptObjectBinderWrapper::shedule_Update (u32 time_delta)`
`84`	`84`	`{`
`85`	`85`	`luabind::call_member<void> (this,"update",time_delta);`
`86`	`86`	`}`
`87`	`87`
`88`		`-void CScriptBinderObjectWrapper::shedule_Update_static (CScriptBinderObject *script_binder_object, u32 time_delta)`
	`88`	`+void ScriptObjectBinderWrapper::shedule_Update_static (ScriptObjectBinder *script_binder_object, u32 time_delta)`
`89`	`89`	`{`
`90`		`- script_binder_object->CScriptBinderObject::shedule_Update (time_delta);`
	`90`	`+ script_binder_object->ScriptObjectBinder::shedule_Update (time_delta);`
`91`	`91`	`}`
`92`	`92`
`93`		`-void CScriptBinderObjectWrapper::save (NET_Packet *output_packet)`
	`93`	`+void ScriptObjectBinderWrapper::save (NET_Packet *output_packet)`
`94`	`94`	`{`
`95`	`95`	`luabind::call_member<void> (this,"save",output_packet);`
`96`	`96`	`}`
`97`	`97`
`98`		`-void CScriptBinderObjectWrapper::save_static (CScriptBinderObject script_binder_object, NET_Packet output_packet)`
	`98`	`+void ScriptObjectBinderWrapper::save_static (ScriptObjectBinder script_binder_object, NET_Packet output_packet)`
`99`	`99`	`{`
`100`		`- script_binder_object->CScriptBinderObject::save (output_packet);`
	`100`	`+ script_binder_object->ScriptObjectBinder::save (output_packet);`
`101`	`101`	`}`
`102`	`102`
`103`		`-void CScriptBinderObjectWrapper::load (IReader *input_packet)`
	`103`	`+void ScriptObjectBinderWrapper::load (IReader *input_packet)`
`104`	`104`	`{`
`105`	`105`	`luabind::call_member<void> (this,"load",input_packet);`
`106`	`106`	`}`
`107`	`107`
`108`		`-void CScriptBinderObjectWrapper::load_static (CScriptBinderObject script_binder_object, IReader input_packet)`
	`108`	`+void ScriptObjectBinderWrapper::load_static (ScriptObjectBinder script_binder_object, IReader input_packet)`
`109`	`109`	`{`
`110`		`- script_binder_object->CScriptBinderObject::load (input_packet);`
	`110`	`+ script_binder_object->ScriptObjectBinder::load (input_packet);`
`111`	`111`	`}`
`112`	`112`
`113`		`-bool CScriptBinderObjectWrapper::net_SaveRelevant ()`
	`113`	`+bool ScriptObjectBinderWrapper::net_SaveRelevant ()`
`114`	`114`	`{`
`115`	`115`	`return (luabind::call_member<bool>(this,"net_save_relevant"));`
`116`	`116`	`}`
`117`	`117`
`118`		`-bool CScriptBinderObjectWrapper::net_SaveRelevant_static(CScriptBinderObject *script_binder_object)`
	`118`	`+bool ScriptObjectBinderWrapper::net_SaveRelevant_static(ScriptObjectBinder *script_binder_object)`
`119`	`119`	`{`
`120`		`- return (script_binder_object->CScriptBinderObject::net_SaveRelevant());`
	`120`	`+ return (script_binder_object->ScriptObjectBinder::net_SaveRelevant());`
`121`	`121`	`}`
`122`	`122`
`123`		`-void CScriptBinderObjectWrapper::net_Relcase (CScriptGameObject *object)`
	`123`	`+void ScriptObjectBinderWrapper::net_Relcase (CScriptGameObject *object)`
`124`	`124`	`{`
`125`	`125`	`luabind::call_member<void> (this,"net_Relcase",object);`
`126`	`126`	`}`
`127`	`127`
`128`		`-void CScriptBinderObjectWrapper::net_Relcase_static (CScriptBinderObject script_binder_object, CScriptGameObject object)`
	`128`	`+void ScriptObjectBinderWrapper::net_Relcase_static (ScriptObjectBinder script_binder_object, CScriptGameObject object)`
`129`	`129`	`{`
`130`		`- script_binder_object->CScriptBinderObject::net_Relcase (object);`
	`130`	`+ script_binder_object->ScriptObjectBinder::net_Relcase (object);`
`131`	`131`	`}`