projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb716b3
)
Reset points no longer activate if already in ringing state.
author
Tobias Markus
<tobbi@mozilla-uk.org>
Mon, 12 Aug 2013 19:51:14 +0000
(09:51 -1000)
committer
LMH
<lmh.0013@gmail.com>
Mon, 12 Aug 2013 19:51:14 +0000
(09:51 -1000)
src/object/firefly.cpp
patch
|
blob
|
history
diff --git
a/src/object/firefly.cpp
b/src/object/firefly.cpp
index
e699cd2
..
4f1e2a3
100644
(file)
--- a/
src/object/firefly.cpp
+++ b/
src/object/firefly.cpp
@@
-67,7
+67,8
@@
Firefly::reactivate()
HitResponse
Firefly::collision(GameObject& other, const CollisionHit& )
{
- if(activated)
+ // If the bell is already activated, don't ring it again!
+ if(activated || sprite->get_action() == "ringing")
return ABORT_MOVE;
Player* player = dynamic_cast<Player*> (&other);