summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-12-18 08:01:05 +0000
committertron <tron@openttd.org>2005-12-18 08:01:05 +0000
commit2956b119b26c78df4973cf077e288501baeaf649 (patch)
tree12fb065c62ef1ffc637991f8ffdc249585d78330
parentbd909b0952aad3e65c39b5947042970a80dc8d10 (diff)
downloadopenttd-2956b119b26c78df4973cf077e288501baeaf649.tar.xz
(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
-rw-r--r--newgrf.c1
-rw-r--r--newgrf.h1
-rw-r--r--settings_gui.c16
3 files changed, 7 insertions, 11 deletions
diff --git a/newgrf.c b/newgrf.c
index 362accd28..895303dc6 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -35,7 +35,6 @@ extern int _traininfo_vehicle_pitch;
static GRFFile *_cur_grffile;
GRFFile *_first_grffile;
-int _grffile_count;
static int _cur_spriteid;
static int _cur_stage;
diff --git a/newgrf.h b/newgrf.h
index 50b9ba462..a5aeb49e6 100644
--- a/newgrf.h
+++ b/newgrf.h
@@ -40,7 +40,6 @@ struct GRFFile {
uint param_end; /// one more than the highest set parameter
};
-extern int _grffile_count;
extern GRFFile *_first_grffile;
diff --git a/settings_gui.c b/settings_gui.c
index 319d1a5c8..6f4430f39 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -1221,7 +1221,7 @@ static void NewgrfWndProc(Window *w, WindowEvent *e)
y += w->vscroll.pos;
- if (y >= _grffile_count) return;
+ if (y >= w->vscroll.count) return;
_sel_grffile = _first_grffile;
// get selected grf-file
@@ -1281,20 +1281,18 @@ static const WindowDesc _newgrf_desc = {
void ShowNewgrf(void)
{
+ const GRFFile* c;
Window *w;
+ uint count;
+
DeleteWindowById(WC_GAME_OPTIONS, 0);
w = AllocateWindowDesc(&_newgrf_desc);
- { // little helper function to calculate _grffile_count
- // should be REMOVED once _grffile_count is calculated at loading
- const GRFFile* c;
-
- _grffile_count = 0;
- for (c = _first_grffile; c != NULL; c = c->next) _grffile_count++;
- }
+ count = 0;
+ for (c = _first_grffile; c != NULL; c = c->next) count++;
w->vscroll.cap = 12;
- w->vscroll.count = _grffile_count;
+ w->vscroll.count = count;
w->vscroll.pos = 0;
w->disabled_state = (1 << 5) | (1 << 6) | (1 << 7);
}