Apply suggestions from code review

Co-authored-by: Lion <development@kortlepel.com>

include/TLuaEngine.h

@@ -41,14 +41,7 @@ struct TLuaResult {
     sol::object Result { sol::lua_nil };
     TLuaStateId StateId;
     std::string Function;
-    std::shared_ptr<std::mutex> ReadyMutex {
+    // TODO: Add condition_variable
-        std::make_shared<std::mutex>()
-    };
-    std::shared_ptr<std::condition_variable> ReadyCondition {
-        std::make_shared<std::condition_variable>()
-    };
-
-    void MarkAsReady();
     void WaitUntilReady();
 };
 
@@ -105,8 +98,8 @@ public:
         return mLuaStates.size();
     }
     std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names {};
+        std::vector<std::string> names{};
-        for (auto const& [stateId, _] : mLuaStates) {
+        for(auto const& [stateId, _ ] : mLuaStates) {
             names.push_back(stateId);
         }
         return names;

src/TConsole.cpp

@@ -606,7 +606,9 @@ TConsole::TConsole() {
                     HandleLuaInternalCommand(cmd.substr(1));
                 } else {
                     auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    Future->WaitUntilReady();
+                    while (!Future->Ready) {
+                        std::this_thread::yield(); // TODO: Add a timeout
+                    }
                     if (Future->Error) {
                         beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                     }

src/TLuaEngine.cpp

@@ -286,7 +286,6 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
         bool Cancelled = false;
         size_t ms = 0;
         std::set<std::string> WarnedResults;
-
         while (!Result->Ready && !Cancelled) {
             std::this_thread::sleep_for(std::chrono::milliseconds(10));
             ms += 10;
@@ -301,7 +300,6 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                 }
             }
         }
-
         if (Cancelled) {
             beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
             LuaAPI::MP::Engine->ReportErrors({ Result });
@@ -427,7 +425,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                 Result->Error = true;
                 Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
             }
-            Result->MarkAsReady();
+            Result->Ready = true;
             Return.push_back(Result);
         }
     }
@@ -957,7 +955,7 @@ void TLuaEngine::StateThreadData::operator()() {
                     sol::error Err = Res;
                     S.second->ErrorMessage = Err.what();
                 }
-                S.second->MarkAsReady();
+                S.second->Ready = true;
             }
         }
         { // StateFunctionQueue Scope
@@ -1018,11 +1016,11 @@ void TLuaEngine::StateThreadData::operator()() {
                         sol::error Err = Res;
                         Result->ErrorMessage = Err.what();
                     }
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 } else {
                     Result->Error = true;
                     Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 }
             }
         }
@@ -1072,19 +1070,11 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
     mPaths.push(Path);
 }
 
-void TLuaResult::MarkAsReady() {
-    {
-        std::lock_guard<std::mutex> readyLock(*this->ReadyMutex);
-        this->Ready = true;
-    }
-    this->ReadyCondition->notify_all();
-}
-
 void TLuaResult::WaitUntilReady() {
-    std::unique_lock readyLock(*this->ReadyMutex);
+    while (!Ready) {
-    // wait if not ready yet
+        std::this_thread::yield();
-    if(!this->Ready)
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        this->ReadyCondition->wait(readyLock);
+    }
 }
 
 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)