diff options
| author | frosch <frosch@openttd.org> | 2009-11-28 20:15:16 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2009-11-28 20:15:16 +0000 |
| commit | ae97bf029c7bdc52db4ed8acf6288b86acf6ad42 (patch) | |
| tree | 8483d2fa0d4e493bb19f61b1bc57cfa2f82cfb48 /src/town_gui.cpp | |
| parent | 8de6e3fcd95377309ffa1bd94f07a04944a07aa8 (diff) | |
| download | openttd-ae97bf029c7bdc52db4ed8acf6288b86acf6ad42.tar.xz | |
(svn r18328) -Codechange: Remove last usage of {SETX} from strings.
Diffstat (limited to 'src/town_gui.cpp')
| -rw-r--r-- | src/town_gui.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/town_gui.cpp b/src/town_gui.cpp index f31ff0d41..d5aedddee 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -376,6 +376,10 @@ public: if (cargo_needed_for_growth > 0) { DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH); + bool rtl = _dynlang.text_dir == TD_RTL; + uint cargo_text_left = r.left + WD_FRAMERECT_LEFT + (rtl ? 0 : 20); + uint cargo_text_right = r.right - WD_FRAMERECT_RIGHT - (rtl ? 20 : 0); + CargoID first_food_cargo = CT_INVALID; StringID food_name = STR_CARGO_PLURAL_FOOD; CargoID first_water_cargo = CT_INVALID; @@ -395,20 +399,20 @@ public: if (first_food_cargo != CT_INVALID && this->town->act_food > 0) { SetDParam(0, first_food_cargo); SetDParam(1, this->town->act_food); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH); + DrawString(cargo_text_left, cargo_text_right, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH); } else { SetDParam(0, food_name); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED); + DrawString(cargo_text_left, cargo_text_right, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED); } if (cargo_needed_for_growth > 1) { if (first_water_cargo != CT_INVALID && this->town->act_water > 0) { SetDParam(0, first_water_cargo); SetDParam(1, this->town->act_water); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH); + DrawString(cargo_text_left, cargo_text_right, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH); } else { SetDParam(0, water_name); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED); + DrawString(cargo_text_left, cargo_text_right, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED); } } } |