summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarkvater <Darkvater@openttd.org>2007-01-13 17:23:02 +0000
committerDarkvater <Darkvater@openttd.org>2007-01-13 17:23:02 +0000
commitc8a0d591324358319e1d56e5ff3c45a0b175e660 (patch)
tree50468b8c751ceb2369b33715000a55cf1e10dc45 /src
parent43ccaf25a8c33345db9ce043dd7a756ca3f6cd4a (diff)
downloadopenttd-c8a0d591324358319e1d56e5ff3c45a0b175e660.tar.xz
(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
Diffstat (limited to 'src')
-rw-r--r--src/newgrf_config.cpp12
-rw-r--r--src/newgrf_config.h2
2 files changed, 6 insertions, 8 deletions
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index 3d711fcd5..22cccaee6 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -312,15 +312,13 @@ void ScanNewGRFFiles(void)
}
-/* 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 (c = _all_grfs; c != NULL; c = c->next) {
+ for (const GRFConfig *c = _all_grfs; c != NULL; c = c->next) {
if (c->grfid == grfid) {
- if (memcmp(blanksum, c->md5sum, sizeof(c->md5sum)) == 0) CalcGRFMD5Sum(c);
+ if (md5sum == NULL) return c;
+
if (memcmp(md5sum, c->md5sum, sizeof(c->md5sum)) == 0) return c;
}
}
diff --git a/src/newgrf_config.h b/src/newgrf_config.h
index 6ebc3ffa2..7cc90d41f 100644
--- a/src/newgrf_config.h
+++ b/src/newgrf_config.h
@@ -41,7 +41,7 @@ extern GRFConfig *_grfconfig_newgame;
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);