equal
deleted
inserted
replaced
310 num = ScanPath(_paths.data_dir); |
310 num = ScanPath(_paths.data_dir); |
311 DEBUG(grf, 1, "Scan complete, found %d files", num); |
311 DEBUG(grf, 1, "Scan complete, found %d files", num); |
312 } |
312 } |
313 |
313 |
314 |
314 |
315 /* Find a NewGRF in the scanned list */ |
315 /* Find a NewGRF in the scanned list, if md5sum is NULL, we don't care about it*/ |
316 const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum) |
316 const GRFConfig *FindGRFConfig(uint32 grfid, const uint8 *md5sum) |
317 { |
317 { |
318 GRFConfig *c; |
318 for (const GRFConfig *c = _all_grfs; c != NULL; c = c->next) { |
319 static const uint8 blanksum[sizeof(c->md5sum)] = { 0 }; |
|
320 |
|
321 for (c = _all_grfs; c != NULL; c = c->next) { |
|
322 if (c->grfid == grfid) { |
319 if (c->grfid == grfid) { |
323 if (memcmp(blanksum, c->md5sum, sizeof(c->md5sum)) == 0) CalcGRFMD5Sum(c); |
320 if (md5sum == NULL) return c; |
|
321 |
324 if (memcmp(md5sum, c->md5sum, sizeof(c->md5sum)) == 0) return c; |
322 if (memcmp(md5sum, c->md5sum, sizeof(c->md5sum)) == 0) return c; |
325 } |
323 } |
326 } |
324 } |
327 |
325 |
328 return NULL; |
326 return NULL; |