0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[[Story-screen tweaks]]

Browse source 
* Removed text wrapping around background image in story screens; it is
  better to always use the whole screen width if possible (fixes the
  first story screens in Descent into Darkness and Under the Burning Suns).

* Tweaked the algorithm that extends the darkened area below long
  story texts so that it gives a more consistent appearance.
This commit is contained in:
Ignacio R. Morelle 2008-11-23 17:20:10 +00:00
parent 980eb1d4dd
commit 32fc05ab01
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelog
View file

@ -5,6 +5,11 @@ Version 1.5.6+svn:
* User interface:
* Rewrote the layout algorithm for the new widgets.
* Fixed the font loading when the data directory is overridden.
* Removed text wrapping around background image in story screens; it is
better to always use the whole screen width if possible (fixes the
first story screens in Descent into Darkness and Under the Burning Suns).
* Tweaked the algorithm that extends the darkened area below long
story texts so that it gives a more consistent appearance.
Version 1.5.6:
* Authoring tools:

25
src/intro.cpp
View file

@ -140,22 +140,10 @@ bool show_intro_part(display &disp, const vconfig& part,
texty = 0;
#else
int xbuttons, ybuttons;
if (background->w > 500) {
textx = dstrect.x + 150;
xbuttons = dstrect.x+dstrect.w-140;
} else {
textx = 200;
xbuttons = video.getx() - 200 - 40;
}
if (background->h > 375) {
texty = dstrect.y + dstrect.h - 200;
ybuttons = dstrect.y + dstrect.h - 40;
} else {
texty = video.gety() - 200;
ybuttons = video.gety() - 40;
}
textx = 200;
xbuttons = video.getx() - 200 - 40;
texty = video.gety() - 200;
ybuttons = video.gety() - 40;
#endif
// Darken the area for the text and buttons to be drawn on
@ -279,11 +267,12 @@ static bool show_intro_part_helper(display &disp, const vconfig& part,
const SDL_Rect total_size = font::draw_text(NULL, screen_area(), font::SIZE_PLUS,
font::NORMAL_COLOUR, story, 0, 0);
if (texty + 20 + total_size.h > screen_area().h) {
int old_texty = texty;
texty = screen_area().h > total_size.h + 1 ? screen_area().h - total_size.h - 21 : 0;
draw_solid_tinted_rectangle(textx, texty, total_size.w, total_size.h,
draw_solid_tinted_rectangle(0, texty, screen_area().w, old_texty - texty,
0, 0, 0, 128, video.getSurface());
update_rect(textx, texty, total_size.w, total_size.h);
update_rect(0, texty, screen_area().w, old_texty - texty);
}
if(lang_rtl)