Mercurial > hg > openttd

changeset 3557:5aac82e40f00 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r4431) - NewGRF: rename nfo_line to _nfo_line, to avoid confusing Darkvater ;)
author peter1138 <peter1138@openttd.org>
date Sat, 15 Apr 2006 16:40:54 +0000
parents e2b102ead39a
children 8d7e22e24327
files newgrf.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/newgrf.c
+++ b/newgrf.c
@@ -38,7 +38,7 @@
 GRFFile *_first_grffile;
 static int _cur_spriteid;
 static int _cur_stage;
-static int nfo_line;
+static int _nfo_line;
 
 /* 32 * 8 = 256 flags. Apparently TTDPatch uses this many.. */
 static uint32 _ttdpatch_flags[8];
@@ -116,7 +116,7 @@
 	va_end(va);
 
 	export_severity = 2 - (severity == GMS_FATAL ? 2 : severity);
-	DEBUG(grf, export_severity) ("[%s:%d][%s] %s", _cur_grffile->filename, nfo_line, severitystr[severity], buf);
+	DEBUG(grf, export_severity) ("[%s:%d][%s] %s", _cur_grffile->filename, _nfo_line, severitystr[severity], buf);
 }
 
 
@@ -1286,7 +1286,7 @@
 
 	for (i = 0; i < num_sets * num_ents; i++) {
 		LoadNextSprite(_cur_spriteid++, _file_index);
-		nfo_line++;
+		_nfo_line++;
 	}
 }
 
@@ -2012,7 +2012,7 @@
 
 		for (j = 0; j < num_sprites; j++) {
 			LoadNextSprite(first_sprite + j, _file_index); // XXX
-			nfo_line++;
+			_nfo_line++;
 		}
 	}
 }
@@ -2566,11 +2566,11 @@
 	}
 
 	_skip_sprites = 0; // XXX
-	nfo_line = 0;
+	_nfo_line = 0;
 
 	while ((num = FioReadWord()) != 0) {
 		byte type = FioReadByte();
-		nfo_line++;
+		_nfo_line++;
 
 		if (type == 0xFF) {
 			if (_skip_sprites == 0) {