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

Runtime: Make const/non-const getters have the same name

Browse Source 
Makes for a more consistent interface, as getters won't have different
names to remember based off whether or not they're const qualified.
This commit is contained in:
Lioncash
2019-08-14 10:58:54 -04:00
parent 6760f78568
commit afab3e0327
60 changed files with 284 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/AutoMapper/CMapWorld.cpp
View File

@@ -42,7 +42,7 @@ void CMapWorld::SetWhichMapAreasLoaded(const IWorld& wld, int start, int count)
for (int i = 0; i < 2; ++i) {
for (CMapAreaData* data = x10_listHeads[i]; data;) {
CMapAreaData* nextData = data->NextMapAreaData();
CMapAreaData* nextData = data->GetNextMapAreaData();
if (!IsMapAreaInBFSInfoVector(data, bfsInfos)) {
data->Unlock();
MoveMapAreaToList(data, EMapAreaList::Unloaded);
@@ -64,11 +64,11 @@ bool CMapWorld::IsMapAreasStreaming() const {
CMapAreaData* data = x10_listHeads[1];
while (data != nullptr) {
if (data->IsLoaded()) {
CMapAreaData* next = data->NextMapAreaData();
CMapAreaData* next = data->GetNextMapAreaData();
const_cast<CMapWorld*>(this)->MoveMapAreaToList(data, EMapAreaList::Loaded);
data = next;
} else {
data = data->NextMapAreaData();
data = data->GetNextMapAreaData();
ret = true;
}
}
@@ -78,13 +78,13 @@ bool CMapWorld::IsMapAreasStreaming() const {
void CMapWorld::MoveMapAreaToList(CMapWorld::CMapAreaData* data, CMapWorld::EMapAreaList list) {
CMapAreaData* last = nullptr;
for (CMapAreaData* head = x10_listHeads[int(data->GetContainingList())];;
last = head, head = head->NextMapAreaData()) {
last = head, head = head->GetNextMapAreaData()) {
if (head != data)
continue;
if (!last)
x10_listHeads[int(data->GetContainingList())] = head->NextMapAreaData();
x10_listHeads[int(data->GetContainingList())] = head->GetNextMapAreaData();
else
last->SetNextMapArea(head->NextMapAreaData());
last->SetNextMapArea(head->GetNextMapAreaData());
break;
}
data->SetNextMapArea(x10_listHeads[int(list)]);

2
Runtime/AutoMapper/CMapWorld.hpp
View File

@@ -67,9 +67,9 @@ public:
void Unlock() { x0_area.Unlock(); }
bool IsLoaded() const { return x0_area.IsLoaded(); }
const CMapArea* GetMapArea() const { return x0_area.GetObj(); }
CMapAreaData* GetNextMapAreaData() { return x14_next; }
const CMapAreaData* GetNextMapAreaData() const { return x14_next; }
EMapAreaList GetContainingList() const { return x10_list; }
CMapAreaData* NextMapAreaData() { return x14_next; }
void SetContainingList(EMapAreaList list) { x10_list = list; }
void SetNextMapArea(CMapAreaData* next) { x14_next = next; }
};