2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-14 08:05:52 +00:00

CWorld: Provide parameter names for prototypes

More self-documenting from the interface alone and allows IDE
inspections at callsites to be better.
This commit is contained in:
Lioncash 2020-03-25 01:27:53 -04:00
parent 985b85d9db
commit ab6c45c7a8

View File

@ -165,7 +165,7 @@ public:
CGameArea::CConstChainIterator begin() const { return GetChainHead(EChain::Alive); } CGameArea::CConstChainIterator begin() const { return GetChainHead(EChain::Alive); }
CGameArea::CConstChainIterator end() const { return GetAliveAreasEnd(); } CGameArea::CConstChainIterator end() const { return GetAliveAreasEnd(); }
bool ScheduleAreaToLoad(CGameArea* area, CStateManager& mgr); bool ScheduleAreaToLoad(CGameArea* area, CStateManager& mgr);
void TravelToArea(TAreaId aid, CStateManager& mgr, bool); void TravelToArea(TAreaId aid, CStateManager& mgr, bool skipLoadOther);
void SetLoadPauseState(bool paused); void SetLoadPauseState(bool paused);
void CycleLoadPauseState(); void CycleLoadPauseState();
@ -183,7 +183,7 @@ public:
CAssetId IGetSaveWorldAssetId() const override; CAssetId IGetSaveWorldAssetId() const override;
const CMapWorld* IGetMapWorld() const override; const CMapWorld* IGetMapWorld() const override;
CMapWorld* IGetMapWorld() override; CMapWorld* IGetMapWorld() override;
const CGameArea* GetAreaAlways(TAreaId) const; const CGameArea* GetAreaAlways(TAreaId id) const;
CGameArea* GetArea(TAreaId); CGameArea* GetArea(TAreaId);
s32 GetNumAreas() const { return x18_areas.size(); } s32 GetNumAreas() const { return x18_areas.size(); }
const IGameArea* IGetAreaAlways(TAreaId id) const override; const IGameArea* IGetAreaAlways(TAreaId id) const override;
@ -194,7 +194,7 @@ public:
std::string IGetDefaultAudioTrack() const override; std::string IGetDefaultAudioTrack() const override;
int IGetAreaCount() const override; int IGetAreaCount() const override;
static void PropogateAreaChain(CGameArea::EOcclusionState, CGameArea*, CWorld*); static void PropogateAreaChain(CGameArea::EOcclusionState occlusionState, CGameArea* area, CWorld* world);
static CGameArea::CConstChainIterator GetAliveAreasEnd() { return {skGlobalEnd}; } static CGameArea::CConstChainIterator GetAliveAreasEnd() { return {skGlobalEnd}; }
static CGameArea::CChainIterator AliveAreasEnd() { return {skGlobalNonConstEnd}; } static CGameArea::CChainIterator AliveAreasEnd() { return {skGlobalNonConstEnd}; }