projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed collision code, we now have several collision groups:
[supertux.git]
/
src
/
trigger
/
trigger_base.cpp
diff --git
a/src/trigger/trigger_base.cpp
b/src/trigger/trigger_base.cpp
index
e6b143a
..
e3c2bf1
100644
(file)
--- 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 <config.h>
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
-#include "trigger_base.h"
-#include "
player.h
"
-#include "
video/drawing_context.h
"
+#include "trigger_base.h
pp
"
+#include "
video/drawing_context.hpp
"
+#include "
object/player.hpp
"
TriggerBase::TriggerBase()
: sprite(0)
{
TriggerBase::TriggerBase()
: sprite(0)
{
+ set_group(COLGROUP_TOUCHABLE);
}
TriggerBase::~TriggerBase()
}
TriggerBase::~TriggerBase()
@@
-32,7
+33,7
@@
TriggerBase::~TriggerBase()
}
void
}
void
-TriggerBase::
action
(float )
+TriggerBase::
update
(float )
{
lasthit = hit;
hit = false;
{
lasthit = hit;
hit = false;