projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- committed patch from Richard Smith
[supertux.git]
/
src
/
badguy.cpp
diff --git
a/src/badguy.cpp
b/src/badguy.cpp
index
d26dc2a
..
5e496ec
100644
(file)
--- a/
src/badguy.cpp
+++ b/
src/badguy.cpp
@@
-210,6
+210,7
@@
BadGuy::activate(Direction activation_dir)
frozen_timer.init(true);
timer.init(true);
frozen_timer.init(true);
timer.init(true);
+ dying = DYING_NOT;
seen = true;
dir = activation_dir;
seen = true;
dir = activation_dir;
@@
-904,7
+905,7
@@
BadGuy::action(float elapsed_time)
if(!seen)
return;
if(!seen)
return;
-
+
switch (kind)
{
case BAD_MRICEBLOCK:
switch (kind)
{
case BAD_MRICEBLOCK:
@@
-1226,9
+1227,6
@@
BadGuy::collision(const MovingObject&, int)
void
BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
{
void
BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
{
- if(!seen)
- return;
-
BadGuy* pbad_c = NULL;
Bullet* pbullet_c = NULL;
BadGuy* pbad_c = NULL;
Bullet* pbullet_c = NULL;