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

moving around more deprecated code, so I don't forget anything when upgrading...

Browse source
This commit is contained in:
Jérémy Rosen 2007-11-01 21:51:48 +00:00
parent 1ff4f49675
commit a0b07d5c10
2 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/unit_animation.cpp
View file

@ -415,6 +415,14 @@ void unit_animation::initialize_anims( std::vector<unit_animation> & animations,
if((**d)["offset"].empty() && (**d).get_children("missile_frame").empty()) {
(**d)["offset"] ="0~0.6,0.6~0";
}
if(!(**d).get_children("missile_frame").empty()) {
if( (**d)["missile_offset"].empty())(**d)["missile_offset"] = "0~0.8";
config tmp;
tmp["duration"]="1";
(**d).add_child("missile_frame",tmp);
(**d).add_child_at("missile_frame",tmp,0);
}
animations.push_back(unit_animation(**d));
//lg::wml_error<<"attack animations are deprecate, support will be removed in 1.3.11 (in unit "<<cfg["name"]<<")\n";
//lg::wml_error<<"please put it with an [animation] tag and apply_to=attack flag\n";
@ -532,10 +540,6 @@ unit_animation::crude_animation::crude_animation(const config& cfg,const std::st
} else {
starting_frame_time_ = atoi(cfg[frame_string+"start_time"].c_str());
}
if(frame_string == "missile_") {
// lg::wml_error To be deprecated eventually
add_frame(1,unit_frame("",1),true);
}
for(; range.first != range.second; ++range.first) {
unit_frame tmp_frame(**range.first);
@ -549,14 +553,6 @@ unit_animation::crude_animation::crude_animation(const config& cfg,const std::st
blend_ratio_ = progressive_double(cfg[frame_string+"blend_ratio"],get_animation_duration());
highlight_ratio_ = progressive_double(cfg[frame_string+"alpha"],get_animation_duration());
offset_ = progressive_double(cfg[frame_string+"offset"],get_animation_duration());
if(offset_.does_not_change() && frame_string == "missile_") {
// lg::wml_error To be deprecated eventually
offset_=progressive_double("0~0.8",get_animation_duration());
}
if( frame_string == "missile_") {
// lg::wml_error To be deprecated eventually
add_frame(1,unit_frame("",1),true);
}
if(!halo_.does_not_change() ||
!halo_x_.does_not_change() ||

22
src/unit_display.cpp
View file

@ -173,18 +173,18 @@ void move_unit( const gamemap& map, const std::vector<gamemap::location>& path,
}
void unit_die(const gamemap::location& loc, unit& loser,
const attack_type* attack,const attack_type* secondary_attack, unit* winner)
const attack_type* attack,const attack_type* secondary_attack, unit* winner)
{
game_display* disp = game_display::get_singleton();
if(!disp ||disp->video().update_locked() || disp->fogged(loc) || preferences::show_combat() == false) {
return;
}
const std::string& die_sound = loser.die_sound();
if(die_sound != "" && die_sound != "null") {
sound::play_sound(die_sound);
}
const std::string& die_sound = loser.die_sound();
if(die_sound != "" && die_sound != "null") {
sound::play_sound(die_sound);
}
loser.set_dying(*disp,loc,attack,secondary_attack);
loser.set_dying(*disp,loc,attack,secondary_attack);
if(winner == NULL) { // Test to see if there is no victor.
while(!loser.get_animation()->animation_finished()) {
@ -194,7 +194,7 @@ const attack_type* attack,const attack_type* secondary_attack, unit* winner)
events::pump();
disp->delay(10);
}
return;
return;
}
winner->set_victorious(*disp,loc,attack,secondary_attack);
int start_time = minimum<int>(loser.get_animation()->get_begin_time(),winner->get_animation()->get_begin_time());
@ -204,10 +204,10 @@ const attack_type* attack,const attack_type* secondary_attack, unit* winner)
while((!loser.get_animation()->animation_would_finish()) || ((!winner->get_animation()->animation_would_finish()))) {
disp->invalidate(loc);
disp->draw();
events::pump();
disp->delay(10);
disp->invalidate(loc);
disp->draw();
events::pump();
disp->delay(10);
}
}