Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r4431) - NewGRF: rename nfo_line to _nfo_line, to avoid confusing Darkvater ;)

Browse Source
This commit is contained in:
peter1138 2006-04-15 16:40:54 +00:00
parent e21b7eebfa
commit 3e8423f5d8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
newgrf.c
View File

@ -38,7 +38,7 @@ static GRFFile *_cur_grffile;
GRFFile *_first_grffile; GRFFile *_first_grffile;
static int _cur_spriteid; static int _cur_spriteid;
static int _cur_stage; static int _cur_stage;
static int nfo_line; static int _nfo_line;
/* 32 * 8 = 256 flags. Apparently TTDPatch uses this many.. */ /* 32 * 8 = 256 flags. Apparently TTDPatch uses this many.. */
static uint32 _ttdpatch_flags[8]; static uint32 _ttdpatch_flags[8];
@ -116,7 +116,7 @@ static void CDECL grfmsg(grfmsg_severity severity, const char *str, ...)
va_end(va); va_end(va);
export_severity = 2 - (severity == GMS_FATAL ? 2 : severity); 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++) { for (i = 0; i < num_sets * num_ents; i++) {
LoadNextSprite(_cur_spriteid++, _file_index); 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++) { for (j = 0; j < num_sprites; j++) {
LoadNextSprite(first_sprite + j, _file_index); // XXX 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 _skip_sprites = 0; // XXX
nfo_line = 0; _nfo_line = 0;
while ((num = FioReadWord()) != 0) { while ((num = FioReadWord()) != 0) {
byte type = FioReadByte(); byte type = FioReadByte();
nfo_line++; _nfo_line++;
if (type == 0xFF) { if (type == 0xFF) {
if (_skip_sprites == 0) { if (_skip_sprites == 0) {