From 1ef953e4a557e14cae3ee53c002c0a10c13e73d0 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 11 Jan 2009 14:01:45 +0000 Subject: (svn r14989) -Codechange: remove a lookup table by reordering some items in english.txt (Swallow) --- src/autoreplace_gui.cpp | 9 +-------- src/lang/english.txt | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp index 5e570d898..2e6558956 100644 --- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -253,13 +253,6 @@ public: virtual void OnPaint() { - static const StringID _vehicle_type_names[] = { - STR_019F_TRAIN, - STR_019C_ROAD_VEHICLE, - STR_019E_SHIP, - STR_019D_AIRCRAFT - }; - if (this->update_left || this->update_right) this->GenerateLists(); Company *c = GetCompany(_local_company); @@ -287,7 +280,7 @@ public: !EngineHasReplacementForCompany(c, selected_id[0], selected_group)); /* now the actual drawing of the window itself takes place */ - SetDParam(0, _vehicle_type_names[this->window_number]); + SetDParam(0, STR_019F_TRAIN + this->window_number); if (this->window_number == VEH_TRAIN) { /* set on/off for renew_keep_length */ diff --git a/src/lang/english.txt b/src/lang/english.txt index 4edbf7ae4..2dbbb0d88 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -478,10 +478,10 @@ STR_AGE :{COMMA} year{P STR_AGE_RED :{RED}{COMMA} year{P "" s} ({COMMA}) ############ range for service numbers ends +STR_019F_TRAIN :Train STR_019C_ROAD_VEHICLE :Road vehicle -STR_019D_AIRCRAFT :Aircraft STR_019E_SHIP :Ship -STR_019F_TRAIN :Train +STR_019D_AIRCRAFT :Aircraft STR_01A0_IS_GETTING_OLD :{WHITE}{VEHICLE} is getting old STR_01A1_IS_GETTING_VERY_OLD :{WHITE}{VEHICLE} is getting very old STR_01A2_IS_GETTING_VERY_OLD_AND :{WHITE}{VEHICLE} is getting very old and urgently needs replacing -- cgit v1.2.3-70-g09d2