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:
@@ -307,7 +307,7 @@ struct NewSignalStyle;
|
||||
|
||||
/** Dynamic data of a loaded NewGRF */
|
||||
struct GRFFile : ZeroedMemoryAllocator {
|
||||
char *filename;
|
||||
std::string filename;
|
||||
uint32 grfid;
|
||||
byte grf_version;
|
||||
|
||||
|
Reference in New Issue
Block a user