diff options
Diffstat (limited to 'src/entity.h')
-rw-r--r-- | src/entity.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/entity.h b/src/entity.h index 5c75ab2..532bd12 100644 --- a/src/entity.h +++ b/src/entity.h @@ -2,18 +2,11 @@ #include "player.h" #include "exit.h" #include "deathpart.h" -#include "spike.h" #include <stdbool.h> struct Game; -enum { - ET_NONE, - ET_player, - ET_exit, - ET_deathpart, - ET_spike, -}; +enum { ET_NONE = 0 }; typedef struct Entity Entity; struct Entity { @@ -36,6 +29,7 @@ struct Entity { }; }; +unsigned int entity_type(const char *type); bool entity_collide(Entity *this, struct Game *g, int ox, int oy); bool entity_meet(Entity *this, Entity *other); Entity *entity_place_meeting(Entity *this, struct Game *g, unsigned int type); |