projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2eb1826
)
- replaced evil cast with std::find
author
Ingo Ruhnke
<grumbel@gmx.de>
Wed, 28 Apr 2004 20:28:38 +0000
(20:28 +0000)
committer
Ingo Ruhnke
<grumbel@gmx.de>
Wed, 28 Apr 2004 20:28:38 +0000
(20:28 +0000)
SVN-Revision: 818
src/gameobjs.cpp
patch
|
blob
|
history
diff --git
a/src/gameobjs.cpp
b/src/gameobjs.cpp
index
aaf6319
..
d185556
100644
(file)
--- a/
src/gameobjs.cpp
+++ b/
src/gameobjs.cpp
@@
-79,7
+79,12
@@
BrokenBrick::action(double frame_ratio)
if (!timer.check())
{
if (!timer.check())
{
- World::current()->broken_bricks.erase(static_cast<std::vector<BrokenBrick>::iterator>(this));
+ std::vector<BrokenBrick*>::iterator i
+ = std::find(World::current()->broken_bricks.begin(),
+ World::current()->broken_bricks.end(),
+ this);
+ if (i != World::current()->broken_bricks.end())
+ World::current()->broken_bricks.erase(i);
}
}
}
}
@@
-123,7
+128,14
@@
BouncyBrick::action(double frame_ratio)
/* Stop bouncing? */
if (offset >= 0)
/* Stop bouncing? */
if (offset >= 0)
- World::current()->bouncy_bricks.erase(static_cast<std::vector<BouncyBrick>::iterator>(this));
+ {
+ std::vector<BouncyBrick*>::iterator i
+ = std::find(World::current()->bouncy_bricks.begin(),
+ World::current()->bouncy_bricks.end(),
+ this);
+ if (i != World::current()->bouncy_bricks.end())
+ World::current()->bouncy_bricks.erase(i);
+ }
}
void
}
void
@@
-179,7
+191,14
@@
FloatingScore::action(double frame_ratio)
base.y = base.y - 2 * frame_ratio;
if(!timer.check())
base.y = base.y - 2 * frame_ratio;
if(!timer.check())
- World::current()->floating_scores.erase(static_cast<std::vector<FloatingScore>::iterator>(this));
+ {
+ std::vector<FloatingScore*>::iterator i
+ = std::find(World::current()->floating_scores.begin(),
+ World::current()->floating_scores.end(),
+ this);
+ if (i != World::current()->floating_scores.end())
+ World::current()->floating_scores.erase(i);
+ }
}
void
}
void