projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use svnversion program rather than finding the svn package to get revision number
[supertux.git]
/
src
/
badguy
/
toad.cpp
diff --git
a/src/badguy/toad.cpp
b/src/badguy/toad.cpp
index
9115e33
..
0f0582b
100644
(file)
--- a/
src/badguy/toad.cpp
+++ b/
src/badguy/toad.cpp
@@
-1,4
+1,4
@@
-// $Id
: toad.cpp 4192 2006-08-16 23:25:39Z sommer
$
+// $Id$
//
// Toad - A jumping toad
// Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
//
// Toad - A jumping toad
// Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
@@
-30,13
+30,13
@@
namespace {
}
Toad::Toad(const lisp::Lisp& reader)
}
Toad::Toad(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/toad/toad.sprite")
+
: BadGuy(reader, "images/creatures/toad/toad.sprite")
{
sound_manager->preload(HOP_SOUND);
}
Toad::Toad(const Vector& pos, Direction d)
{
sound_manager->preload(HOP_SOUND);
}
Toad::Toad(const Vector& pos, Direction d)
- : BadGuy(pos, d, "images/creatures/toad/toad.sprite")
+
: BadGuy(pos, d, "images/creatures/toad/toad.sprite")
{
sound_manager->preload(HOP_SOUND);
}
{
sound_manager->preload(HOP_SOUND);
}
@@
-51,7
+51,7
@@
Toad::write(lisp::Writer& writer)
}
void
}
void
-Toad::
activat
e()
+Toad::
initializ
e()
{
// initial state is JUMPING, because we might start airborne
state = JUMPING;
{
// initial state is JUMPING, because we might start airborne
state = JUMPING;
@@
-86,10
+86,10
@@
Toad::set_state(ToadState newState)
}
bool
}
bool
-Toad::collision_squished(
Player& player
)
+Toad::collision_squished(
GameObject& object
)
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
- kill_squished(
player
);
+ kill_squished(
object
);
return true;
}
return true;
}