From 50bcc852f98f226d1ddbf1cf62646e7647b71d82 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 23 May 2010 15:17:05 +0000 Subject: [PATCH] (svn r19890) -Codechange: Use real spritewidths for drawing town authority window. --- src/town_gui.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 02ea76b6aa..a6f463cc67 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -136,11 +136,13 @@ public: y += FONT_HEIGHT_NORMAL; int sprite_y_offset = (FONT_HEIGHT_NORMAL - 10) / 2; + uint icon_width = GetSpriteSize(SPR_COMPANY_ICON).width; + uint exclusive_width = GetSpriteSize(SPR_BLOT).width; bool rtl = _dynlang.text_dir == TD_RTL; - uint text_left = left + (rtl ? 0 : 26); - uint text_right = right - (rtl ? 26 : 0); - uint icon_left = rtl ? right - 14 : left; - uint blob_left = rtl ? right - 24 : left + 16; + uint text_left = left + (rtl ? 0 : icon_width + exclusive_width + 4); + uint text_right = right - (rtl ? icon_width + exclusive_width + 4 : 0); + uint icon_left = rtl ? right - icon_width : left; + uint exclusive_left = rtl ? right - icon_width - exclusive_width - 2 : left + icon_width + 2; /* Draw list of companies */ const Company *c; @@ -163,8 +165,8 @@ public: (str++, true); // Outstanding SetDParam(2, str); - if (this->town->exclusivity == c->index) { // red icon for company with exclusive rights - DrawSprite(SPR_BLOT, PALETTE_TO_RED, blob_left, y + sprite_y_offset); + if (this->town->exclusivity == c->index) { + DrawSprite(SPR_BLOT, PALETTE_TO_RED, exclusive_left, y + sprite_y_offset); } DrawString(text_left, text_right, y, STR_LOCAL_AUTHORITY_COMPANY_RATING);