SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2026-02-16 10:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to switch into other lua states

Browse Source
This commit is contained in:
Lion Kortlepel
2021-11-29 00:37:00 +01:00
parent c91f3ee33c
commit fc440bea2a
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/TConsole.h
View File

@@ -18,7 +18,7 @@ public:
Commandline& Internal() { return mCommandline; }
private:
void ChangeToLuaConsole();
void ChangeToLuaConsole(const std::string& LuaStateId);
void ChangeToRegularConsole();
Commandline mCommandline;
@@ -27,5 +27,6 @@ private:
TLuaEngine* mLuaEngine { nullptr };
bool mIsLuaConsole { false };
bool mFirstTime { true };
const std::string mStateId = "BEAMMP_SERVER_CONSOLE";
std::string mStateId;
const std::string mDefaultStateId = "BEAMMP_SERVER_CONSOLE";
};

1
include/TLuaEngine.h
View File

@@ -84,6 +84,7 @@ public:
static void WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results);
void ReportErrors(const std::vector<std::shared_ptr<TLuaResult> >& Results);
bool HasState(TLuaStateId StateId);
[[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
[[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);

33
src/TConsole.cpp
View File

@@ -2,6 +2,7 @@
#include "Common.h"
#include "Compat.h"
#include "CustomAssert.h"
#include "LuaAPI.h"
#include "TLuaEngine.h"
@@ -91,10 +92,15 @@ void TConsole::BackupOldLog() {
}
}
void TConsole::ChangeToLuaConsole() {
void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
if (!mIsLuaConsole) {
mStateId = LuaStateId;
mIsLuaConsole = true;
Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
if (mStateId != mDefaultStateId) {
Application::Console().WriteRaw("Entered Lua console for state '" + mStateId + "'. To exit, type `exit()`");
} else {
Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
}
mCachedRegularHistory = mCommandline.history();
mCommandline.set_history(mCachedLuaHistory);
mCommandline.set_prompt("lua> ");
@@ -104,10 +110,15 @@ void TConsole::ChangeToLuaConsole() {
void TConsole::ChangeToRegularConsole() {
if (mIsLuaConsole) {
mIsLuaConsole = false;
Application::Console().WriteRaw("Left Lua console.");
if (mStateId != mDefaultStateId) {
Application::Console().WriteRaw("Left Lua console for state '" + mStateId + "'.");
} else {
Application::Console().WriteRaw("Left Lua console.");
}
mCachedLuaHistory = mCommandline.history();
mCommandline.set_history(mCachedRegularHistory);
mCommandline.set_prompt("> ");
mStateId = mDefaultStateId;
}
}
@@ -144,8 +155,18 @@ TConsole::TConsole() {
if (cmd == "exit") {
beammp_info("gracefully shutting down");
Application::GracefullyShutdown();
} else if (cmd == "lua") {
ChangeToLuaConsole();
} else if (cmd.size() >= 3 && cmd.substr(0, 3) == "lua") {
if (cmd.size() > 3) {
auto NewStateId = cmd.substr(4);
beammp_assert(!NewStateId.empty());
if (mLuaEngine->HasState(NewStateId)) {
ChangeToLuaConsole(NewStateId);
} else {
Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
}
} else {
ChangeToLuaConsole(mDefaultStateId);
}
} else if (!cmd.empty()) {
auto FutureIsNonNil =
[](const std::shared_ptr<TLuaResult>& Future) {
@@ -208,5 +229,5 @@ void TConsole::WriteRaw(const std::string& str) {
void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
mLuaEngine = &Engine;
Engine.EnsureStateExists(mStateId, "Console");
Engine.EnsureStateExists(mDefaultStateId, "Console");
}

5
src/TLuaEngine.cpp
View File

@@ -162,6 +162,11 @@ void TLuaEngine::ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Re
}
}
bool TLuaEngine::HasState(TLuaStateId StateId) {
std::unique_lock Lock(mLuaStatesMutex);
return mLuaStates.find(StateId) != mLuaStates.end();
}
std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script) {
std::unique_lock Lock(mLuaStatesMutex);
return mLuaStates.at(StateID)->EnqueueScript(Script);