mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(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
This commit is contained in:
Darkvater 2007-01-13 17:23:02 +00:00
parent ae41162322
commit 3f168daee1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_config.cpp
View File

@ -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;
}
}

2
src/newgrf_config.h
View File

@ -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);