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

CWorld: Rename IMapWorld to IGetMapWorld()

Browse Source 
Allows const overloading to function properly and prevents potential
compilation errors from occurring if constness on functions is ever
changed.
This commit is contained in:
Lioncash
2020-03-20 23:24:13 -04:00
parent 36ac0a8d78
commit 8a9e76a345
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CWorld.hpp
View File

@@ -27,7 +27,7 @@ public:
virtual CAssetId IGetStringTableAssetId() const = 0;
virtual CAssetId IGetSaveWorldAssetId() const = 0;
virtual const CMapWorld* IGetMapWorld() const = 0;
virtual CMapWorld* IMapWorld() = 0;
virtual CMapWorld* IGetMapWorld() = 0;
virtual const IGameArea* IGetAreaAlways(TAreaId id) const = 0;
virtual TAreaId IGetCurrentAreaId() const = 0;
virtual TAreaId IGetAreaId(CAssetId id) const = 0;
@@ -62,7 +62,7 @@ public:
CAssetId IGetStringTableAssetId() const override;
CAssetId IGetSaveWorldAssetId() const override;
const CMapWorld* IGetMapWorld() const override;
CMapWorld* IMapWorld() override;
CMapWorld* IGetMapWorld() override;
const IGameArea* IGetAreaAlways(TAreaId id) const override;
TAreaId IGetCurrentAreaId() const override;
TAreaId IGetAreaId(CAssetId id) const override;
@@ -182,7 +182,7 @@ public:
CAssetId IGetStringTableAssetId() const override;
CAssetId IGetSaveWorldAssetId() const override;
const CMapWorld* IGetMapWorld() const override;
CMapWorld* IMapWorld() override;
CMapWorld* IGetMapWorld() override;
const CGameArea* GetAreaAlways(TAreaId) const;
CGameArea* GetArea(TAreaId);
s32 GetNumAreas() const { return x18_areas.size(); }