upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 20:52:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove my frame-shift of flag animations

Browse Source 
(didn't work well with some custom flags), planning to replace it with
a cleaner time-shift.
This commit is contained in:
Ali El Gariani 2007-04-16 21:07:48 +00:00
parent e28233a1a2
commit 83ea08c2e5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/game.cfg
View File

@ -90,7 +90,6 @@
partmoved_ball_image="misc/ball-partmoved.png" partmoved_ball_image="misc/ball-partmoved.png"
enemy_ball_image="misc/ball-enemy.png" enemy_ball_image="misc/ball-enemy.png"
ally_ball_image="misc/ball-ally.png" ally_ball_image="misc/ball-ally.png"
# use preferably the same time duration for each frame
flag_image="flags/flag-1.png:150,flags/flag-2.png:150,flags/flag-3.png:150,flags/flag-4.png:150" flag_image="flags/flag-1.png:150,flags/flag-2.png:150,flags/flag-3.png:150,flags/flag-4.png:150"
flag_rgb=green flag_rgb=green

8
src/display.cpp
View File

@ -109,7 +109,6 @@ display::display(unit_map& units, CVideo& video, const gamemap& map,
image::set_zoom(zoom_); image::set_zoom(zoom_);
//inits the flag list //inits the flag list
//Note the local shifts of flag animation will look better if the tempo is regular
flags_.reserve(teams_.size()); flags_.reserve(teams_.size());
for(size_t i = 0; i != teams_.size(); ++i) { for(size_t i = 0; i != teams_.size(); ++i) {
std::string flag; std::string flag;
@ -150,8 +149,7 @@ display::display(unit_map& units, CVideo& video, const gamemap& map,
} }
flags_.push_back(temp_anim); flags_.push_back(temp_anim);
//flags_.back().start_animation(rand()%flags_.back().get_end_time(), true); flags_.back().start_animation(rand()%flags_.back().get_end_time(), true);
flags_.back().start_animation(0, true);
} }
//clear the screen contents //clear the screen contents
@ -1856,9 +1854,7 @@ surface display::get_flag(t_translation::t_letter terrain, int x, int y)
for(size_t i = 0; i != teams_.size(); ++i) { 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))) { if(teams_[i].owns_village(loc) && (!fogged(x,y) || !shrouded(x,y) && !teams_[currentTeam_].is_enemy(i+1))) {
flags_[i].update_last_draw_time(); flags_[i].update_last_draw_time();
// we apply a frame shift to flag animation to avoid repetion return image::get_image(flags_[i].get_current_frame());
// x+y*2 garantee that adjacant villages have a 1-3 frames difference (on 4)
return image::get_image(flags_[i].get_next_frame(x+y*2));
} }
} }