Merge branch 'master' into jgrpp
# Conflicts: # source.list # src/blitter/32bpp_anim.cpp # src/linkgraph/linkgraphjob.cpp # src/order_cmd.cpp # src/vehicle.cpp # src/vehicle_type.h
This commit is contained in:
@@ -253,7 +253,7 @@ struct GRFFile : ZeroedMemoryAllocator {
|
||||
|
||||
struct LanguageMap *language_map; ///< Mappings related to the languages.
|
||||
|
||||
int traininfo_vehicle_pitch; ///< Vertical offset for draing train images in depot GUI and vehicle details
|
||||
int traininfo_vehicle_pitch; ///< Vertical offset for drawing train images in depot GUI and vehicle details
|
||||
uint traininfo_vehicle_width; ///< Width (in pixels) of a 8/8 train vehicle in depot GUI and vehicle details
|
||||
|
||||
uint32 grf_features; ///< Bitset of GrfSpecFeature the grf uses
|
||||
|
Reference in New Issue
Block a user