xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp: prevent …

…of forwarding incorrect types to Lua
OpenXRay · Nov 28, 2023 · 9eaeaf3 · 9eaeaf3
1 parent 60a5508
commit 9eaeaf3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/xrGame/map_script.cpp b/src/xrGame/map_script.cpp
@@ -27,7 +27,9 @@ SCRIPT_EXPORT(CMapLocation, (),
             //.def(constructor<>())
             .def("HintEnabled", &CMapLocation::HintEnabled)
             .def("GetHint", &CMapLocation::GetHint)
-            .def("SetHint", &CMapLocation::SetHint)
+            .def("SetHint", +[](CMapLocation* self, LPCSTR hint) {
+              self->SetHint(hint);
+            })
             .def("PointerEnabled", &CMapLocation::PointerEnabled)
             .def("EnablePointer", &CMapLocation::EnablePointer)
             .def("DisablePointer", &CMapLocation::DisablePointer)
@@ -39,7 +41,9 @@ SCRIPT_EXPORT(CMapLocation, (),
             .def("SpotEnabled", &CMapLocation::SpotEnabled)
             .def("EnableSpot", &CMapLocation::EnableSpot)
             .def("DisableSpot", &CMapLocation::DisableSpot)
-            .def("GetLevelName", &CMapLocation::GetLevelName)
+            .def("GetLevelName", +[](CMapLocation* self) {
+              return self->GetLevelName().c_str();
+            })
             .def("GetPosition", &CMapLocation::GetPosition)
             .def("ObjectID", &CMapLocation::ObjectID)
             .def("GetLastPosition", &CMapLocation::GetLastPosition)

diff --git a/src/xrGame/script_movement_action_script.cpp b/src/xrGame/script_movement_action_script.cpp
@@ -108,7 +108,9 @@ SCRIPT_EXPORT(CScriptMovementAction, (),
             .def("move", &CScriptMovementAction::SetMovementType)
             .def("path", &CScriptMovementAction::SetPathType)
             .def("object", &CScriptMovementAction::SetObjectToGo)
-            .def("patrol", &CScriptMovementAction::SetPatrolPath)
+            .def("patrol", +[](CScriptMovementAction* self, const CPatrolPath* path, LPCSTR path_name) {
+              self->SetPatrolPath(path, path_name);
+            })
             .def("position", &CScriptMovementAction::SetPosition)
             .def("input", &CScriptMovementAction::SetInputKeys)
             .def("completed", &CScriptAbstractAction::completed)

diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp
@@ -24,7 +24,7 @@ SCRIPT_EXPORT(CSE_ALifeTraderAbstract, (),
             .def("profile_name", +[](CSE_ALifeTraderAbstract* ta) { return ta->character_profile().c_str(); })
             .def("set_profile_name", +[](CSE_ALifeTraderAbstract* ta, const pcstr str) { ta->set_character_profile(str); })
             .def("character_name", +[](CSE_ALifeTraderAbstract* ta) { return ta->m_character_name.c_str(); })
-            .def("set_character_name", +[](CSE_ALifeTraderAbstract* ta, const pcstr str) { return ta->m_character_name = str; })
+            .def("set_character_name", +[](CSE_ALifeTraderAbstract* ta, const pcstr str) { ta->m_character_name = str; })
             .def("rank", &CSE_ALifeTraderAbstract::Rank)
             .def("set_rank", &CSE_ALifeTraderAbstract::SetRank)
             .def("reputation", &CSE_ALifeTraderAbstract::Reputation)