Skip to content

Commit 68f4212

Browse files
committed
WIP of xrAI and xrSE_Factory. Fix some spawn-related crashes.
1 parent 376e015 commit 68f4212

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

src/utils/xrAI/xrAI.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
193193

194194
Startup(lpCmdLine);
195195

196+
hFactory->close();
197+
196198
Core._destroy();
197199

198200
return (0);

src/utils/xrSE_Factory/ai_space.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ void CAI_Space::RegisterScriptClasses()
5050
void CAI_Space::init()
5151
{
5252
VERIFY(!m_script_engine);
53-
m_script_engine = new CScriptEngine();
53+
VERIFY(!GEnv.ScriptEngine);
54+
GEnv.ScriptEngine = m_script_engine = new CScriptEngine();
5455
XRay::ScriptExporter::Reset(); // mark all nodes as undone
5556
m_script_engine->init(XRay::ScriptExporter::Export, true);
5657
RegisterScriptClasses();

src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ SCRIPT_EXPORT(CSE_ALifeTraderAbstract, (), {
2323
.def("rank", &CSE_ALifeTraderAbstract::Rank)
2424
.def("reputation", &CSE_ALifeTraderAbstract::Reputation)];
2525
});
26+
#else
27+
LPCSTR profile_name_script(CSE_ALifeTraderAbstract* ta) { return *ta->character_profile(); }
28+
SCRIPT_EXPORT(CSE_ALifeTraderAbstract, (), {
29+
module(luaState)[class_<CSE_ALifeTraderAbstract>("cse_alife_trader_abstract")
30+
// .def( constructor<LPCSTR>())
31+
//.def("community", &CSE_ALifeTraderAbstract::CommunityName)
32+
.def("profile_name", &profile_name_script)
33+
//.def("rank", &CSE_ALifeTraderAbstract::Rank)
34+
/*.def("reputation", &CSE_ALifeTraderAbstract::Reputation)*/];
35+
});
2636
#endif
2737

2838
SCRIPT_EXPORT(CSE_ALifeTrader, (CSE_ALifeDynamicObjectVisual, CSE_ALifeTraderAbstract), {

0 commit comments

Comments
 (0)