Merge branch 'master' into jgrpp

# Conflicts:
#	src/depot_type.h
#	src/lang/german.txt
#	src/order_gui.cpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/script/api/script_window.hpp.in
#	src/settings_table.cpp
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2022-11-05 17:18:01 +00:00
23 changed files with 233 additions and 155 deletions

View File

@@ -10,9 +10,13 @@
#ifndef DEPOT_TYPE_H
#define DEPOT_TYPE_H
#include "station_type.h"
typedef uint16 DepotID; ///< Type for the unique identifier of depots.
struct Depot;
static const DepotID INVALID_DEPOT = (DepotID)INVALID_STATION;
static const uint MAX_LENGTH_DEPOT_NAME_CHARS = 128; ///< The maximum length of a depot name in characters including '\0'
#endif /* DEPOT_TYPE_H */