Mercurial > hg > openttd

changeset 17637:7fce3eb88c81 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22408) -Cleanup: remove unused variable GRFFile::sprite_offset
author yexo <yexo@openttd.org>
date Sun, 01 May 2011 20:46:36 +0000
parents 738f9aa852a5
children 7f017140fa5b
files src/newgrf.cpp src/newgrf.h
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -7334,12 +7334,11 @@
 	}
 }
 
-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 @@
 	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 @@
 				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);
--- a/src/newgrf.h
+++ b/src/newgrf.h
@@ -77,7 +77,6 @@
 	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