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

Whiteboard: removed useless assert

Browse source
This commit is contained in:
Gabriel Morin 2010-06-20 01:32:14 +00:00
parent 8f18801530
commit 0c48ab76f2
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/whiteboard/side_actions.cpp
View file

@ -83,27 +83,30 @@ void side_actions::move_later(size_t index, size_t increment)
void side_actions::remove_action(size_t index)
{
assert(!actions_.empty());
assert(index < end());
action_set::iterator position = actions_.begin()+index;
if (position < actions_.end())
if(!actions_.empty())
{
actions_.erase(position);
assert(index < end());
action_set::iterator position = actions_.begin()+index;
if (position < actions_.end())
{
actions_.erase(position);
}
}
}
void side_actions::remove_action(action_ptr action)
{
assert(!actions_.empty());
action_set::iterator position;
for ( position = actions_.begin(); position != actions_.end(); ++position)
if (!actions_.empty())
{
if (*position == action)
action_set::iterator position;
for (position = actions_.begin(); position != actions_.end(); ++position)
{
actions_.erase(position);
break;
if (*position == action)
{
actions_.erase(position);
break;
}
}
}
}