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

Print entering and leaving lua as raw

Browse Source
This commit is contained in:
Lion Kortlepel
2021-11-29 00:17:09 +01:00
parent 297b646d33
commit c91f3ee33c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/TConsole.cpp
View File

@@ -94,7 +94,7 @@ void TConsole::BackupOldLog() {
void TConsole::ChangeToLuaConsole() {
if (!mIsLuaConsole) {
mIsLuaConsole = true;
beammp_info("Entered Lua console. To exit, type `exit()`");
Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
mCachedRegularHistory = mCommandline.history();
mCommandline.set_history(mCachedLuaHistory);
mCommandline.set_prompt("lua> ");
@@ -104,7 +104,7 @@ void TConsole::ChangeToLuaConsole() {
void TConsole::ChangeToRegularConsole() {
if (mIsLuaConsole) {
mIsLuaConsole = false;
beammp_info("Left Lua console.");
Application::Console().WriteRaw("Left Lua console.");
mCachedLuaHistory = mCommandline.history();
mCommandline.set_history(mCachedRegularHistory);
mCommandline.set_prompt("> ");
@@ -149,8 +149,11 @@ TConsole::TConsole() {
} else if (!cmd.empty()) {
auto FutureIsNonNil =
[](const std::shared_ptr<TLuaResult>& Future) {
auto Type = Future->Result.get_type();
return Type != sol::type::lua_nil && Type != sol::type::none;
if (!Future->Error) {
auto Type = Future->Result.get_type();
return Type != sol::type::lua_nil && Type != sol::type::none;
}
return false;
};
std::vector<std::shared_ptr<TLuaResult>> NonNilFutures;
{ // Futures scope