Fix invalid smart casts.

OpenXRay · Nov 14, 2015 · 7651718 · 7651718
1 parent d33f8d2
commit 7651718
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/xrGame/GameObject.cpp b/src/xrGame/GameObject.cpp
@@ -47,7 +47,7 @@ extern MagicBox3 MagicMinBox (int iQuantity, const Fvector* akPoint);
 
 ENGINE_API bool g_dedicated_server;
 
-CGameObject::CGameObject		()
+CGameObject::CGameObject		() : scriptBinder(this)
 {
     // CUsableScriptObject init
     m_bNonscriptUsable = true;

diff --git a/src/xrGame/script_binder.cpp b/src/xrGame/script_binder.cpp
@@ -19,8 +19,9 @@
 // comment next string when commiting
 //#define DBG_DISABLE_SCRIPTS
 
-CScriptBinder::CScriptBinder		()
+CScriptBinder::CScriptBinder		(CGameObject *owner)
 {
+    this->owner = owner;
 	init					();
 }
 
@@ -87,10 +88,8 @@ void CScriptBinder::reload			(LPCSTR section)
 		return;
 	}
 
-	CGameObject				*game_object = smart_cast<CGameObject*>(this);
-
 	try {
-		lua_function		(game_object ? game_object->lua_game_object() : 0);
+		lua_function		(owner->lua_game_object());
 	}
 	catch(...) {
 		clear				();
@@ -148,7 +147,7 @@ void CScriptBinder::net_Destroy		()
 {
 	if (m_object) {
 #ifdef _DEBUG
-		Msg						("* Core object %s is UNbinded from the script object",smart_cast<CGameObject*>(this) ? *smart_cast<CGameObject*>(this)->cName() : "");
+		Msg						("* Core object %s is UNbinded from the script object", owner->cName());
 #endif // _DEBUG
 		try {
 			m_object->net_Destroy	();
@@ -165,7 +164,7 @@ void CScriptBinder::set_object		(CScriptBinderObject *object)
 	if (IsGameTypeSingle()) {
 		VERIFY2				(!m_object,"Cannot bind to the object twice!");
 #ifdef _DEBUG
-		Msg					("* Core object %s is binded with the script object",smart_cast<CGameObject*>(this) ? *smart_cast<CGameObject*>(this)->cName() : "");
+		Msg					("* Core object %s is binded with the script object", owner->cName());
 #endif // _DEBUG
 		m_object			= object;
 	} else {

diff --git a/src/xrGame/script_binder.h b/src/xrGame/script_binder.h
@@ -11,13 +11,14 @@
 class CSE_Abstract;
 class CScriptBinderObject;
 class NET_Packet;
+class CGameObject;
 
 class CScriptBinder {
 protected:
 	CScriptBinderObject			*m_object;
-
+    CGameObject *owner;
 public:
-								CScriptBinder	();
+								CScriptBinder	(CGameObject *owner);
 	virtual						~CScriptBinder	();
 			void				init			();
 			void				clear			();