Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-12 05:26:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mark overriden functions as override.

Browse source
This commit is contained in:
hispidence 2021-11-29 22:03:27 +00:00
parent 5613d0cf74
commit b08bc3cceb
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
TR5Main/Scripting/GameLogicScript.h
View file

@ -71,7 +71,7 @@ private:
public: public:
GameScript(sol::state* lua); GameScript(sol::state* lua);
void FreeLevelScripts(); void FreeLevelScripts() override;
bool SetDisplayString(DisplayStringIDType id, UserDisplayString const & ds); bool SetDisplayString(DisplayStringIDType id, UserDisplayString const & ds);
@ -81,11 +81,11 @@ std::optional<std::reference_wrapper<UserDisplayString>> GetDisplayString(Displa
bool SetLevelFunc(sol::table tab, std::string const& luaName, sol::object obj); bool SetLevelFunc(sol::table tab, std::string const& luaName, sol::object obj);
sol::protected_function GetLevelFunc(sol::table tab, std::string const& luaName); sol::protected_function GetLevelFunc(sol::table tab, std::string const& luaName);
void AssignItemsAndLara(); void AssignItemsAndLara() override;
void ExecuteScriptFile(const std::string& luaFilename); void ExecuteScriptFile(const std::string& luaFilename) override;
void ExecuteFunction(std::string const & name); void ExecuteFunction(std::string const & name) override;
void MakeItemInvisible(short id); void MakeItemInvisible(short id);
template <typename R, char const* S> template <typename R, char const* S>
@ -95,7 +95,7 @@ std::optional<std::reference_wrapper<UserDisplayString>> GetDisplayString(Displa
return std::make_unique<R>(std::get<R::IdentifierType>(m_nameMap.at(name)), false); return std::make_unique<R>(std::get<R::IdentifierType>(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<std::string const&, VarMapVal>{ key, val }; auto p = std::pair<std::string const&, VarMapVal>{ key, val };
return m_nameMap.insert(p).second; return m_nameMap.insert(p).second;
@ -113,14 +113,14 @@ std::optional<std::reference_wrapper<UserDisplayString>> GetDisplayString(Displa
void SetVariables(std::map<std::string, T>& locals, std::map<std::string, T>& globals); void SetVariables(std::map<std::string, T>& locals, std::map<std::string, T>& globals);
void ResetVariables(); void ResetVariables();
void SetCallbackDrawString(CallbackDrawString cb); void SetCallbackDrawString(CallbackDrawString cb) override;
void ShowString(GameScriptDisplayString const&, sol::optional<float> nSeconds); void ShowString(GameScriptDisplayString const&, sol::optional<float> nSeconds);
void ProcessDisplayStrings(float dt); void ProcessDisplayStrings(float dt) override;
void InitCallbacks(); void InitCallbacks() override;
void OnStart(); void OnStart() override;
void OnLoad(); void OnLoad() override;
void OnControlPhase(float dt); void OnControlPhase(float dt) override;
void OnSave(); void OnSave() override;
void OnEnd(); void OnEnd() override;
}; };