summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-08-02 16:04:24 +0000
committeryexo <yexo@openttd.org>2010-08-02 16:04:24 +0000
commit6371e6c4db8a131911da091563818c2c8cfa92f0 (patch)
tree915eb5269a41df6de54263d163533024853a1321
parent56f964eb646a08486ce7351f9c75d5cdce3a5ede (diff)
downloadopenttd-6371e6c4db8a131911da091563818c2c8cfa92f0.tar.xz
(svn r20307) -Fix (r20305): the palette for baseset extra grfs was never set so it defaulted to dos
-rw-r--r--src/newgrf_config.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index afe99e1ae..6807a5d5d 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -286,6 +286,7 @@ bool FillGRFDetails(GRFConfig *config, bool is_static)
/* Find and load the Action 8 information */
LoadNewGRFFile(config, CONFIG_SLOT, GLS_FILESCAN);
+ config->SetSuitablePalette();
/* Skip if the grfid is 0 (not read) or 0xFFFFFFFF (ttdp system grf) */
if (config->ident.grfid == 0 || config->ident.grfid == 0xFFFFFFFF || config->IsOpenTTDBaseGRF()) return false;
@@ -298,8 +299,6 @@ bool FillGRFDetails(GRFConfig *config, bool is_static)
if (HasBit(config->flags, GCF_UNSAFE)) return false;
}
- config->SetSuitablePalette();
-
return CalcGRFMD5Sum(config);
}