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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-04-29 18:00:21 +01:00
parent 03bdb28c02 e79724ea22
commit c4e2175cc9
76 changed files with 628 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/map_func.h
View File

@@ -143,11 +143,11 @@ static inline uint ScaleByMapSize1D(uint n)
}
/**
* An offset value between to tiles.
* An offset value between two tiles.
*
* This value is used for the difference between
* two tiles. It can be added to a tileindex to get
* the resulting tileindex of the start tile applied
* two tiles. It can be added to a TileIndex to get
* the resulting TileIndex of the start tile applied
* with this saved difference.
*
* @see TileDiffXY(int, int)
@@ -169,7 +169,7 @@ static inline TileIndex TileXY(uint x, uint y)
/**
* Calculates an offset for the given coordinate(-offset).
*
* This function calculate an offset value which can be added to an
* This function calculate an offset value which can be added to a
* #TileIndex. The coordinates can be negative.
*
* @param x The offset in x direction
@@ -232,7 +232,7 @@ static inline uint TileY(TileIndex tile)
}
/**
* Return the offset between to tiles from a TileIndexDiffC struct.
* Return the offset between two tiles from a TileIndexDiffC struct.
*
* This function works like #TileDiffXY(int, int) and returns the
* difference between two tiles.
@@ -249,7 +249,7 @@ static inline TileIndexDiff ToTileIndexDiff(TileIndexDiffC tidc)
#ifndef _DEBUG
/**
* Adds to tiles together.
* Adds two tiles together.
*
* @param x One tile
* @param y Another tile to add