projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let navigate through the worldmap using Tux keys as well.
[supertux.git]
/
src
/
collision.h
diff --git
a/src/collision.h
b/src/collision.h
index
f813f2a
..
85b89d7
100644
(file)
--- a/
src/collision.h
+++ b/
src/collision.h
@@
-21,17
+21,20
@@
#ifndef SUPERTUX_COLLISION_H
#define SUPERTUX_COLLISION_H
#ifndef SUPERTUX_COLLISION_H
#define SUPERTUX_COLLISION_H
-#include "type.h"
+#include "special/base.h"
+
+using namespace SuperTux;
class Tile;
class Tile;
-class World;
/* Collision objects */
enum
{
CO_BULLET,
CO_BADGUY,
/* Collision objects */
enum
{
CO_BULLET,
CO_BADGUY,
- CO_PLAYER
+ CO_PLAYER,
+ CO_TRAMPOLINE,
+ CO_FLYING_PLATFORM
};
enum CollisionType {
};
enum CollisionType {
@@
-53,6
+56,7
@@
Tile* gettile(float x, float y);
bool issolid(float x, float y);
bool isbrick(float x, float y);
bool isice(float x, float y);
bool issolid(float x, float y);
bool isbrick(float x, float y);
bool isice(float x, float y);
+bool isspike(float x, float y);
bool isfullbox(float x, float y);
typedef void* (*tiletestfunction)(Tile* tile);
bool isfullbox(float x, float y);
typedef void* (*tiletestfunction)(Tile* tile);