mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20952) -Add: When printing the gamelog keep track of added/removed Grfs and check them for consistency.

release/1.1
frosch 2010-10-16 21:13:55 +00:00
parent 98250ad8da
commit c64d7346f8
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gamelog.cpp
View File

@ -160,6 +160,8 @@ assert_compile(lengthof(la_text) == GLAT_END);
void GamelogPrint(GamelogPrintProc *proc) void GamelogPrint(GamelogPrintProc *proc)
{ {
char buf[GAMELOG_BUF_LEN]; char buf[GAMELOG_BUF_LEN];
typedef SmallMap<uint32, const GRFConfig *> GrfIDMapping;
GrfIDMapping grf_names;
proc("---- gamelog start ----"); proc("---- gamelog start ----");
@ -231,30 +233,41 @@ void GamelogPrint(GamelogPrintProc *proc)
AddDebugText(buf, "Setting changed: %s : %d -> %d", lc->setting.name, lc->setting.oldval, lc->setting.newval); AddDebugText(buf, "Setting changed: %s : %d -> %d", lc->setting.name, lc->setting.oldval, lc->setting.newval);
break; break;
case GLCT_GRFADD: case GLCT_GRFADD: {
const GRFConfig *gc = FindGRFConfig(lc->grfadd.grfid, lc->grfadd.md5sum);
AddDebugText(buf, "Added NewGRF: "); AddDebugText(buf, "Added NewGRF: ");
PrintGrfInfo(buf, lc->grfadd.grfid, lc->grfadd.md5sum); PrintGrfInfo(buf, lc->grfadd.grfid, lc->grfadd.md5sum);
if (grf_names.Contains(lc->grfadd.grfid)) AddDebugText(buf, ". Gamelog inconsistency: GrfID was already added!");
grf_names[lc->grfadd.grfid] = gc;
break; break;
}
case GLCT_GRFREM: case GLCT_GRFREM:
AddDebugText(buf, "Removed NewGRF: %08X", BSWAP32(lc->grfrem.grfid)); AddDebugText(buf, "Removed NewGRF: %08X", BSWAP32(lc->grfrem.grfid));
PrintGrfFilename(buf, lc->grfrem.grfid); PrintGrfFilename(buf, lc->grfrem.grfid);
if (!grf_names.Erase(lc->grfrem.grfid)) AddDebugText(buf, ". Gamelog inconsistency: GrfID was never added!");
break; break;
case GLCT_GRFCOMPAT: case GLCT_GRFCOMPAT: {
const GRFConfig *gc = FindGRFConfig(lc->grfadd.grfid, lc->grfadd.md5sum);
AddDebugText(buf, "Compatible NewGRF loaded: "); AddDebugText(buf, "Compatible NewGRF loaded: ");
PrintGrfInfo(buf, lc->grfcompat.grfid, lc->grfcompat.md5sum); PrintGrfInfo(buf, lc->grfcompat.grfid, lc->grfcompat.md5sum);
if (!grf_names.Contains(lc->grfcompat.grfid)) AddDebugText(buf, ". Gamelog inconsistency: GrfID was never added!");
grf_names[lc->grfcompat.grfid] = gc;
break; break;
}
case GLCT_GRFPARAM: case GLCT_GRFPARAM:
AddDebugText(buf, "GRF parameter changed: %08X", BSWAP32(lc->grfparam.grfid)); AddDebugText(buf, "GRF parameter changed: %08X", BSWAP32(lc->grfparam.grfid));
PrintGrfFilename(buf, lc->grfparam.grfid); PrintGrfFilename(buf, lc->grfparam.grfid);
if (!grf_names.Contains(lc->grfparam.grfid)) AddDebugText(buf, ". Gamelog inconsistency: GrfID was never added!");
break; break;
case GLCT_GRFMOVE: case GLCT_GRFMOVE:
AddDebugText(buf, "GRF order changed: %08X moved %d places %s", AddDebugText(buf, "GRF order changed: %08X moved %d places %s",
BSWAP32(lc->grfmove.grfid), abs(lc->grfmove.offset), lc->grfmove.offset >= 0 ? "down" : "up" ); BSWAP32(lc->grfmove.grfid), abs(lc->grfmove.offset), lc->grfmove.offset >= 0 ? "down" : "up" );
PrintGrfFilename(buf, lc->grfmove.grfid); PrintGrfFilename(buf, lc->grfmove.grfid);
if (!grf_names.Contains(lc->grfmove.grfid)) AddDebugText(buf, ". Gamelog inconsistency: GrfID was never added!");
break; break;
case GLCT_GRFBUG: case GLCT_GRFBUG:
@ -265,6 +278,8 @@ void GamelogPrint(GamelogPrintProc *proc)
PrintGrfFilename(buf, lc->grfbug.grfid); PrintGrfFilename(buf, lc->grfbug.grfid);
break; break;
} }
if (!grf_names.Contains(lc->grfbug.grfid)) AddDebugText(buf, ". Gamelog inconsistency: GrfID was never added!");
break;
case GLCT_EMERGENCY: case GLCT_EMERGENCY:
break; break;