WIP of xrAI and xrSE_Factory. Fix some spawn-related crashes.

OpenXRay · Dec 30, 2017 · 68f4212 · 68f4212
1 parent 376e015
commit 68f4212
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp
@@ -193,6 +193,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 
     Startup(lpCmdLine);
 
+    hFactory->close();
+
     Core._destroy();
 
     return (0);

diff --git a/src/utils/xrSE_Factory/ai_space.cpp b/src/utils/xrSE_Factory/ai_space.cpp
@@ -50,7 +50,8 @@ void CAI_Space::RegisterScriptClasses()
 void CAI_Space::init()
 {
     VERIFY(!m_script_engine);
-    m_script_engine = new CScriptEngine();
+    VERIFY(!GEnv.ScriptEngine);
+    GEnv.ScriptEngine = m_script_engine = new CScriptEngine();
     XRay::ScriptExporter::Reset(); // mark all nodes as undone
     m_script_engine->init(XRay::ScriptExporter::Export, true);
     RegisterScriptClasses();

diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp
@@ -23,6 +23,16 @@ SCRIPT_EXPORT(CSE_ALifeTraderAbstract, (), {
                          .def("rank", &CSE_ALifeTraderAbstract::Rank)
                          .def("reputation", &CSE_ALifeTraderAbstract::Reputation)];
 });
+#else
+LPCSTR profile_name_script(CSE_ALifeTraderAbstract* ta) { return *ta->character_profile(); }
+SCRIPT_EXPORT(CSE_ALifeTraderAbstract, (), {
+    module(luaState)[class_<CSE_ALifeTraderAbstract>("cse_alife_trader_abstract")
+    //			.def(		constructor<LPCSTR>())
+    //.def("community", &CSE_ALifeTraderAbstract::CommunityName)
+    .def("profile_name", &profile_name_script)
+    //.def("rank", &CSE_ALifeTraderAbstract::Rank)
+    /*.def("reputation", &CSE_ALifeTraderAbstract::Reputation)*/];
+    });
 #endif
 
 SCRIPT_EXPORT(CSE_ALifeTrader, (CSE_ALifeDynamicObjectVisual, CSE_ALifeTraderAbstract), {