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

Removed unused incorrect checks for buffer overflow.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-08-14 14:15:33 +00:00
parent ba06242145
commit 8dad23dd2e
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/unit_frame.cpp
View file

@ -51,7 +51,9 @@ int progressive_string::duration() const
return total;
}
static const std::string empty_string ="";
static const std::string empty_string;
const std::string& progressive_string::get_current_element(int current_time)const
{
int time = 0;
@ -63,7 +65,6 @@ const std::string& progressive_string::get_current_element(int current_time)cons
}
if(sub_halo) sub_halo--;
if(sub_halo >= data_.size()) sub_halo = data_.size();
return data_[sub_halo].first;
}
@ -107,10 +108,6 @@ const T progressive_<T>::get_current_element(int current_time, T default_val) co
sub_halo--;
time -= data_[sub_halo].second;
}
if(sub_halo >= data_.size()) {
sub_halo = data_.size();
time = searched_time; // Never more than max allowed
}
const T first = data_[sub_halo].first.first;
const T second = data_[sub_halo].first.second;