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

Merge branch 'bug21486' of github.com:sachith500/wesnoth-old (PR #94)

Browse source
This commit is contained in:
Alexander van Gessel 2014-02-25 04:41:54 +01:00
commit 76b9976b75
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -9,6 +9,9 @@ Version 1.11.10+dev:
* WML engine:
* Bug #21643: Removing fog from a single hex no longer makes the hex ugly.
* WML files whose names contain spaces are ignored.
* User interface:
* Non-team labels no longer remove team labels that were present in the
same hex.
* Miscellaneous and bug fixes:
* Units can no longer be moved in linger mode (bug #21450).
* Changed: Updated valgrind suppression file.

5
data/core/about.cfg
View file

@ -193,6 +193,11 @@
[entry]
name = "Rusty Russell (rusty)"
[/entry]
[entry]
name = "Sachith Seneviratne (sachith500)"
email = "sachith500@gmail.com"
comment = "Bug fixes at the moment. GSoC Aspirant"
[/entry]
[entry]
name = "Sergey Popov (loonycyborg)"
comment = "scons"

4
players_changelog
View file

@ -12,7 +12,9 @@ Version 1.11.10+dev:
* Units can no longer be moved in linger mode (bug #21450).
* Labels are now removed when shroud/fog is removed, rather than waiting
for a new turn (bug #21434).
* User interface:
* Non-team labels no longer remove team labels that were present in the
same hex.
Version 1.11.10:
* Campaigns:

6
src/menu_events.cpp
View file

@ -1168,12 +1168,6 @@ void menu_handler::label_terrain(mouse_handler& mousehandler, bool team_only)
} else {
color = int_to_color(team::get_side_rgb(gui_->viewing_side()));
}
const std::string& old_team_name = old_label ? old_label->team_name() : "";
// remove the old label if we changed the team_name
if (team_only == (old_team_name == "")) {
const terrain_label* old = gui_->labels().set_label(loc, "", old_team_name, color);
if (old) recorder.add_label(old);
}
const terrain_label* res = gui_->labels().set_label(loc, label, team_name, color);
if (res)
recorder.add_label(res);