cpp/openttd-patchpack/source Changeset - r2766:b664c382cd2a

Changeset - r2766:b664c382cd2a

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

tron - 19 years ago 2005-12-18 08:01:05
tron@openttd.org

(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

3 files changed with 7 insertions and 11 deletions:

newgrf.c

newgrf.h

settings_gui.c

0 comments (0 inline, 0 general)

newgrf.c

➞

Show inline comments

@@ @@ -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;

newgrf.h

➞

Show inline comments

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

settings_gui.c

➞

Show inline comments

@@ @@ -1221,7 +1221,7 @@ static void NewgrfWndProc(Window *w, Win @@
 			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);
+}

0 comments (0 inline, 0 general)