mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20252) -Codechange: deduplicate logic for setting a suitable (initial) palette for NewGRFs

release/1.1
rubidium 2010-07-31 09:36:09 +00:00
parent 75c4a2d2fb
commit f7794e313f
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf_config.cpp
View File

@ -85,6 +85,16 @@ const char *GRFConfig::GetDescription() const
return GetGRFStringFromGRFText(this->info); return GetGRFStringFromGRFText(this->info);
} }
/**
* Set the palette of this GRFConfig to something suitable.
* That is either the setting coming from the NewGRF or
* the globally used palette.
*/
void GRFConfig::SetSuitablePalette()
{
this->windows_paletted = (_use_palette == PAL_WINDOWS);
}
GRFConfig *_all_grfs; GRFConfig *_all_grfs;
GRFConfig *_grfconfig; GRFConfig *_grfconfig;
GRFConfig *_grfconfig_newgame; GRFConfig *_grfconfig_newgame;
@ -133,8 +143,8 @@ GRFError::~GRFError()
*/ */
void UpdateNewGRFConfigPalette() void UpdateNewGRFConfigPalette()
{ {
for (GRFConfig *c = _grfconfig_newgame; c != NULL; c = c->next) c->windows_paletted = (_use_palette == PAL_WINDOWS); for (GRFConfig *c = _grfconfig_newgame; c != NULL; c = c->next) c->SetSuitablePalette();
for (GRFConfig *c = _grfconfig_static; c != NULL; c = c->next) c->windows_paletted = (_use_palette == PAL_WINDOWS); for (GRFConfig *c = _grfconfig_static; c != NULL; c = c->next) c->SetSuitablePalette();
} }
/** Calculate the MD5 sum for a GRF, and store it in the config. /** Calculate the MD5 sum for a GRF, and store it in the config.
@ -191,7 +201,7 @@ bool FillGRFDetails(GRFConfig *config, bool is_static)
if (HasBit(config->flags, GCF_UNSAFE)) return false; if (HasBit(config->flags, GCF_UNSAFE)) return false;
} }
config->windows_paletted = (_use_palette == PAL_WINDOWS); config->SetSuitablePalette();
return CalcGRFMD5Sum(config); return CalcGRFMD5Sum(config);
} }

2
src/newgrf_config.h
View File

@ -108,6 +108,8 @@ struct GRFConfig : ZeroedMemoryAllocator {
const char *GetName() const; const char *GetName() const;
const char *GetDescription() const; const char *GetDescription() const;
void SetSuitablePalette();
}; };
extern GRFConfig *_all_grfs; ///< First item in list of all scanned NewGRFs extern GRFConfig *_all_grfs; ///< First item in list of all scanned NewGRFs

2
src/saveload/newgrf_sl.cpp
View File

@ -47,7 +47,7 @@ static void Load_NGRF_common(GRFConfig *&grfconfig)
while (SlIterateArray() != -1) { while (SlIterateArray() != -1) {
GRFConfig *c = new GRFConfig(); GRFConfig *c = new GRFConfig();
SlObject(c, _grfconfig_desc); SlObject(c, _grfconfig_desc);
if (CheckSavegameVersion(101)) c->windows_paletted = (_use_palette == PAL_WINDOWS); if (CheckSavegameVersion(101)) c->SetSuitablePalette();
AppendToGRFConfigList(&grfconfig, c); AppendToGRFConfigList(&grfconfig, c);
} }
} }