X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Ftrigger_base.cpp;h=e3c2bf1b49560299c0afb276ed04b23fdb6816ef;hb=d62647592b4ccffa89794af6fa03faaced46999d;hp=e6b143a2dba205dd478b6867d2482bcb92528d01;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp index e6b143a2d..e3c2bf1b4 100644 --- a/src/trigger/trigger_base.cpp +++ b/src/trigger/trigger_base.cpp @@ -18,13 +18,14 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "trigger_base.h" -#include "player.h" -#include "video/drawing_context.h" +#include "trigger_base.hpp" +#include "video/drawing_context.hpp" +#include "object/player.hpp" TriggerBase::TriggerBase() : sprite(0) { + set_group(COLGROUP_TOUCHABLE); } TriggerBase::~TriggerBase() @@ -32,7 +33,7 @@ TriggerBase::~TriggerBase() } void -TriggerBase::action(float ) +TriggerBase::update(float ) { lasthit = hit; hit = false;