From 641fc68aa80fc24fa277ae3dc62eec2969bdd26b Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sun, 13 Jun 2010 14:07:49 +0000
Subject: (svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any
 given GRFConfig and move the GameLog operations directly to AfterLoad().

---
 src/newgrf_config.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/newgrf_config.cpp')

diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index 8f4d70f19..2ed69815c 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -276,6 +276,7 @@ void ResetGRFConfig(bool defaults)
 
 
 /** Check if all GRFs in the GRF config from a savegame can be loaded.
+ * @param grfconfig GrfConfig to check
  * @return will return any of the following 3 values:<br>
  * <ul>
  * <li> GLC_ALL_GOOD: No problems occured, all GRF files were found and loaded
@@ -283,11 +284,11 @@ void ResetGRFConfig(bool defaults)
  *     compatible GRF with the same grfid was found and used instead
  * <li> GLC_NOT_FOUND: For one or more GRF's no match was found at all
  * </ul> */
-GRFListCompatibility IsGoodGRFConfigList()
+GRFListCompatibility IsGoodGRFConfigList(GRFConfig *grfconfig)
 {
 	GRFListCompatibility res = GLC_ALL_GOOD;
 
-	for (GRFConfig *c = _grfconfig; c != NULL; c = c->next) {
+	for (GRFConfig *c = grfconfig; c != NULL; c = c->next) {
 		const GRFConfig *f = FindGRFConfig(c->ident.grfid, c->ident.md5sum);
 		if (f == NULL) {
 			char buf[256];
@@ -302,7 +303,6 @@ GRFListCompatibility IsGoodGRFConfigList()
 
 				/* Non-found has precedence over compatibility load */
 				if (res != GLC_NOT_FOUND) res = GLC_COMPATIBLE;
-				GamelogGRFCompatible(&f->ident);
 				goto compatible_grf;
 			}
 
@@ -310,8 +310,6 @@ GRFListCompatibility IsGoodGRFConfigList()
 			md5sumToString(buf, lastof(buf), c->ident.md5sum);
 			DEBUG(grf, 0, "NewGRF %08X (%s) not found; checksum %s", BSWAP32(c->ident.grfid), c->filename, buf);
 
-			GamelogGRFRemove(c->ident.grfid);
-
 			c->status = GCS_NOT_FOUND;
 			res = GLC_NOT_FOUND;
 		} else {
-- 
cgit v1.2.3-54-g00ecf