From 93303cffc453d8cd99b4a1e00645c072e7f7fae3 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 21 Oct 2007 12:45:43 +0000 Subject: (svn r11329) -Fix: if a NewGRF failed to load for some reason (like fatal errors), but it was a "compatible" NewGRF, it was shown with the compatible colour and not the not-loaded colour in the NewGRF list. --- src/newgrf_gui.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index e3d7db51e..e1479d125 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -358,10 +358,13 @@ static void NewGRFWndProc(Window *w, WindowEvent *e) break; } - if (HASBIT(c->flags, GCF_STATIC)) { - pal = PALETTE_TO_GREY; - } else if (HASBIT(c->flags, GCF_COMPATIBLE)) { - pal = PALETTE_TO_ORANGE; + /* Do not show a "not-failure" colour when it actually failed to load */ + if (pal != PALETTE_TO_RED) { + if (HASBIT(c->flags, GCF_STATIC)) { + pal = PALETTE_TO_GREY; + } else if (HASBIT(c->flags, GCF_COMPATIBLE)) { + pal = PALETTE_TO_ORANGE; + } } DrawSprite(SPR_SQUARE, pal, 5, y + 2); -- cgit v1.2.3-70-g09d2