cpp/openttd-patchpack/source Changeset - r17627:5bbfcefda44f

Changeset - r17627:5bbfcefda44f

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

yexo - 13 years ago 2011-05-01 20:46:36
yexo@openttd.org

(svn r22408) -Cleanup: remove unused variable GRFFile::sprite_offset

2 files changed with 2 insertions and 5 deletions:

src/newgrf.cpp

src/newgrf.h

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -7334,12 +7334,11 @@ static void BuildCargoTranslationMap() @@
+	}
+}
-static void InitNewGRFFile(const GRFConfig *config, int sprite_offset)
 static void InitNewGRFFile(const GRFConfig *config)
+{
 	GRFFile *newfile = GetFileByFilename(config->filename);
 	if (newfile != NULL) {
 		/* We already loaded it once. */
 		newfile->sprite_offset = sprite_offset;
 		_cur_grffile = newfile;
 		return;
+	}
@@ @@ -7347,7 +7346,6 @@ static void InitNewGRFFile(const GRFConf @@
 	newfile = CallocT<GRFFile>(1);
 	newfile->filename = strdup(config->filename);
 	newfile->sprite_offset = sprite_offset;
 	newfile->grfid = config->ident.grfid;
 	/* Initialise local settings to defaults */
@@ @@ -8304,7 +8302,7 @@ void LoadNewGRF(uint load_index, uint fi @@
 				continue;
+			}
-			if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
 			if (stage == GLS_LABELSCAN) InitNewGRFFile(c);
 			LoadNewGRFFile(c, slot++, stage);
 			if (stage == GLS_RESERVE) {
 				SetBit(c->flags, GCF_RESERVED);

src/newgrf.h

➞

Show inline comments

@@ @@ -77,7 +77,6 @@ struct GRFFile { @@
 	char *filename;
 	bool is_ottdfile;
 	uint32 grfid;
 	uint16 sprite_offset;
 	byte grf_version;
 	/* A sprite group contains all sprites of a given vehicle (or multiple

0 comments (0 inline, 0 general)