From dca573b15c5836b75d016d101fd1c03b5e90d7ef Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Thu, 16 Sep 2021 13:06:04 +0200 Subject: [PATCH] Fix more compile issues with lua, add TriggerGlobalEvent --- CMakeLists.txt | 1 + src/TLuaEngine.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e49c0b..fcd9ba3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,7 @@ add_executable(BeamMP-Server include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include) find_package(Lua REQUIRED) +include_directories(${LUA_INCLUDE_DIR}) find_package(OpenSSL REQUIRED) target_link_libraries(BeamMP-Server sol2::sol2 ${LUA_LIBRARIES}) diff --git a/src/TLuaEngine.cpp b/src/TLuaEngine.cpp index 3acc2cd..32293f4 100644 --- a/src/TLuaEngine.cpp +++ b/src/TLuaEngine.cpp @@ -159,7 +159,10 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomi [this](const std::string& EventName, const std::string& FunctionName) { RegisterEvent(EventName, FunctionName); }); - Table.set_function(""); + Table.set_function("TriggerGlobalEvent", + [&](const std::string& EventName) { + return mEngine->TriggerEvent(EventName); + }); Table.create_named("Settings", "Debug", 0, "Private", 1,