Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fleshed out inherited functions

Browse Source 
TODO:
* RegionPagerBase::Update() is a stub
* MapFileFormat
* MapGenerator
* Can replace the calls to std::find_if() with a utility function
This commit is contained in:
Kayne Ruse
2014-02-23 03:08:37 +11:00
parent 31c8bd7fd2
commit 37b02352e2
2 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/map/region_pager.cpp
+7 -7
View File
@@ -38,25 +38,25 @@ RegionPagerBase::~RegionPagerBase() {
}
int RegionPagerBase::SetTile(int x, int y, int z, int v) {
Region* ptr = GetRegion(snapToBase(regionWidth, x), snapToBase(regionHeight, y));
Region* ptr = GetRegion(x, y);
return ptr->SetTile(x - ptr->GetX(), y = ptr->GetY(), z, v);
}
int RegionPagerBase::GetTile(int x, int y, int z) {
Region* ptr = GetRegion(snapToBase(regionWidth, x), snapToBase(regionHeight, y));
Region* ptr = GetRegion(x, y);
return ptr->GetTile(x - ptr->GetX(), y = ptr->GetY(), z);
}
Region* RegionPagerBase::GetRegion(int x, int y) {
//TODO: clean this up
//snap the coords
x = snapToBase(regionWidth, x);
y = snapToBase(regionHeight, y);
Region* ptr = nullptr;
//find the loaded region
auto iter = std::find_if(regionList.begin(), regionList.end(), [x,y](Region& it) {
if (it.GetX() == x && it.GetY() == y)
return true;
else
return false;
return it.GetX() == x && it.GetY() == y;
});
if (iter != regionList.end()) { //ugly hack
ptr = &(*iter);