From: Tobias Markus Date: Mon, 12 Aug 2013 19:51:14 +0000 (-1000) Subject: Reset points no longer activate if already in ringing state. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3f9a77ccb044629d1dd50896ea8af9f0a2725f6d;p=supertux.git Reset points no longer activate if already in ringing state. --- diff --git a/src/object/firefly.cpp b/src/object/firefly.cpp index e699cd25a..4f1e2a3a8 100644 --- 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 (&other);