projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qmax patch to fix bug #0000389 - colors in infoblocks
[supertux.git]
/
src
/
badguy
/
stumpy.cpp
diff --git
a/src/badguy/stumpy.cpp
b/src/badguy/stumpy.cpp
index
f451546
..
73dfc6b
100644
(file)
--- a/
src/badguy/stumpy.cpp
+++ b/
src/badguy/stumpy.cpp
@@
-1,4
+1,4
@@
-// $Id
: stumpy.cpp 3980 2006-07-10 19:55:56Z sommer
$
+// $Id$
//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
@@
-32,7
+32,6
@@
Stumpy::Stumpy(const lisp::Lisp& reader)
{
walk_speed = WALKSPEED;
max_drop_height = 16;
{
walk_speed = WALKSPEED;
max_drop_height = 16;
- sound_manager->preload("sounds/mr_tree.ogg");
sound_manager->preload("sounds/mr_treehit.ogg");
}
sound_manager->preload("sounds/mr_treehit.ogg");
}
@@
-55,7
+54,7
@@
Stumpy::write(lisp::Writer& writer)
}
void
}
void
-Stumpy::
activat
e()
+Stumpy::
initializ
e()
{
switch (mystate) {
case STATE_INVINCIBLE:
{
switch (mystate) {
case STATE_INVINCIBLE:
@@
-64,7
+63,7
@@
Stumpy::activate()
physic.set_velocity_x(0);
break;
case STATE_NORMAL:
physic.set_velocity_x(0);
break;
case STATE_NORMAL:
- WalkingBadguy::
activat
e();
+ WalkingBadguy::
initializ
e();
break;
}
}
break;
}
}
@@
-75,8
+74,8
@@
Stumpy::active_update(float elapsed_time)
switch (mystate) {
case STATE_INVINCIBLE:
if (invincible_timer.check()) {
switch (mystate) {
case STATE_INVINCIBLE:
if (invincible_timer.check()) {
- mystate = STATE_NORMAL;
- WalkingBadguy::
activat
e();
+
mystate = STATE_NORMAL;
+ WalkingBadguy::
initializ
e();
}
BadGuy::active_update(elapsed_time);
break;
}
BadGuy::active_update(elapsed_time);
break;
@@
-150,10
+149,10
@@
Stumpy::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
switch (mystate) {
case STATE_INVINCIBLE:
if(hit.top || hit.bottom) {
switch (mystate) {
case STATE_INVINCIBLE:
if(hit.top || hit.bottom) {
- physic.set_velocity_y(0);
+
physic.set_velocity_y(0);
}
if(hit.left || hit.right) {
}
if(hit.left || hit.right) {
- physic.set_velocity_x(0);
+
physic.set_velocity_x(0);
}
return CONTINUE;
break;
}
return CONTINUE;
break;