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

Merge branch 'cpp-11' into crashlog_improvements

Browse Source 
# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
This commit is contained in:
Jonathan G Rennison
2018-04-27 00:33:44 +01:00
parent 4a6ddb2d50 b90c5b9618
commit f42cc19aad
253 changed files with 9829 additions and 2475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tile_map.h
View File

@@ -44,7 +44,7 @@ uint TileHeightOutsideMap(int x, int y);
* @param tile The tile to change the height
* @param height The new height value of the tile
* @pre tile < MapSize()
* @pre heigth <= MAX_TILE_HEIGHT
* @pre height <= MAX_TILE_HEIGHT
*/
static inline void SetTileHeight(TileIndex tile, uint height)
{