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

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/signal_func.h
View File

@@ -44,9 +44,9 @@ extern bool _signal_sprite_oversized;
* Maps a trackdir to the bit that stores its status in the map arrays, in the
* direction along with the trackdir.
*/
inline byte SignalAlongTrackdir(Trackdir trackdir)
inline uint8_t SignalAlongTrackdir(Trackdir trackdir)
{
extern const byte _signal_along_trackdir[TRACKDIR_END];
extern const uint8_t _signal_along_trackdir[TRACKDIR_END];
return _signal_along_trackdir[trackdir];
}
@@ -54,9 +54,9 @@ inline byte SignalAlongTrackdir(Trackdir trackdir)
* Maps a trackdir to the bit that stores its status in the map arrays, in the
* direction against the trackdir.
*/
inline byte SignalAgainstTrackdir(Trackdir trackdir)
inline uint8_t SignalAgainstTrackdir(Trackdir trackdir)
{
extern const byte _signal_against_trackdir[TRACKDIR_END];
extern const uint8_t _signal_against_trackdir[TRACKDIR_END];
return _signal_against_trackdir[trackdir];
}
@@ -64,9 +64,9 @@ inline byte SignalAgainstTrackdir(Trackdir trackdir)
* Maps a Track to the bits that store the status of the two signals that can
* be present on the given track.
*/
inline byte SignalOnTrack(Track track)
inline uint8_t SignalOnTrack(Track track)
{
extern const byte _signal_on_track[TRACK_END];
extern const uint8_t _signal_on_track[TRACK_END];
return _signal_on_track[track];
}