Merge CUsableScriptObject into CGameObject.

Author: nitrocaster

src/xrGame/Actor.cpp

@@ -45,7 +45,6 @@
 #include "game_cl_single.h"
 #include "xrmessages.h"
 #include "string_table.h"
-#include "usablescriptobject.h"
 #include "xrCDB/Intersect.hpp"
 
 #include "alife_registry_wrappers.h"
@@ -1299,7 +1298,7 @@ void CActor::shedule_Update	(u32 DT)
 		m_pObjectWeLookingAt			= smart_cast<CGameObject*>(RQ.O);
 
 		CGameObject						*game_object = smart_cast<CGameObject*>(RQ.O);
-		m_pUsableObject					= smart_cast<CUsableScriptObject*>(game_object);
+		m_pUsableObject					= game_object;
 		m_pInvBoxWeLookingAt			= smart_cast<CInventoryBox*>(game_object);
 		m_pPersonWeLookingAt			= smart_cast<CInventoryOwner*>(game_object);
 		m_pVehicleWeLookingAt			= smart_cast<CHolderCustom*>(game_object);

src/xrGame/Actor.h

@@ -35,8 +35,6 @@ class ENGINE_API CBlend;
 class CWeaponList;
 class CEffectorBobbing;
 class CHolderCustom;
-class CUsableScriptObject;
-
 struct SShootingEffector;
 struct SSleepEffector;
 class  CSleepEffectorPP;
@@ -344,7 +342,7 @@ struct SDefNewsMsg{
 	CInventoryOwner*		PersonWeLookingAt			() {return m_pPersonWeLookingAt;}
 	LPCSTR					GetDefaultActionForObject	() {return *m_sDefaultObjAction;}
 protected:
-	CUsableScriptObject*	m_pUsableObject;
+    CGameObject*	m_pUsableObject;
 	// Person we're looking at
 	CInventoryOwner*		m_pPersonWeLookingAt;
 	CHolderCustom*			m_pVehicleWeLookingAt;

src/xrGame/ActorInput.cpp

@@ -17,7 +17,6 @@
 #include "Level.h"
 #include "game_cl_base.h"
 #include "xr_level_controller.h"
-#include "UsableScriptObject.h"
 #include "actorcondition.h"
 #include "actor_input_handler.h"
 #include "string_table.h"

src/xrGame/Actor_Feel.cpp

@@ -5,7 +5,6 @@
 #include "inventory.h"
 #include "character_info.h"
 #include "xr_level_controller.h"
-#include "UsableScriptObject.h"
 #include "customzone.h"
 #include "xrEngine/GameMtlLib.h"
 #include "ui/UIMainIngameWnd.h"
@@ -219,7 +218,7 @@ void	CActor::PickupModeUpdate_COD	()
 
 	if (pNearestItem && m_bPickupMode)
 	{
-		CUsableScriptObject*	pUsableObject = smart_cast<CUsableScriptObject*>(pNearestItem);
+		CGameObject*	pUsableObject = smart_cast<CGameObject*>(pNearestItem);
 		if(pUsableObject && (!m_pUsableObject))
 			pUsableObject->use(this);
 

src/xrGame/GameObject.cpp

@@ -32,6 +32,12 @@
 #include "magic_box3.h"
 #include "animation_movement_controller.h"
 #include "xrEngine/xr_collide_form.h"
+#include "script_game_object.h"
+#include "script_callback_ex.h"
+#include "game_object_space.h"
+#include "doors_door.h"
+#include "doors.h"
+
 extern MagicBox3 MagicMinBox (int iQuantity, const Fvector* akPoint);
 
 #pragma warning(push)
@@ -48,6 +54,10 @@ ENGINE_API bool g_dedicated_server;
 
 CGameObject::CGameObject		()
 {
+    // CUsableScriptObject init
+    m_bNonscriptUsable = true;
+    set_tip_text_default();
+    // ~
 	m_ai_obstacle				= 0;
 
 	init						();
@@ -1145,3 +1155,28 @@ void CGameObject::OnRender			()
 	}
 }
 #endif // DEBUG
+
+using namespace luabind; // XXX: is it required here?
+
+bool CGameObject::use(CGameObject* who_use)
+{
+    VERIFY(who_use);
+    CScriptGameObject *obj = lua_game_object();
+    if (obj && obj->m_door)
+    {
+        if (obj->m_door->is_blocked(doors::door_state_open) || obj->m_door->is_blocked(doors::door_state_closed))
+            return false;
+    }
+    callback(GameObject::eUseObject)(obj, who_use->lua_game_object());
+    return true;
+}
+
+LPCSTR CGameObject::tip_text() { return *m_sTipText; }
+
+void CGameObject::set_tip_text(LPCSTR new_text) { m_sTipText = new_text; }
+
+void CGameObject::set_tip_text_default() { m_sTipText = NULL; }
+
+bool CGameObject::nonscript_usable() { return m_bNonscriptUsable; }
+
+void CGameObject::set_nonscript_usable(bool usable) { m_bNonscriptUsable = usable; }

src/xrGame/GameObject.h

@@ -9,7 +9,7 @@
 #include "xrEngine/xr_object.h"
 #include "xrServer_Space.h"
 #include "alife_space.h"
-#include "UsableScriptObject.h"
+#include "xrScriptEngine/script_space_forward.hpp"
 #include "script_binder.h"
 #include "Hit.h"
 #include "game_object_space.h"
@@ -49,11 +49,13 @@ template <typename _return_type>
 class CScriptCallbackEx;
 
 class CGameObject : 
-	public CObject, 
-	public CUsableScriptObject,
+	public CObject,
 	public CScriptBinder
 {
+private:
 	typedef CObject inherited;
+    shared_str m_sTipText;
+    bool m_bNonscriptUsable;
 	bool							m_spawned;
 	Flags32							m_server_flags;
 	CAI_ObjectLocation				*m_ai_location;
@@ -91,7 +93,6 @@ class CGameObject :
 
 public:
 	virtual bool						feel_touch_on_contact	(CObject *)					{return TRUE;}
-	virtual bool						use						(CGameObject* who_use)		{return CUsableScriptObject::use(who_use);};
 
 public:
 	CInifile				*m_ini_file;
@@ -308,6 +309,15 @@ const animation_movement_controller* animation_movement		( ) const	{ return	m_an
 	}
 
 	virtual void			on_matrix_change	(const Fmatrix &previous);
+    // UsableScriptObject functions
+    virtual bool use(CGameObject* who_use);
+    //ñòðî÷êà ïîÿâëÿþùàÿñÿ ïðè íàâåäåíèè íà îáúåêò (åñëè NULL, òî íåò)
+    virtual LPCSTR tip_text();
+    void set_tip_text(LPCSTR new_text);
+    virtual void set_tip_text_default();
+    //ìîæíî ëè èñïîëüçîâàòü îáúåêò ñòàíäàðòíûì (íå ñêðèïòîâûì) îáðàçîì
+    bool nonscript_usable();
+    void set_nonscript_usable(bool usable);
 };
 
 #endif // !defined(AFX_GAMEOBJECT_H__3DA72D03_C759_4688_AEBB_89FA812AA873__INCLUDED_)

src/xrGame/UsableScriptObject.cpp

@@ -1,7 +1,6 @@
 #include "pch_script.h"
 #include "script_game_object.h"
 #include "script_game_object_impl.h"
-#include "UsableScriptObject.h"
 #include "GameObject.h"
 #include "xrScriptEngine/script_engine.hpp"
 #include "stalker_planner.h"
@@ -20,29 +19,13 @@
 #include "doors_manager.h"
 
 void CScriptGameObject::SetTipText (LPCSTR tip_text)
-{
-	CUsableScriptObject	*l_tpUseableScriptObject = smart_cast<CUsableScriptObject*>(&object());
-	if (!l_tpUseableScriptObject)
-		ai().script_engine().script_log			(LuaMessageType::Error,"SetTipText. Reason: the object is not usable");
-	else l_tpUseableScriptObject->set_tip_text(tip_text);
-}
+{ object().set_tip_text(tip_text); }
 
 void CScriptGameObject::SetTipTextDefault ()
-{
-	CUsableScriptObject	*l_tpUseableScriptObject = smart_cast<CUsableScriptObject*>(&object());
-	if (!l_tpUseableScriptObject)
-		ai().script_engine().script_log			(LuaMessageType::Error,"SetTipTextDefault . Reason: the object is not usable");
-	else l_tpUseableScriptObject->set_tip_text_default();
-}
+{ object().set_tip_text_default(); }
 
 void CScriptGameObject::SetNonscriptUsable(bool nonscript_usable)
-{
-	CUsableScriptObject	*l_tpUseableScriptObject = smart_cast<CUsableScriptObject*>(&object());
-	if (!l_tpUseableScriptObject)
-		ai().script_engine().script_log			(LuaMessageType::Error,"SetNonscriptUsable . Reason: the object is not usable");
-	else l_tpUseableScriptObject->set_nonscript_usable(nonscript_usable);
-}
-
+{ object().set_nonscript_usable(nonscript_usable); }
 
 Fvector CScriptGameObject::GetCurrentDirection()
 {

src/xrGame/UsableScriptObject.h

@@ -1745,7 +1745,6 @@
     <ClInclude Include="ui\xrUIXmlParser.h" />
     <ClInclude Include="ui_base.h" />
     <ClInclude Include="ui_defs.h" />
-    <ClInclude Include="UsableScriptObject.h" />
     <ClInclude Include="vertex_allocator_fixed.h" />
     <ClInclude Include="vertex_allocator_fixed_inline.h" />
     <ClInclude Include="vertex_manager_fixed.h" />
@@ -3846,10 +3845,6 @@
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="UsableScriptObject.cpp">
-      <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
     <ClCompile Include="vision_client.cpp" />
     <ClCompile Include="visual_memory_manager.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>