make trunk compile again.
This commit is contained in:
parent
49ebeed811
commit
330408863d
3 changed files with 5 additions and 4 deletions
|
@ -67,7 +67,7 @@ void animated<T,T_void_value>::add_frame(int duration, const T& value,bool force
|
|||
does_not_change_=!force_change;
|
||||
return;
|
||||
}
|
||||
typename std::map<int,frame>::const_reverse_iterator last_frame = frames_.rbegin();
|
||||
typename std::map<int,frame>::reverse_iterator last_frame = frames_.rbegin();
|
||||
does_not_change_=false;
|
||||
frames_[last_frame->first +last_frame->second.duration_] =
|
||||
frame(duration,value);
|
||||
|
|
|
@ -67,6 +67,8 @@ public:
|
|||
int get_frames_count() const;
|
||||
const bool does_not_change() const {return does_not_change_;}
|
||||
|
||||
static const T void_value_; //MSVC: the frame constructor below requires this to be public
|
||||
|
||||
protected:
|
||||
int starting_frame_time_;
|
||||
|
||||
|
@ -86,8 +88,6 @@ private:
|
|||
T value_;
|
||||
};
|
||||
|
||||
static const T void_value_;
|
||||
|
||||
bool does_not_change_; // optimization for 1-frame permanent animations
|
||||
bool started_;
|
||||
std::map<int,frame> frames_;
|
||||
|
|
|
@ -393,7 +393,8 @@ void unit_attack(display& disp, unit_map& units,
|
|||
att->second.set_facing(a.get_relative_dir(b));
|
||||
def->second.set_facing(b.get_relative_dir(a));
|
||||
if(attack.range_type() == attack_type::LONG_RANGE) {
|
||||
return unit_attack_ranged(disp, units, a, b, damage, attack,secondary_attack, update_display, swing);
|
||||
unit_attack_ranged(disp, units, a, b, damage, attack,secondary_attack, update_display, swing);
|
||||
return;
|
||||
}
|
||||
|
||||
int start_time = 500;
|
||||
|
|
Loading…
Add table
Reference in a new issue