diff options
| author | Darkvater <Darkvater@openttd.org> | 2007-01-14 22:43:19 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2007-01-14 22:43:19 +0000 |
| commit | 6133bd1b31b0216ed4106f06d70a93991863a06b (patch) | |
| tree | d981dc3a7acdbde7f4728e2eff646dd8507970c7 /src/newgrf_config.cpp | |
| parent | 62db889664e7c6bb74fc5268ff7de111bc4f6c25 (diff) | |
| download | openttd-6133bd1b31b0216ed4106f06d70a93991863a06b.tar.xz | |
(svn r8135) -Fix (r7582): Don't assert on duplicate non-static grfs when removing duplicates as the PEBKAC effect can result in the user adding the same grf's in the config file.
Diffstat (limited to 'src/newgrf_config.cpp')
| -rw-r--r-- | src/newgrf_config.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index 39cb9215d..288d06aba 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -157,7 +157,7 @@ static void RemoveDuplicatesFromGRFConfigList(GRFConfig *list) for (prev = list, cur = list->next; cur != NULL; prev = cur, cur = cur->next) { if (cur->grfid != list->grfid) continue; - assert(HASBIT(cur->flags, GCF_STATIC)); + prev->next = cur->next; ClearGRFConfig(&cur); cur = prev; // Just go back one so it continues as normal later on |