summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-11-10 17:03:01 +0000
committerrubidium <rubidium@openttd.org>2010-11-10 17:03:01 +0000
commit016b9f289f1284eda23ba85aa41e5bad38344b4c (patch)
treeb0e047b998c2be23ab85c65c999090e9a606eca2 /src
parentbb19bdd566869e9b47fb9971b058c189c99a4ba5 (diff)
downloadopenttd-016b9f289f1284eda23ba85aa41e5bad38344b4c.tar.xz
(svn r21130) -Fix [FS#4208-ish]: under some circumstances static (disabled/influencing) NewGRFs weren't properly ignored which could cause a desync
Diffstat (limited to 'src')
-rw-r--r--src/newgrf.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 47acb389e..d8932c9f5 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -5073,7 +5073,7 @@ static void SkipIf(ByteReader *buf)
GRFConfig *c = GetGRFConfig(cond_val, mask);
- if (c != NULL && HasBit(c->flags, GCF_STATIC) && !HasBit(_cur_grfconfig->flags, GCF_STATIC) && c->status != GCS_DISABLED && _networking) {
+ if (c != NULL && HasBit(c->flags, GCF_STATIC) && !HasBit(_cur_grfconfig->flags, GCF_STATIC) && _networking) {
DisableStaticNewGRFInfluencingNonStaticNewGRFs(c);
c = NULL;
}