diff options
| author | peter1138 <peter1138@openttd.org> | 2006-12-10 10:12:54 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-12-10 10:12:54 +0000 |
| commit | 778f97c78650897448d9d901be2943bde99a0a45 (patch) | |
| tree | 1057be97aa54b3375d99e586bbd3e51c7535ccc0 | |
| parent | 6bc56c61e3638e37c03b09016713fee214cfb588 (diff) | |
| download | openttd-778f97c78650897448d9d901be2943bde99a0a45.tar.xz | |
(svn r7463) -Codechange: Don't load invalid NewGRF files from the configuration file; instead show a warning.
| -rw-r--r-- | settings.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/settings.c b/settings.c index 39fa1e03c..429585e02 100644 --- a/settings.c +++ b/settings.c @@ -1505,7 +1505,10 @@ const char *GRFProcessParams(const IniItem *item, uint index) /* Loading newgrf stuff from configuration file */ c = calloc(1, sizeof(*c)); c->filename = strdup(item->name); - FillGRFDetails(c); + if (!FillGRFDetails(c)) { + ShowInfoF("ini: ignoring invalid NewGRF '%s'", c->filename); + return NULL; + } if (*item->value != '\0') { c->num_params = parse_intlist(item->value, (int*)c->param, lengthof(c->param)); |