dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/fios.h
This commit is contained in:
Jonathan G Rennison
2017-01-17 19:11:09 +00:00
parent 1ff60c44bf 2335acdc16
commit 90cd312428
94 changed files with 546 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf.h
View File

@@ -103,7 +103,6 @@ struct GRFLabel {
/** Dynamic data of a loaded NewGRF */
struct GRFFile : ZeroedMemoryAllocator {
char *filename;
bool is_ottdfile;
uint32 grfid;
byte grf_version;
@@ -184,7 +183,7 @@ extern GRFLoadedFeatures _loaded_newgrf_features;
byte GetGRFContainerVersion();
void LoadNewGRFFile(struct GRFConfig *config, uint file_index, GrfLoadingStage stage, Subdirectory subdir);
void LoadNewGRF(uint load_index, uint file_index);
void LoadNewGRF(uint load_index, uint file_index, uint num_baseset);
void ReloadNewGRFData(); // in saveload/afterload.cpp
void ResetNewGRFData();
void ResetPersistentNewGRFData();