Mercurial > hg > openttd

changeset 5646:efe18b524417 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8105) -Codechange: Change FindGRFConfig so that if md5sum parameter is omitted (or NULL) only a check for GRFID is done and not on md5sum as well. Remove blanksum in the function as it's obsoleted
author Darkvater <Darkvater@openttd.org>
date Sat, 13 Jan 2007 17:23:02 +0000
parents 5cafc0c9e0dc
children 716e263a739d
files src/newgrf_config.cpp src/newgrf_config.h
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -312,15 +312,13 @@
 }
 
 
-/* Find a NewGRF in the scanned list */
-const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum)
+/* Find a NewGRF in the scanned list, if md5sum is NULL, we don't care about it*/
+const GRFConfig *FindGRFConfig(uint32 grfid, const uint8 *md5sum)
 {
-	GRFConfig *c;
-	static const uint8 blanksum[sizeof(c->md5sum)] = { 0 };
+	for (const GRFConfig *c = _all_grfs; c != NULL; c = c->next) {
+		if (c->grfid == grfid) {
+			if (md5sum == NULL) return c;
 
-	for (c = _all_grfs; c != NULL; c = c->next) {
-		if (c->grfid == grfid) {
-			if (memcmp(blanksum, c->md5sum, sizeof(c->md5sum)) == 0) CalcGRFMD5Sum(c);
 			if (memcmp(md5sum, c->md5sum, sizeof(c->md5sum)) == 0) return c;
 		}
 	}
--- a/src/newgrf_config.h
+++ b/src/newgrf_config.h
@@ -41,7 +41,7 @@
 extern GRFConfig *_grfconfig_static;
 
 void ScanNewGRFFiles(void);
-const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum);
+const GRFConfig *FindGRFConfig(uint32 grfid, const uint8 *md5sum = NULL);
 GRFConfig *GetGRFConfig(uint32 grfid);
 GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src);
 void AppendStaticGRFConfigs(GRFConfig **dst);