summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2007-01-14 22:43:19 +0000
committerDarkvater <darkvater@openttd.org>2007-01-14 22:43:19 +0000
commitde10e911cbcc09b56eff3bc9ab4fe7045c3e6efc (patch)
treed981dc3a7acdbde7f4728e2eff646dd8507970c7 /src
parent82b0704bcc7a8632c5f6d8d57cc2aa1c7acb38b6 (diff)
downloadopenttd-de10e911cbcc09b56eff3bc9ab4fe7045c3e6efc.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')
-rw-r--r--src/newgrf_config.cpp2
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