cpp/openttd-patchpack/source Changeset - r18007:5ef6f0cf0861

Changeset - r18007:5ef6f0cf0861

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 13 years ago 2011-08-24 13:48:29
rubidium@openttd.org

(svn r22826) -Codechange: pass sub directory to NewGRF loading functions

5 files changed with 31 insertions and 14 deletions:

src/gfxinit.cpp

src/newgrf.cpp

src/newgrf.h

src/newgrf_config.cpp

src/newgrf_config.h

0 comments (0 inline, 0 general)

src/gfxinit.cpp

➞

Show inline comments

@@ @@ -177,13 +177,13 @@ static void LoadSpriteTables() @@
 	 * The value set here might be overridden via action14 later. */
 	switch (used_set->palette) {
 		case PAL_DOS:     master->palette |= GRFP_GRF_DOS;     break;
 		case PAL_WINDOWS: master->palette |= GRFP_GRF_WINDOWS; break;
 		default: break;
+	}
 	FillGRFDetails(master, false);
+	FillGRFDetails(master, false, BASESET_DIR);
 	ClrBit(master->flags, GCF_INIT_ONLY);
 	master->next = top;
 	_grfconfig = master;
 	LoadNewGRF(SPR_NEWGRFS_BASE, i);

src/newgrf.cpp

➞

Show inline comments

@@ @@ -8073,13 +8073,20 @@ static void DecodeSpecialSprite(byte *bu @@
 		grfmsg(1, "DecodeSpecialSprite: Tried to read past end of pseudo-sprite data");
 		DisableGrf(STR_NEWGRF_ERROR_READ_BOUNDS);
+	}
+}
 void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage)
 /**
  * Load a particular NewGRF.
  * @param config     The configuration of the to be loaded NewGRF.
  * @param file_index The Fio index of the first NewGRF to load.
  * @param stage      The loading stage of the NewGRF.
  * @param subdir     The sub directory to find the NewGRF in.
  */
 void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage, Subdirectory subdir)
+{
 	const char *filename = config->filename;
 	uint16 num;
 	/* A .grf file is activated only if it was active when the game was
 	 * started.  If a game is loaded, only its active .grfs will be
@@ @@ -8102,13 +8109,13 @@ void LoadNewGRFFile(GRFConfig *config, u @@
 		DEBUG(grf, 0, "'%s' is not loaded as the maximum number of GRFs has been reached", filename);
 		config->status = GCS_DISABLED;
 		config->error  = new GRFError(STR_NEWGRF_ERROR_MSG_FATAL, STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED);
 		return;
+	}
-	FioOpenFile(file_index, filename, NEWGRF_DIR);
+	FioOpenFile(file_index, filename, subdir);
 	_cur.file_index = file_index; // XXX
 	_palette_remap_grf[_cur.file_index] = (config->palette & GRFP_USE_MASK);
 	_cur.grfconfig = config;
 	DEBUG(grf, 2, "LoadNewGRFFile: Reading NewGRF-file '%s'", filename);
@@ @@ -8401,12 +8408,17 @@ static void AfterLoadGRFs() @@
 	/* Deallocate temporary loading data */
 	free(_gted);
 	_grm_sprites.clear();
+}
 /**
  * Load all the NewGRFs.
  * @param load_index The offset for the first sprite to add.
  * @param file_index The Fio index of the first NewGRF to load.
  */
 void LoadNewGRF(uint load_index, uint file_index)
+{
 	/* In case of networking we need to "sync" the start values
 	 * so all NewGRFs are loaded equally. For this we use the
 	 * start date of the game and we set the counters, etc. to
 	 * 0 so they're the same too. */
@@ @@ -8455,20 +8467,21 @@ void LoadNewGRF(uint load_index, uint fi @@
 		_cur.stage = stage;
 		for (GRFConfig *c = _grfconfig; c != NULL; c = c->next) {
 			if (c->status == GCS_DISABLED || c->status == GCS_NOT_FOUND) continue;
 			if (stage > GLS_INIT && HasBit(c->flags, GCF_INIT_ONLY)) continue;
 			if (!FioCheckFileExists(c->filename)) {
 			Subdirectory subdir = slot == file_index ? BASESET_DIR : NEWGRF_DIR;
 			if (!FioCheckFileExists(c->filename, subdir)) {
 				DEBUG(grf, 0, "NewGRF file is missing '%s'; disabling", c->filename);
 				c->status = GCS_NOT_FOUND;
 				continue;
+			}
 			if (stage == GLS_LABELSCAN) InitNewGRFFile(c);
 			LoadNewGRFFile(c, slot++, stage);
+			LoadNewGRFFile(c, slot++, stage, subdir);
 			if (stage == GLS_RESERVE) {
 				SetBit(c->flags, GCF_RESERVED);
 			} else if (stage == GLS_ACTIVATION) {
 				ClrBit(c->flags, GCF_RESERVED);
 				assert(GetFileByGRFID(c->ident.grfid) == _cur.grffile);
 				ClearTemporaryNewGRFData(_cur.grffile);

src/newgrf.h

➞

Show inline comments

@@ @@ -11,12 +11,13 @@ @@
 #ifndef NEWGRF_H
 #define NEWGRF_H
 #include "cargotype.h"
 #include "rail_type.h"
 #include "fileio_type.h"
 enum GrfLoadingStage {
 	GLS_FILESCAN,
 	GLS_SAFETYSCAN,
 	GLS_LABELSCAN,
 	GLS_INIT,
@@ @@ -136,13 +137,13 @@ struct GRFLoadedFeatures { @@
 	ShoreReplacement shore;   ///< It which way shore sprites were replaced.
 };
 /* Indicates which are the newgrf features currently loaded ingame */
 extern GRFLoadedFeatures _loaded_newgrf_features;
 void LoadNewGRFFile(struct GRFConfig *config, uint file_index, GrfLoadingStage stage);
+void LoadNewGRFFile(struct GRFConfig *config, uint file_index, GrfLoadingStage stage, Subdirectory subdir);
 void LoadNewGRF(uint load_index, uint file_index);
 void ReloadNewGRFData(); // in saveload/afterload.cpp
 void ResetNewGRFData();
 void ResetPersistentNewGRFData();
 void CDECL grfmsg(int severity, const char *str, ...) WARN_FORMAT(2, 3);

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -279,23 +279,24 @@ bool UpdateNewGRFConfigPalette(int32 p1) @@
 	return true;
+}
 /**
  * Calculate the MD5 sum for a GRF, and store it in the config.
  * @param config GRF to compute.
  * @param subdir The subdirectory to look in.
  * @return MD5 sum was successfully computed
  */
 static bool CalcGRFMD5Sum(GRFConfig *config)
+static bool CalcGRFMD5Sum(GRFConfig *config, Subdirectory subdir)
+{
 	FILE *f;
 	Md5 checksum;
 	uint8 buffer[1024];
 	size_t len, size;
 	/* open the file */
-	f = FioFOpenFile(config->filename, "rb", NEWGRF_DIR, &size);
+	f = FioFOpenFile(config->filename, "rb", subdir, &size);
 	if (f == NULL) return false;
 	/* calculate md5sum */
 	while ((len = fread(buffer, 1, (size > sizeof(buffer)) ? sizeof(buffer) : size, f)) != 0 && size != 0) {
 		size -= len;
 		checksum.Append(buffer, len);
@@ @@ -309,37 +310,38 @@ static bool CalcGRFMD5Sum(GRFConfig *con @@
 /**
  * Find the GRFID of a given grf, and calculate its md5sum.
  * @param config    grf to fill.
  * @param is_static grf is static.
  * @param subdir    the subdirectory to search in.
  * @return Operation was successfully completed.
  */
 bool FillGRFDetails(GRFConfig *config, bool is_static)
+bool FillGRFDetails(GRFConfig *config, bool is_static, Subdirectory subdir)
+{
 	if (!FioCheckFileExists(config->filename)) {
+	if (!FioCheckFileExists(config->filename, subdir)) {
 		config->status = GCS_NOT_FOUND;
 		return false;
+	}
 	/* Find and load the Action 8 information */
 	LoadNewGRFFile(config, CONFIG_SLOT, GLS_FILESCAN);
+	LoadNewGRFFile(config, CONFIG_SLOT, GLS_FILESCAN, subdir);
 	config->SetSuitablePalette();
 	/* Skip if the grfid is 0 (not read) or 0xFFFFFFFF (ttdp system grf) */
 	if (config->ident.grfid == 0 || config->ident.grfid == 0xFFFFFFFF || config->IsOpenTTDBaseGRF()) return false;
 	if (is_static) {
 		/* Perform a 'safety scan' for static GRFs */
 		LoadNewGRFFile(config, 62, GLS_SAFETYSCAN);
+		LoadNewGRFFile(config, 62, GLS_SAFETYSCAN, subdir);
 		/* GCF_UNSAFE is set if GLS_SAFETYSCAN finds unsafe actions */
 		if (HasBit(config->flags, GCF_UNSAFE)) return false;
+	}
 	return CalcGRFMD5Sum(config);
+	return CalcGRFMD5Sum(config, subdir);
+}
 /**
  * Clear a GRF Config list, freeing all nodes.
  * @param config Start of the list.

src/newgrf_config.h

➞

Show inline comments

@@ @@ -13,12 +13,13 @@ @@
 #define NEWGRF_CONFIG_H
 #include "strings_type.h"
 #include "core/alloc_type.hpp"
 #include "core/smallmap_type.hpp"
 #include "misc/countedptr.hpp"
 #include "fileio_type.h"
 /** GRF config bit flags */
 enum GCF_Flags {
 	GCF_SYSTEM,     ///< GRF file is an openttd-internal system grf
 	GCF_UNSAFE,     ///< GRF file is unsafe for static usage
 	GCF_STATIC,     ///< GRF file is used statically (can be used in any MP game)
@@ @@ -203,13 +204,13 @@ GRFConfig *GetGRFConfig(uint32 grfid, ui @@
 GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src, bool init_only);
 void AppendStaticGRFConfigs(GRFConfig **dst);
 void AppendToGRFConfigList(GRFConfig **dst, GRFConfig *el);
 void ClearGRFConfigList(GRFConfig **config);
 void ResetGRFConfig(bool defaults);
 GRFListCompatibility IsGoodGRFConfigList(GRFConfig *grfconfig);
 bool FillGRFDetails(GRFConfig *config, bool is_static);
+bool FillGRFDetails(GRFConfig *config, bool is_static, Subdirectory subdir = NEWGRF_DIR);
 char *GRFBuildParamList(char *dst, const GRFConfig *c, const char *last);
 /* In newgrf_gui.cpp */
 void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config);
 #ifdef ENABLE_NETWORK

0 comments (0 inline, 0 general)