the movement text is also scaled now (bug #6876, patch #693)

This commit is contained in:
Mark de Wever 2007-03-17 13:49:34 +00:00
parent 6d67ae6e92
commit 0f17dc500e
4 changed files with 14 additions and 11 deletions

View file

@ -19,6 +19,7 @@ Version 1.3.1+svn:
most importantly speeds up the drawing of the halos.
* units are scaled properly when zooming also with tiny gui (bug #8703 and bug #6570)
* haloes in tiny gui are now scaled (before unscaled, thus a factor 2 bigger as intended)
* the movement text is also scaled now (bug #6876, patch patch #693)
* language and i18n:
* updated translations: Bulgarian, Czech, Danish, Dutch, French, German,
Hungarian, Italian, Norwegian, Portuguese (Brazil)

View file

@ -254,6 +254,7 @@ Vlad Glagolev (Stelz)" # OpenBSD packager
[about]
title = _ "Contributors"
text = "
Ali El Gariani (alink)
Andrea Palmatè (afxgroup)
Daniel Bruegmann
Ely Levy (Nakee)

View file

@ -14,7 +14,7 @@ Version 1.3.1+svn:
screen.
* Added new experimental new unit location in the hex.
* Added some more speed optimizations.
* Units are scaled properly when zooming, also with tiny gui.
* Units and movement text are scaled properly when zooming, also with tiny gui.
* Haloes in tiny gui are now scaled (before unscaled, thus a factor 2 bigger as intended).
* Units changes and balancing:
* Converted the cold resistance of the Elvish Sorceress line to a holy

View file

@ -1681,20 +1681,21 @@ void display::draw_movement_info(const gamemap::location& loc, int xloc, int ylo
if(str.empty() == false) {
const SDL_Rect& rect = map_area();
const SDL_Rect& text_area = font::text_area(str,font::SIZE_PLUS);
const int font_size = font::SIZE_PLUS * zoom_ / DefaultZoom;
const SDL_Rect& text_area = font::text_area(str,font_size);
const int x = xloc + zoom_/2 - text_area.w/2;
const int y = yloc + zoom_/2 - text_area.h/2;
//draw the text with a black outline
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x-1,y-1);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x-1,y);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x-1,y+1);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x,y-1);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x+1,y-1);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x+1,y);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x+1,y+1);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::DARK_COLOUR,str,x,y+1);
font::draw_text(&screen_,rect,font::SIZE_PLUS,font::YELLOW_COLOUR,str,x,y);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x-1,y-1);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x-1,y);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x-1,y+1);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x,y-1);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x+1,y-1);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x+1,y);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x+1,y+1);
font::draw_text(&screen_,rect,font_size,font::DARK_COLOUR,str,x,y+1);
font::draw_text(&screen_,rect,font_size,font::YELLOW_COLOUR,str,x,y);
}
}