upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 12:37:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix units not facing the right direction when moving

Browse Source
This commit is contained in:
Jérémy Rosen 2010-10-29 14:37:49 +00:00
parent a23fc36e50
commit c9f8ec9472
3 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/unit_animation.cpp
View File

@ -373,7 +373,7 @@ void unit_animation::fill_initial_animations( std::vector<unit_animation> & anim
if( animation_base.empty() ) if( animation_base.empty() )
animation_base.push_back(unit_animation(0,frame_builder().image(default_image).duration(1).auto_hflip(true),"",unit_animation::DEFAULT_ANIM)); animation_base.push_back(unit_animation(0,frame_builder().image(default_image).duration(1),"",unit_animation::DEFAULT_ANIM));
animations.push_back(unit_animation(0,frame_builder().image(default_image).duration(1),"_disabled_",0)); animations.push_back(unit_animation(0,frame_builder().image(default_image).duration(1),"_disabled_",0));
animations.push_back(unit_animation(0,frame_builder().image(default_image).duration(300). animations.push_back(unit_animation(0,frame_builder().image(default_image).duration(300).

44
src/unit_frame.cpp
View File

@ -160,8 +160,8 @@ frame_parameters::frame_parameters() :
y(0), y(0),
directional_x(0), directional_x(0),
directional_y(0), directional_y(0),
auto_vflip(false), auto_vflip(t_unset),
auto_hflip(true), auto_hflip(t_unset),
primary_frame(t_unset), primary_frame(t_unset),
drawing_layer(display::LAYER_UNIT_DEFAULT - display::LAYER_UNIT_FIRST) drawing_layer(display::LAYER_UNIT_DEFAULT - display::LAYER_UNIT_FIRST)
{} {}
@ -187,8 +187,8 @@ frame_builder::frame_builder() :
y_(""), y_(""),
directional_x_(""), directional_x_(""),
directional_y_(""), directional_y_(""),
auto_vflip_(false), auto_vflip_(t_unset),
auto_hflip_(false), auto_hflip_(t_unset),
primary_frame_(t_unset), primary_frame_(t_unset),
drawing_layer_(str_cast(display::LAYER_UNIT_DEFAULT - display::LAYER_UNIT_FIRST)) drawing_layer_(str_cast(display::LAYER_UNIT_DEFAULT - display::LAYER_UNIT_FIRST))
{} {}
@ -214,10 +214,22 @@ frame_builder::frame_builder(const config& cfg,const std::string& frame_string)
y_(cfg[frame_string + "y"]), y_(cfg[frame_string + "y"]),
directional_x_(cfg[frame_string + "directional_x"]), directional_x_(cfg[frame_string + "directional_x"]),
directional_y_(cfg[frame_string + "directional_y"]), directional_y_(cfg[frame_string + "directional_y"]),
auto_vflip_(cfg[frame_string + "auto_vflip"].to_bool(frame_string.empty()?false:true)),
auto_hflip_(cfg[frame_string + "auto_hflip"].to_bool(true)),
drawing_layer_(cfg[frame_string + "layer"]) drawing_layer_(cfg[frame_string + "layer"])
{ {
if(!cfg.has_attribute(frame_string + "auto_vflip")) {
auto_vflip_ = t_unset;
} else if(cfg[frame_string + "auto_vflip"].to_bool()) {
auto_vflip_ = t_true;
} else {
auto_vflip_ = t_false;
}
if(!cfg.has_attribute(frame_string + "auto_hflip")) {
auto_hflip_ = t_unset;
} else if(cfg[frame_string + "auto_hflip"].to_bool()) {
auto_hflip_ = t_true;
} else {
auto_hflip_ = t_false;
}
if(!cfg.has_attribute(frame_string + "primary")) { if(!cfg.has_attribute(frame_string + "primary")) {
primary_frame_ = t_unset; primary_frame_ = t_unset;
} else if(cfg[frame_string + "primary"].to_bool()) { } else if(cfg[frame_string + "primary"].to_bool()) {
@ -323,12 +335,14 @@ frame_builder & frame_builder::directional_y(const std::string& directional_y)
} }
frame_builder & frame_builder::auto_vflip(const bool auto_vflip) frame_builder & frame_builder::auto_vflip(const bool auto_vflip)
{ {
auto_vflip_=auto_vflip; if(auto_vflip) auto_vflip_ = t_true;
else auto_vflip_ = t_false;
return *this; return *this;
} }
frame_builder & frame_builder::auto_hflip(const bool auto_hflip) frame_builder & frame_builder::auto_hflip(const bool auto_hflip)
{ {
auto_hflip_=auto_hflip; if(auto_hflip) auto_hflip_ = t_true;
else auto_hflip_ = t_false;
return *this; return *this;
} }
frame_builder & frame_builder::primary_frame(const bool primary_frame) frame_builder & frame_builder::primary_frame(const bool primary_frame)
@ -801,11 +815,17 @@ const frame_parameters unit_frame::merge_parameters(int current_time,const frame
/** the engine provide us with default value to compare with, we update if different */ /** the engine provide us with default value to compare with, we update if different */
result.auto_hflip = engine_val.auto_hflip; result.auto_hflip = engine_val.auto_hflip;
if(animation_val.auto_hflip != engine_val.auto_hflip) result.auto_hflip = animation_val.auto_hflip; if(animation_val.auto_hflip != t_unset) result.auto_hflip = animation_val.auto_hflip;
if(current_val.auto_hflip != engine_val.auto_hflip) result.auto_hflip = current_val.auto_hflip; if(current_val.auto_hflip != t_unset) result.auto_hflip = current_val.auto_hflip;
if(result.auto_hflip == t_unset) result.auto_hflip = t_true;
result.auto_vflip = engine_val.auto_vflip; result.auto_vflip = engine_val.auto_vflip;
if(animation_val.auto_vflip != engine_val.auto_vflip) result.auto_vflip = animation_val.auto_vflip; if(animation_val.auto_vflip != t_unset) result.auto_vflip = animation_val.auto_vflip;
if(current_val.auto_vflip != engine_val.auto_vflip) result.auto_vflip = current_val.auto_vflip; if(current_val.auto_vflip != t_unset) result.auto_vflip = current_val.auto_vflip;
if(result.auto_vflip == t_unset) {
if(primary) result.auto_vflip=t_false;
else result.auto_vflip = t_true;
}
#ifdef LOW_MEM #ifdef LOW_MEM
if(primary) { if(primary) {
result.image= engine_val.image; result.image= engine_val.image;

12
src/unit_frame.hpp
View File

@ -79,8 +79,8 @@ class frame_parameters{
int y; int y;
int directional_x; int directional_x;
int directional_y; int directional_y;
bool auto_vflip; tristate auto_vflip;
bool auto_hflip; tristate auto_hflip;
tristate primary_frame; tristate primary_frame;
int drawing_layer; int drawing_layer;
} ; } ;
@ -134,8 +134,8 @@ class frame_builder {
std::string y_; std::string y_;
std::string directional_x_; std::string directional_x_;
std::string directional_y_; std::string directional_y_;
bool auto_vflip_; tristate auto_vflip_;
bool auto_hflip_; tristate auto_hflip_;
tristate primary_frame_; tristate primary_frame_;
std::string drawing_layer_; std::string drawing_layer_;
}; };
@ -181,8 +181,8 @@ class frame_parsed_parameters {
progressive_int y_; progressive_int y_;
progressive_int directional_x_; progressive_int directional_x_;
progressive_int directional_y_; progressive_int directional_y_;
bool auto_vflip_; tristate auto_vflip_;
bool auto_hflip_; tristate auto_hflip_;
tristate primary_frame_; tristate primary_frame_;
progressive_int drawing_layer_; progressive_int drawing_layer_;
}; };