dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-11' into save_ext

Browse Source 
# Conflicts:
#	src/saveload/saveload.h
This commit is contained in:
Jonathan G Rennison
2019-02-13 18:51:53 +00:00
parent 46b5b0155c 466b9a9595
commit 1db19208ba
108 changed files with 795 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings.cpp
View File

@@ -1227,8 +1227,8 @@ static bool CheckFreeformEdges(int32 p1)
return false;
}
}
for (uint i = 0; i < MapSizeX(); i++) MakeVoid(TileXY(i, 0));
for (uint i = 0; i < MapSizeY(); i++) MakeVoid(TileXY(0, i));
for (uint x = 0; x < MapSizeX(); x++) MakeVoid(TileXY(x, 0));
for (uint y = 0; y < MapSizeY(); y++) MakeVoid(TileXY(0, y));
} else {
for (uint i = 0; i < MapMaxX(); i++) {
if (TileHeight(TileXY(i, 1)) != 0) {