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

Apparently it was the #45 fix that broke collisions

Browse Source
This commit is contained in:
Kayne Ruse
2016-03-22 00:47:38 +11:00
parent 30aa11c083
commit 12f86f22de
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/scenes/world.cpp
+8 -1
View File
@@ -573,7 +573,14 @@ void World::hRegionContent(RegionPacket* const argPacket) {
//replace existing regions
regionPager.UnloadIf([&](Region const& region) -> bool {
return region.GetX() == argPacket->x && region.GetY() == argPacket->y;
if (region.GetX() == argPacket->x && region.GetY() == argPacket->y) {
std::cout << "Region Overwrite: " << region.GetX() << ", " << region.GetY();
std::cout << "\t" << region.GetSolid(1,1) << "\t" << argPacket->region->GetSolid(1,1) << std::endl;
return true;
}
else {
return false;
}
});
regionPager.PushRegion(argPacket->region);