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 r8964) -Codechange: use grf_load_string to read action 8 strings instead of trying to do the same manually.

Browse Source
This commit is contained in:
rubidium 2007-03-01 23:37:05 +00:00
parent c53f174005
commit cd8090f3bd
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/newgrf.cpp
View File

@ -2628,8 +2628,6 @@ static void ScanInfo(byte *buf, int len)
uint32 grfid;
const char *name;
const char *info;
int name_len;
int info_len;
if (!check_length(len, 8, "Info")) return; buf++;
version = grf_load_byte(&buf);
@ -2641,17 +2639,13 @@ static void ScanInfo(byte *buf, int len)
if (GB(grfid, 24, 8) == 0xFF) SETBIT(_cur_grfconfig->flags, GCF_SYSTEM);
len -= 6;
name = (const char*)buf;
name_len = ttd_strnlen(name, len);
name = grf_load_string(&buf, len);
_cur_grfconfig->name = TranslateTTDPatchCodes(name);
if (name_len < len) {
_cur_grfconfig->name = TranslateTTDPatchCodes(name);
len -= name_len + 1;
info = name + name_len + 1;
info_len = ttd_strnlen(info, len);
if (info_len < len) _cur_grfconfig->info = TranslateTTDPatchCodes(info);
len -= strlen(name) + 1;
if (len > 0) {
info = grf_load_string(&buf, len);
_cur_grfconfig->info = TranslateTTDPatchCodes(info);
}
/* GLS_INFOSCAN only looks for the action 8, so we can skip the rest of the file */