upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-11 23:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop flags flickering from time to time

Browse Source
This commit is contained in:
Jérémy Rosen 2006-02-12 22:48:26 +00:00
parent ca26e6f625
commit 2a08ff5822
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -20,6 +20,7 @@ SVN trunk (1.1.1+svn):
* Send message on player ban or kick
* Show a message when a player leaves a game.
* WML-generated units with "random_traits" now show the traits description
* flags on village don't "flicker" at the end of their animations
* graphics
* new attack icons: animal fangs, axe, battle axe, faery touch, fireball, hammer, hatchet, lightbeam, magic missile, necromatic staff, magic staff, spear

6
src/display.cpp
View File

@ -1998,7 +1998,11 @@ surface display::get_flag(gamemap::TERRAIN terrain, int x, int y)
for(size_t i = 0; i != teams_.size(); ++i) {
if(teams_[i].owns_village(loc) && (!fogged(x,y) || !shrouded(x,y) && !teams_[currentTeam_].is_enemy(i+1))) {
return image::get_image(flags_[i].get_current_frame());
if(image::get_image(flags_[i].get_current_frame())) {
return image::get_image(flags_[i].get_current_frame());
} else {
return image::get_image(flags_[i].get_first_frame());
}
}
}