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

(svn r19981) -Add: Read NewGRF configuration during SL_LOAD_CHECK.

release/1.1
frosch 2010-06-13 14:15:58 +00:00
parent 16618e6f16
commit d9b4d92050
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fios.h
View File

@ -20,6 +20,7 @@
#include "date_type.h" #include "date_type.h"
#include "settings_type.h" #include "settings_type.h"
#include "company_base.h" #include "company_base.h"
#include "newgrf_config.h"
typedef SmallMap<uint, CompanyProperties *> CompanyPropertiesMap; typedef SmallMap<uint, CompanyProperties *> CompanyPropertiesMap;
@ -39,7 +40,10 @@ struct LoadCheckData {
CompanyPropertiesMap companies; ///< Company information. CompanyPropertiesMap companies; ///< Company information.
LoadCheckData() : error_data(NULL) GRFConfig *grfconfig; ///< NewGrf configuration from save.
GRFListCompatibility grf_compatibility; ///< Summary state of NewGrfs, whether missing files or only compatible found.
LoadCheckData() : error_data(NULL), grfconfig(NULL)
{ {
this->Clear(); this->Clear();
} }

2
src/fios_gui.cpp
View File

@ -54,6 +54,8 @@ void LoadCheckData::Clear()
delete it->second; delete it->second;
} }
companies.Clear(); companies.Clear();
ClearGRFConfigList(&this->grfconfig);
} }

19
src/saveload/newgrf_sl.cpp
View File

@ -14,6 +14,7 @@
#include "../core/bitmath_func.hpp" #include "../core/bitmath_func.hpp"
#include "../core/alloc_func.hpp" #include "../core/alloc_func.hpp"
#include "../gfx_func.h" #include "../gfx_func.h"
#include "../fios.h"
#include "saveload.h" #include "saveload.h"
@ -40,20 +41,30 @@ static void Save_NGRF()
} }
static void Load_NGRF() static void Load_NGRF_common(GRFConfig *&grfconfig)
{ {
ClearGRFConfigList(&_grfconfig); ClearGRFConfigList(&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->windows_paletted = (_use_palette == PAL_WINDOWS);
AppendToGRFConfigList(&_grfconfig, c); AppendToGRFConfigList(&grfconfig, c);
} }
}
static void Load_NGRF()
{
Load_NGRF_common(_grfconfig);
/* Append static NewGRF configuration */ /* Append static NewGRF configuration */
AppendStaticGRFConfigs(&_grfconfig); AppendStaticGRFConfigs(&_grfconfig);
} }
static void Check_NGRF()
{
Load_NGRF_common(_load_check_data.grfconfig);
}
extern const ChunkHandler _newgrf_chunk_handlers[] = { extern const ChunkHandler _newgrf_chunk_handlers[] = {
{ 'NGRF', Save_NGRF, Load_NGRF, NULL, NULL, CH_ARRAY | CH_LAST } { 'NGRF', Save_NGRF, Load_NGRF, NULL, Check_NGRF, CH_ARRAY | CH_LAST }
}; };

5
src/saveload/saveload.cpp
View File

@ -2123,7 +2123,10 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, boo
_savegame_type = SGT_OTTD; _savegame_type = SGT_OTTD;
if (mode != SL_LOAD_CHECK) { if (mode == SL_LOAD_CHECK) {
/* The only part from AfterLoadGame() we need */
_load_check_data.grf_compatibility = IsGoodGRFConfigList(_load_check_data.grfconfig);
} else {
GamelogStartAction(GLAT_LOAD); GamelogStartAction(GLAT_LOAD);
/* After loading fix up savegame for any internal changes that /* After loading fix up savegame for any internal changes that