From 3bcfa7c52ad592ccfaf58ad499e78fd89aea6722 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 22 Jul 2009 16:56:36 +0000 Subject: (svn r16917) -Codechange: fix some GCC 4.5 'case X is not in enum Y' warnings --- src/rail_gui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/rail_gui.cpp') diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index ccb77c41a..adfd3dc46 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1824,7 +1824,7 @@ static void SetDefaultRailGui() extern RailType _last_built_railtype; RailType rt = (RailType)_settings_client.gui.default_rail_type; if (rt >= RAILTYPE_END) { - if (rt == RAILTYPE_END + 2) { + if (rt == DEF_RAILTYPE_MOST_USED) { /* Find the most used rail type */ RailType count[RAILTYPE_END]; memset(count, 0, sizeof(count)); @@ -1841,15 +1841,15 @@ static void SetDefaultRailGui() } /* No rail, just get the first available one */ - if (count[rt] == 0) rt = RAILTYPE_END; + if (count[rt] == 0) rt = DEF_RAILTYPE_FIRST; } switch (rt) { - case RAILTYPE_END + 0: + case DEF_RAILTYPE_FIRST: rt = RAILTYPE_RAIL; while (rt < RAILTYPE_END && !HasRailtypeAvail(_local_company, rt)) rt++; break; - case RAILTYPE_END + 1: + case DEF_RAILTYPE_LAST: rt = GetBestRailtype(_local_company); break; -- cgit v1.2.3-54-g00ecf