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

8
src/road_cmd.cpp
View File

@@ -1872,8 +1872,8 @@ static CommandCost ClearTile_Road(TileIndex tile, DoCommandFlag flags)
struct DrawRoadTileStruct {
uint16_t image;
byte subcoord_x;
byte subcoord_y;
uint8_t subcoord_x;
uint8_t subcoord_y;
};
#include "table/road_land.h"
@@ -1907,7 +1907,7 @@ Foundation GetRoadFoundation(Slope tileh, RoadBits bits)
return (bits == ROAD_X ? FOUNDATION_INCLINED_X : FOUNDATION_INCLINED_Y);
}
const byte _road_sloped_sprites[14] = {
const uint8_t _road_sloped_sprites[14] = {
0, 0, 2, 0,
0, 1, 0, 0,
3, 0, 0, 0,
@@ -2884,7 +2884,7 @@ static void GetTileDesc_Road(TileIndex tile, TileDesc *td)
* Given the direction the road depot is pointing, this is the direction the
* vehicle should be travelling in in order to enter the depot.
*/
static const byte _roadveh_enter_depot_dir[4] = {
static const uint8_t _roadveh_enter_depot_dir[4] = {
TRACKDIR_X_SW, TRACKDIR_Y_NW, TRACKDIR_X_NE, TRACKDIR_Y_SE
};