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

Fix for 21634 (#999)

Browse source
This commit is contained in:
Alekzander Bollig 2017-04-29 11:42:32 -04:00 • committed by Celtic Minstrel
parent 12f9215da2
commit ceba081542
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -54,6 +54,7 @@ Version 1.13.7+dev:
* Improved Addon Manager and MP Staging interfaces at low resolutions.
* Fixed bug that allows you to use the minimap to bypass view locking
* You can now change the theme (in preferences) while a game is in progress.
* Fixed a bug that caused rapid announce messages to overlap eachother. (bug #21634)
* WML Engine:
* Add base_income key to [store_side]
* Fix issues with alpha animations on hidden units (#14503)

3
data/core/about.cfg
View file

@ -983,6 +983,9 @@
[entry]
name = "Aishiko"
comment = "Unit instance recall cost implementation"
[/entry]
[entry]
name = "Alek Bollig (binarycoder)"
[/entry]
[entry]
name = "Alesis Novik"

5
src/display.cpp
View file

@ -76,6 +76,8 @@ namespace {
bool benchmark = false;
bool debug_foreground = false;
int prevLabel = 0;
}
unsigned int display::zoom_ = DefaultZoom;
@ -1744,6 +1746,7 @@ void display::enable_menu(const std::string& item, bool enable)
void display::announce(const std::string& message, const color_t& color, int lifetime)
{
font::remove_floating_label(prevLabel);
font::floating_label flabel(message);
flabel.set_font_size(font::SIZE_XLARGE);
flabel.set_color(color);
@ -1751,7 +1754,7 @@ void display::announce(const std::string& message, const color_t& color, int lif
flabel.set_lifetime(lifetime);
flabel.set_clip_rect(map_outside_area());
font::add_floating_label(flabel);
prevLabel = font::add_floating_label(flabel);
}
void display::draw_minimap()