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

renamed swing to value_second (preparing for take-off and landing animation)

Browse source
This commit is contained in:
Jérémy Rosen 2009-08-01 15:22:08 +00:00
parent 0b337220ee
commit 64eec2b20f
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/unit_animation.cpp
View file

@ -126,7 +126,7 @@ unit_animation::unit_animation(int start_time,
primary_attack_filter_(),
secondary_attack_filter_(),
hits_(),
swing_num_(),
value2_(),
sub_anims_(),
unit_anim_(start_time),
src_(),
@ -150,7 +150,7 @@ unit_animation::unit_animation(const config& cfg,const std::string frame_string
primary_attack_filter_(),
secondary_attack_filter_(),
hits_(),
swing_num_(),
value2_(),
sub_anims_(),
unit_anim_(cfg,frame_string),
src_(),
@ -202,10 +202,10 @@ unit_animation::unit_animation(const config& cfg,const std::string frame_string
hits_.push_back(KILL);
}
}
std::vector<std::string> swing_str = utils::split(cfg["swing"]);
std::vector<std::string>::iterator swing;
for(swing=swing_str.begin() ; swing != swing_str.end() ; swing++) {
swing_num_.push_back(atoi(swing->c_str()));
std::vector<std::string> value2_str = utils::split(cfg["value_second"]);
std::vector<std::string>::iterator value2;
for(value2=value2_str.begin() ; value2 != value2_str.end() ; value2++) {
value2_.push_back(atoi(value2->c_str()));
}
foreach (const config &filter, cfg.child_range("filter_attack")) {
primary_attack_filter_.push_back(filter);
@ -217,7 +217,7 @@ unit_animation::unit_animation(const config& cfg,const std::string frame_string
}
int unit_animation::matches(const game_display &disp,const map_location& loc,const map_location& second_loc, const unit* my_unit,const std::string & event,const int value,hit_type hit,const attack_type* attack,const attack_type* second_attack, int swing_num) const
int unit_animation::matches(const game_display &disp,const map_location& loc,const map_location& second_loc, const unit* my_unit,const std::string & event,const int value,hit_type hit,const attack_type* attack,const attack_type* second_attack, int value2) const
{
int result = base_score_;
if(!event.empty()&&!event_.empty()) {
@ -282,8 +282,8 @@ int unit_animation::matches(const game_display &disp,const map_location& loc,con
result ++;
}
}
if(swing_num_.empty() == false ) {
if (std::find(swing_num_.begin(),swing_num_.end(),swing_num)== swing_num_.end()) {
if(value2_.empty() == false ) {
if (std::find(value2_.begin(),value2_.end(),value2)== value2_.end()) {
return MATCH_FAIL;
} else {
result ++;
@ -934,7 +934,7 @@ void unit_animator::add_animation(unit* animated_unit,const std::string& event,
const int value,bool with_bars,bool cycles,
const std::string text,const Uint32 text_color,
const unit_animation::hit_type hit_type,
const attack_type* attack, const attack_type* second_attack, int swing_num)
const attack_type* attack, const attack_type* second_attack, int value2)
{
if(!animated_unit) return;
anim_elem tmp;
@ -945,7 +945,7 @@ void unit_animator::add_animation(unit* animated_unit,const std::string& event,
tmp.src = src;
tmp.with_bars= with_bars;
tmp.cycles = cycles;
tmp.animation = animated_unit->choose_animation(*disp,src,event,dst,value,hit_type,attack,second_attack,swing_num);
tmp.animation = animated_unit->choose_animation(*disp,src,event,dst,value,hit_type,attack,second_attack,value2);
if(!tmp.animation) return;
@ -958,13 +958,13 @@ void unit_animator::replace_anim_if_invalid(unit* animated_unit,const std::strin
const int value,bool with_bars,bool cycles,
const std::string text,const Uint32 text_color,
const unit_animation::hit_type hit_type,
const attack_type* attack, const attack_type* second_attack, int swing_num)
const attack_type* attack, const attack_type* second_attack, int value2)
{
if(!animated_unit) return;
game_display*disp = game_display::get_singleton();
if(animated_unit->get_animation() &&
!animated_unit->get_animation()->animation_finished_potential() &&
animated_unit->get_animation()->matches(*disp,src,dst,animated_unit,event,value,hit_type,attack,second_attack,swing_num) >unit_animation::MATCH_FAIL) {
animated_unit->get_animation()->matches(*disp,src,dst,animated_unit,event,value,hit_type,attack,second_attack,value2) >unit_animation::MATCH_FAIL) {
anim_elem tmp;
tmp.my_unit = animated_unit;
tmp.text = text;
@ -975,7 +975,7 @@ void unit_animator::replace_anim_if_invalid(unit* animated_unit,const std::strin
tmp.animation = NULL;
animated_units_.push_back(tmp);
}else {
add_animation(animated_unit,event,src,dst,value,with_bars,cycles,text,text_color,hit_type,attack,second_attack,swing_num);
add_animation(animated_unit,event,src,dst,value,with_bars,cycles,text,text_color,hit_type,attack,second_attack,value2);
}
}
void unit_animator::start_animations()

8
src/unit_animation.hpp
View file

@ -40,7 +40,7 @@ class unit_animation
static void fill_initial_animations( std::vector<unit_animation> & animations, const config & cfg);
static void add_anims( std::vector<unit_animation> & animations, const config & cfg);
int matches(const game_display &disp,const map_location& loc,const map_location& second_loc,const unit* my_unit,const std::string & event="",const int value=0,hit_type hit=INVALID,const attack_type* attack=NULL,const attack_type* second_attack = NULL, int swing_num =0) const;
int matches(const game_display &disp,const map_location& loc,const map_location& second_loc,const unit* my_unit,const std::string & event="",const int value=0,hit_type hit=INVALID,const attack_type* attack=NULL,const attack_type* second_attack = NULL, int value2 =0) const;
const unit_frame& get_last_frame() const{ return unit_anim_.get_last_frame() ; };
@ -111,7 +111,7 @@ class unit_animation
std::vector<config> primary_attack_filter_;
std::vector<config> secondary_attack_filter_;
std::vector<hit_type> hits_;
std::vector<int> swing_num_;
std::vector<int> value2_;
std::map<std::string,particule> sub_anims_;
particule unit_anim_;
/* these are drawing parameters, but for efficiancy reason they are in the anim and not in the particle */
@ -140,7 +140,7 @@ class unit_animator
const std::string text="",const Uint32 text_color=0,
const unit_animation::hit_type hit_type = unit_animation::INVALID,
const attack_type* attack=NULL, const attack_type* second_attack = NULL,
int swing_num =0);
int value2 =0);
void replace_anim_if_invalid(unit* animated_unit,const std::string& event,
const map_location &src = map_location::null_location,
const map_location &dst = map_location::null_location,
@ -148,7 +148,7 @@ class unit_animator
const std::string text="",const Uint32 text_color=0,
const unit_animation::hit_type hit_type = unit_animation::INVALID,
const attack_type* attack=NULL, const attack_type* second_attack = NULL,
int swing_num =0);
int value2 =0);
void start_animations();
void pause_animation();
void restart_animation();