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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
This commit is contained in:
Jonathan G Rennison
2019-10-05 21:27:20 +01:00
parent 4438413f48 865eea8173
commit edfd378e93
132 changed files with 1354 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/track_func.h
View File

@@ -19,7 +19,7 @@
/**
* Iterate through each set Track in a TrackBits value.
* For more informations see FOR_EACH_SET_BIT_EX.
* For more information see FOR_EACH_SET_BIT_EX.
*
* @param var Loop index variable that stores fallowing set track. Must be of type Track.
* @param track_bits The value to iterate through (any expression).
@@ -127,7 +127,7 @@ static inline TrackdirBits TrackdirToTrackdirBits(Trackdir trackdir)
/**
* Removes first Track from TrackBits and returns it
*
* This function searchs for the first bit in the TrackBits,
* This function searches for the first bit in the TrackBits,
* remove this bit from the parameter and returns the found
* bit as Track value. It returns INVALID_TRACK if the
* parameter was TRACK_BIT_NONE or INVALID_TRACK_BIT. This
@@ -647,7 +647,7 @@ static inline bool IsDiagonalTrackdir(Trackdir trackdir)
/**
* Checks if the given tracks overlap, ie form a crossing. Basically this
* means when there is more than one track on the tile, exept when there are
* means when there is more than one track on the tile, except when there are
* two parallel tracks.
* @param bits The tracks present.
* @return Whether the tracks present overlap in any way.