From d9b4d92050b90aa1d73d7e5bc3dc54b384b80b5b Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sun, 13 Jun 2010 14:15:58 +0000
Subject: (svn r19981) -Add: Read NewGRF configuration during SL_LOAD_CHECK.

---
 src/saveload/newgrf_sl.cpp | 19 +++++++++++++++----
 src/saveload/saveload.cpp  |  5 ++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/saveload')

diff --git a/src/saveload/newgrf_sl.cpp b/src/saveload/newgrf_sl.cpp
index 8dbebcce5..735306c3c 100644
--- a/src/saveload/newgrf_sl.cpp
+++ b/src/saveload/newgrf_sl.cpp
@@ -14,6 +14,7 @@
 #include "../core/bitmath_func.hpp"
 #include "../core/alloc_func.hpp"
 #include "../gfx_func.h"
+#include "../fios.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) {
 		GRFConfig *c = new GRFConfig();
 		SlObject(c, _grfconfig_desc);
 		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 */
 	AppendStaticGRFConfigs(&_grfconfig);
 }
 
+static void Check_NGRF()
+{
+	Load_NGRF_common(_load_check_data.grfconfig);
+}
+
 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 }
 };
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 1c3687162..c002f87dd 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -2123,7 +2123,10 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, boo
 
 			_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);
 
 				/* After loading fix up savegame for any internal changes that
-- 
cgit v1.2.3-54-g00ecf