projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18ccb78
)
Door creaks when opening, not when walking through
author
Christoph Sommer
<mail@christoph-sommer.de>
Sat, 1 Jul 2006 16:12:42 +0000
(16:12 +0000)
committer
Christoph Sommer
<mail@christoph-sommer.de>
Sat, 1 Jul 2006 16:12:42 +0000
(16:12 +0000)
SVN-Revision: 3832
src/trigger/door.cpp
patch
|
blob
|
history
diff --git
a/src/trigger/door.cpp
b/src/trigger/door.cpp
index
29220d2
..
a966908
100644
(file)
--- a/
src/trigger/door.cpp
+++ b/
src/trigger/door.cpp
@@
-121,6
+121,7
@@
Door::event(Player& , EventType type)
// if door was activated, start opening it
if (type == EVENT_ACTIVATE) {
state = OPENING;
+ sound_manager->play("sounds/door.wav");
sprite->set_action("opening", 1);
}
break;
@@
-142,7
+143,6
@@
Door::collision(GameObject& other, const CollisionHit& hit)
case OPENING:
break;
case OPEN:
-sound_manager->play("sounds/door.wav");
{
// if door is open and was touched by a player, teleport the player
Player* player = dynamic_cast<Player*> (&other);