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

(svn r3311) Remove the unnecessary global variable _grffile_count: It's just the scroll count of a list and furthermore only used in one file

release/0.4.5
tron 2005-12-18 08:01:05 +00:00
parent bd909b0952
commit 2956b119b2
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newgrf.c
View File

@ -35,7 +35,6 @@ extern int _traininfo_vehicle_pitch;
static GRFFile *_cur_grffile; static GRFFile *_cur_grffile;
GRFFile *_first_grffile; GRFFile *_first_grffile;
int _grffile_count;
static int _cur_spriteid; static int _cur_spriteid;
static int _cur_stage; static int _cur_stage;

1
newgrf.h
View File

@ -40,7 +40,6 @@ struct GRFFile {
uint param_end; /// one more than the highest set parameter uint param_end; /// one more than the highest set parameter
}; };
extern int _grffile_count;
extern GRFFile *_first_grffile; extern GRFFile *_first_grffile;

16
settings_gui.c
View File

@ -1221,7 +1221,7 @@ static void NewgrfWndProc(Window *w, WindowEvent *e)
y += w->vscroll.pos; y += w->vscroll.pos;
if (y >= _grffile_count) return; if (y >= w->vscroll.count) return;
_sel_grffile = _first_grffile; _sel_grffile = _first_grffile;
// get selected grf-file // get selected grf-file
@ -1281,20 +1281,18 @@ static const WindowDesc _newgrf_desc = {
void ShowNewgrf(void) void ShowNewgrf(void)
{ {
const GRFFile* c;
Window *w; Window *w;
uint count;
DeleteWindowById(WC_GAME_OPTIONS, 0); DeleteWindowById(WC_GAME_OPTIONS, 0);
w = AllocateWindowDesc(&_newgrf_desc); w = AllocateWindowDesc(&_newgrf_desc);
{ // little helper function to calculate _grffile_count count = 0;
// should be REMOVED once _grffile_count is calculated at loading for (c = _first_grffile; c != NULL; c = c->next) count++;
const GRFFile* c;
_grffile_count = 0;
for (c = _first_grffile; c != NULL; c = c->next) _grffile_count++;
}
w->vscroll.cap = 12; w->vscroll.cap = 12;
w->vscroll.count = _grffile_count; w->vscroll.count = count;
w->vscroll.pos = 0; w->vscroll.pos = 0;
w->disabled_state = (1 << 5) | (1 << 6) | (1 << 7); w->disabled_state = (1 << 5) | (1 << 6) | (1 << 7);
} }