xrGame/script_game_object_script3.cpp: use lambda functions for level changer

Author: Xottab-DUTY

src/xrGame/level_changer.h

@@ -45,7 +45,7 @@ class CLevelChanger : public CGameObject, public Feel::Touch
     bool IsLevelChangerEnabled() const { return m_b_enabled; }
     void EnableSilentMode(bool silent) { m_bSilentMode = silent; }
     bool IsSilentModeEnabled() const { return m_bSilentMode; }
-    void SetLEvelChangerInvitationStr(LPCSTR str) { m_invite_str = str; }
+    void SetLevelChangerInvitationStr(LPCSTR str) { m_invite_str = str; }
     // serialization
     virtual bool net_SaveRelevant();
     virtual void save(NET_Packet& output_packet);

src/xrGame/script_game_object.h

@@ -664,9 +664,7 @@ class CScriptGameObject
     CScriptGameObject* active_detector() const;
     u32 active_slot();
     void activate_slot(u32 slot_id);
-    void enable_level_changer(bool b);
-    bool is_level_changer_enabled();
-    void set_level_changer_invitation(LPCSTR str);
+
 #ifdef DEBUG
     void debug_planner(const script_planner* planner);
 #endif

src/xrGame/script_game_object4.cpp

@@ -309,27 +309,6 @@ bool CScriptGameObject::inv_box_can_take_status()
 CZoneCampfire* CScriptGameObject::get_campfire() { return smart_cast<CZoneCampfire*>(&object()); }
 CArtefact* CScriptGameObject::get_artefact() { return smart_cast<CArtefact*>(&object()); }
 CPhysicObject* CScriptGameObject::get_physics_object() { return smart_cast<CPhysicObject*>(&object()); }
-#include "level_changer.h"
-void CScriptGameObject::enable_level_changer(bool b)
-{
-    CLevelChanger* lch = smart_cast<CLevelChanger*>(&object());
-    if (lch)
-        lch->EnableLevelChanger(b);
-}
-bool CScriptGameObject::is_level_changer_enabled()
-{
-    CLevelChanger* lch = smart_cast<CLevelChanger*>(&object());
-    if (lch)
-        return lch->IsLevelChangerEnabled();
-    return false;
-}
-
-void CScriptGameObject::set_level_changer_invitation(LPCSTR str)
-{
-    CLevelChanger* lch = smart_cast<CLevelChanger*>(&object());
-    if (lch)
-        lch->SetLEvelChangerInvitationStr(str);
-}
 
 void CScriptGameObject::start_particles(LPCSTR pname, LPCSTR bone)
 {

src/xrGame/script_game_object_script3.cpp

@@ -402,8 +402,18 @@ luabind::class_<CScriptGameObject>& script_register_game_object2(luabind::class_
         .def("aim_bone_id", (LPCSTR(CScriptGameObject::*)() const) & CScriptGameObject::aim_bone_id)
 
         .def("actor_look_at_point", &CScriptGameObject::ActorLookAtPoint)
-        .def("enable_level_changer", &CScriptGameObject::enable_level_changer)
-        .def("is_level_changer_enabled", &CScriptGameObject::is_level_changer_enabled)
+
+        .def("enable_level_changer", [](const CScriptGameObject* self, bool enable)
+        {
+            if (auto* lch = smart_cast<CLevelChanger*>(&self->object()))
+                lch->EnableLevelChanger(enable);
+        })
+        .def("is_level_changer_enabled", [](const CScriptGameObject* self)
+        {
+            if (const auto* lch = smart_cast<CLevelChanger*>(&self->object()))
+                return lch->IsLevelChangerEnabled();
+            return false;
+        })
         .def("enable_silent_level_changer", [](const CScriptGameObject* self, bool silent)
         {
             if (auto* lch = smart_cast<CLevelChanger*>(&self->object()))
@@ -415,8 +425,12 @@ luabind::class_<CScriptGameObject>& script_register_game_object2(luabind::class_
                 return lch->IsSilentModeEnabled();
             return false;
         })
+        .def("set_level_changer_invitation", [](const CScriptGameObject* self, pcstr invitation)
+        {
+            if (auto* lch = smart_cast<CLevelChanger*>(&self->object()))
+                lch->SetLevelChangerInvitationStr(invitation);
+        })
 
-        .def("set_level_changer_invitation", &CScriptGameObject::set_level_changer_invitation)
         .def("start_particles", &CScriptGameObject::start_particles)
         .def("stop_particles", &CScriptGameObject::stop_particles)