mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/1.2
yexo 2011-05-01 20:46:36 +00:00
parent 428044e033
commit 6a1eb377ae
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf.cpp
View File

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

1
src/newgrf.h
View File

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