Merge branch 'master' into jgrpp

# Conflicts: # src/cargopacket.h # src/cargotype.h # src/station_base.h # src/station_cmd.cpp # src/timer/timer_game_common.h # src/town.h
2024-06-13 20:38:38 +01:00
parent 4b169426dc b2218e75d4
commit de36e9545e
22 changed files with 107 additions and 117 deletions
--- a/src/town.h
+++ b/src/town.h
@@ -382,6 +382,7 @@ inline uint16_t TownTicksToGameTicks(uint16_t ticks)


 RoadType GetTownRoadType();
+bool CheckTownRoadTypes();
 bool MayTownModifyRoad(TileIndex tile);

 #endif /* TOWN_H */