commit cb009751

Poul Sander · 2020-11-03 19:37
cb00975123b64f308c7ea843b3e53158c4b7a656 patch · browse files
parent 85e0b9096280807801a65c8f1756bf8b6ab0d738

Fix borders counts as liquid

Changed files

M	src/terrain/WaterHandler.cpp before

diff --git a/src/terrain/WaterHandler.cpp b/src/terrain/WaterHandler.cpp index a7ca5fb..b64e04f 100644 --- a/src/terrain/WaterHandler.cpp +++ b/src/terrain/WaterHandler.cpp

@@ -148,11 +148,11 @@ bool WaterHandler::isWaterTile(uint32_t tile) const {

}

bool WaterHandler::isWater(const sago::tiled::TileMap& tm, int x, int y) const {

- if (x < 0 || y < 0 || x > tm.width || y > tm.height) {

+ if (x < 0 || y < 0 || x >= tm.width || y >= tm.height) {

//Assume that "water" is around the map

return true;

}

- int layer_number = 2; // Do not hardcode

+ int layer_number = blockingLayer;

uint32_t current_tile = sago::tiled::getTileFromLayer(tm, tm.layers.at(layer_number), x, y);

return tiles.find(current_tile) != tiles.end();

}