Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release-linux.yml # src/aircraft_cmd.cpp # src/airport_gui.cpp # src/articulated_vehicles.cpp # src/build_vehicle_gui.cpp # src/company_gui.cpp # src/genworld_gui.cpp # src/gfx_layout.cpp # src/misc_gui.cpp # src/newgrf.cpp # src/newgrf_config.h # src/newgrf_engine.cpp # src/news_gui.cpp # src/order_gui.cpp # src/roadveh_cmd.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/statusbar_gui.cpp # src/table/settings/network_private_settings.ini # src/table/settings/network_settings.ini # src/toolbar_gui.cpp # src/train_cmd.cpp # src/vehicle_gui.cpp
This commit is contained in:
@@ -360,7 +360,7 @@ public:
|
||||
uint32 motion_counter; ///< counter to occasionally play a vehicle sound. (Also used as virtual train client ID).
|
||||
byte progress; ///< The percentage (if divided by 256) this vehicle already crossed the tile unit.
|
||||
|
||||
byte random_bits; ///< Bits used for determining which randomized variational spritegroups to use when drawing.
|
||||
uint16 random_bits; ///< Bits used for randomized variational spritegroups.
|
||||
byte waiting_triggers; ///< Triggers to be yet matched before rerandomizing the random bits.
|
||||
|
||||
StationID last_station_visited; ///< The last station we stopped at.
|
||||
|
Reference in New Issue
Block a user