From 6a1eb377aee6b5e85e9095d90e4ce95973a2df47 Mon Sep 17 00:00:00 2001 From: yexo Date: Sun, 1 May 2011 20:46:36 +0000 Subject: (svn r22408) -Cleanup: remove unused variable GRFFile::sprite_offset --- src/newgrf.cpp | 6 ++---- src/newgrf.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 200505474..4a14381e4 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -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 GRFConfig *config, int sprite_offset) newfile = CallocT(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 file_index) 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); diff --git a/src/newgrf.h b/src/newgrf.h index 4e7ef3f06..38567079e 100644 --- a/src/newgrf.h +++ b/src/newgrf.h @@ -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 -- cgit v1.2.3-54-g00ecf