summaryrefslogtreecommitdiff
path: root/newgrf.c
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-04-15 16:40:54 +0000
committerpeter1138 <peter1138@openttd.org>2006-04-15 16:40:54 +0000
commit3e8423f5d825380a49e6e8ed7ede40b6832b00e8 (patch)
treee31885e5d64326bb69e3f34b359889fb9b2e9a6e /newgrf.c
parente21b7eebfa519f537b259194cbb065cbb5893597 (diff)
downloadopenttd-3e8423f5d825380a49e6e8ed7ede40b6832b00e8.tar.xz
(svn r4431) - NewGRF: rename nfo_line to _nfo_line, to avoid confusing Darkvater ;)
Diffstat (limited to 'newgrf.c')
-rw-r--r--newgrf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/newgrf.c b/newgrf.c
index 60d94731b..7aff4d2f1 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -38,7 +38,7 @@ static GRFFile *_cur_grffile;
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 @@ static void CDECL grfmsg(grfmsg_severity severity, const char *str, ...)
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 @@ static void NewSpriteSet(byte *buf, int len)
for (i = 0; i < num_sets * num_ents; i++) {
LoadNextSprite(_cur_spriteid++, _file_index);
- nfo_line++;
+ _nfo_line++;
}
}
@@ -2012,7 +2012,7 @@ static void SpriteReplace(byte *buf, int len)
for (j = 0; j < num_sprites; j++) {
LoadNextSprite(first_sprite + j, _file_index); // XXX
- nfo_line++;
+ _nfo_line++;
}
}
}
@@ -2566,11 +2566,11 @@ static void LoadNewGRFFile(const char* filename, uint file_index, uint stage)
}
_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) {