AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 00:27:43 +00:00
Code Issues Projects Releases Wiki Activity

RuntimeCommon: Use override where applicable

Browse Source 
Continues the override modernization by applying it to the main
RuntimeCommon target. Resolves around 1100+ cases where override can be
used.
This commit is contained in:
Lioncash
2019-08-09 15:46:49 -04:00
parent 5eaa7a23e8
commit 9312eef905
86 changed files with 1173 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/MP1/MP1.hpp
View File

@@ -269,12 +269,12 @@ public:
// int RsMain(int argc, const boo::SystemChar* argv[]);
void Init(const hecl::Runtime::FileStoreManager& storeMgr, hecl::CVarManager* cvarManager, boo::IWindow* window,
boo::IAudioVoiceEngine* voiceEngine, amuse::IBackendVoiceAllocator& backend);
void WarmupShaders();
bool Proc();
void Draw();
void Shutdown();
boo::IWindow* GetMainWindow() const;
boo::IAudioVoiceEngine* voiceEngine, amuse::IBackendVoiceAllocator& backend) override;
void WarmupShaders() override;
bool Proc() override;
void Draw() override;
void Shutdown() override;
boo::IWindow* GetMainWindow() const override;
void MemoryCardInitializePump();
@@ -294,14 +294,14 @@ public:
static void EnsureWorldPaksReady();
static void EnsureWorldPakReady(CAssetId mlvl);
EFlowState GetFlowState() const { return x12c_flowState; }
void SetFlowState(EFlowState s) { x12c_flowState = s; }
EFlowState GetFlowState() const override { return x12c_flowState; }
void SetFlowState(EFlowState s) override { x12c_flowState = s; }
void SetX30(bool v) { x160_30_ = v; }
CGameArchitectureSupport* GetArchSupport() const { return x164_archSupport.get(); }
size_t GetExpectedIdSize() const { return sizeof(u32); }
size_t GetExpectedIdSize() const override { return sizeof(u32); }
void quit(hecl::Console*, const std::vector<std::string>&) { m_doQuit = true; }
void Give(hecl::Console*, const std::vector<std::string>&);
void Remove(hecl::Console*, const std::vector<std::string>&);
@@ -309,7 +309,7 @@ public:
void Teleport(hecl::Console*, const std::vector<std::string>&);
void ListWorlds(hecl::Console*, const std::vector<std::string>&);
void Warp(hecl::Console*, const std::vector<std::string>&);
hecl::Console* Console() const { return m_console.get(); }
hecl::Console* Console() const override { return m_console.get(); }
int m_warpWorldIdx = -1;
TAreaId m_warpAreaId = 0;