dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r20957) -Codechange: Add another parameter to FindGRFConfig() to define search restrictions.

Browse Source
This commit is contained in:
frosch
2010-10-17 12:12:13 +00:00
parent 918da8432a
commit 3972c790c2
9 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gamelog.cpp
View File

@@ -126,7 +126,7 @@ static void PrintGrfInfo(char *buf, uint grfid, const uint8 *md5sum, const GRFCo
if (gc != NULL) {
AddDebugText(buf, ", filename: %s (md5sum matches)", gc->filename);
} else {
gc = FindGRFConfig(grfid);
gc = FindGRFConfig(grfid, FGCM_ANY);
if (gc != NULL) {
AddDebugText(buf, ", filename: %s (matches GRFID only)", gc->filename);
} else {
@@ -245,7 +245,7 @@ void GamelogPrint(GamelogPrintProc *proc)
break;
case GLCT_GRFADD: {
const GRFConfig *gc = FindGRFConfig(lc->grfadd.grfid, lc->grfadd.md5sum);
const GRFConfig *gc = FindGRFConfig(lc->grfadd.grfid, FGCM_EXACT, lc->grfadd.md5sum);
AddDebugText(buf, "Added NewGRF: ");
PrintGrfInfo(buf, lc->grfadd.grfid, lc->grfadd.md5sum, gc);
GrfIDMapping::Pair *gm = grf_names.Find(lc->grfrem.grfid);
@@ -272,7 +272,7 @@ void GamelogPrint(GamelogPrintProc *proc)
}
case GLCT_GRFCOMPAT: {
const GRFConfig *gc = FindGRFConfig(lc->grfadd.grfid, lc->grfadd.md5sum);
const GRFConfig *gc = FindGRFConfig(lc->grfadd.grfid, FGCM_EXACT, lc->grfadd.md5sum);
AddDebugText(buf, "Compatible NewGRF loaded: ");
PrintGrfInfo(buf, lc->grfcompat.grfid, lc->grfcompat.md5sum, gc);
if (!grf_names.Contains(lc->grfcompat.grfid)) AddDebugText(buf, ". Gamelog inconsistency: GrfID was never added!");