summaryrefslogtreecommitdiff
path: root/src/game.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game.c')
-rw-r--r--src/game.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/game.c b/src/game.c
index d35d7a9..5467798 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,10 +1,8 @@
#include "game.h"
-#include "exit.h"
+#include "entity.h"
#include "map.h"
-#include "player.h"
#include "cfg.h"
#include "rotrect.h"
-#include "spike.h"
#include <string.h>
void
@@ -71,16 +69,19 @@ game_restart_scene(Game *this)
Entity *e;
switch (map_get(x, y)) {
case 2:
- e = player_init(game_create_entity(this), dx, dy);
+ e = entity_init(game_create_entity(this),
+ entity_type("player"), dx, dy);
e->player.dirx = this->player_dir;
break;
case 3:
case 4:
- e = exit_init(game_create_entity(this), dx, dy);
+ e = entity_init(game_create_entity(this),
+ entity_type("exit"), dx, dy);
e->exit.dir = (map_get(x, y) == 3) ? -1 : 1;
break;
case 5:
- spike_init(game_create_entity(this), dx, dy);
+ e = entity_init(game_create_entity(this),
+ entity_type("spike"), dx, dy);
break;
default:
break;