diff --git a/TR5Main/Scripting/GameLogicScript.h b/TR5Main/Scripting/GameLogicScript.h index ce060c657..f18f56bc9 100644 --- a/TR5Main/Scripting/GameLogicScript.h +++ b/TR5Main/Scripting/GameLogicScript.h @@ -71,7 +71,7 @@ private: public: GameScript(sol::state* lua); - void FreeLevelScripts(); + void FreeLevelScripts() override; bool SetDisplayString(DisplayStringIDType id, UserDisplayString const & ds); @@ -81,11 +81,11 @@ std::optional> GetDisplayString(Displa bool SetLevelFunc(sol::table tab, std::string const& luaName, sol::object obj); sol::protected_function GetLevelFunc(sol::table tab, std::string const& luaName); - void AssignItemsAndLara(); + void AssignItemsAndLara() override; - void ExecuteScriptFile(const std::string& luaFilename); - void ExecuteFunction(std::string const & name); + void ExecuteScriptFile(const std::string& luaFilename) override; + void ExecuteFunction(std::string const & name) override; void MakeItemInvisible(short id); template @@ -95,7 +95,7 @@ std::optional> GetDisplayString(Displa return std::make_unique(std::get(m_nameMap.at(name)), false); } - bool AddName(std::string const& key, VarMapVal val) + bool AddName(std::string const& key, VarMapVal val) override { auto p = std::pair{ key, val }; return m_nameMap.insert(p).second; @@ -113,14 +113,14 @@ std::optional> GetDisplayString(Displa void SetVariables(std::map& locals, std::map& globals); void ResetVariables(); - void SetCallbackDrawString(CallbackDrawString cb); + void SetCallbackDrawString(CallbackDrawString cb) override; void ShowString(GameScriptDisplayString const&, sol::optional nSeconds); - void ProcessDisplayStrings(float dt); - void InitCallbacks(); - void OnStart(); - void OnLoad(); - void OnControlPhase(float dt); - void OnSave(); - void OnEnd(); + void ProcessDisplayStrings(float dt) override; + void InitCallbacks() override; + void OnStart() override; + void OnLoad() override; + void OnControlPhase(float dt) override; + void OnSave() override; + void OnEnd() override; };