diff options
Diffstat (limited to 'src/char')
-rw-r--r-- | src/char/char.c | 18 | ||||
-rw-r--r-- | src/char/char.h | 2 | ||||
-rw-r--r-- | src/char/enemy.c | 14 | ||||
-rw-r--r-- | src/char/player.c | 5 |
4 files changed, 0 insertions, 39 deletions
diff --git a/src/char/char.c b/src/char/char.c index 4a4a4e7..0ab7145 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -126,24 +126,6 @@ mf_char_update(struct mf_char *c) } int -mf_char_collision(struct mf_char *c1, struct mf_char *c2, int handle) -{ - if (c1->cur_x == c2->cur_x && c1->cur_y == c2->cur_y) goto hit; - if (c1->cur_x == c2->new_x && c1->cur_y == c2->new_y) goto hit; - if (c1->new_x == c2->cur_x && c1->new_y == c2->cur_y) goto hit; - if (c1->new_x == c2->new_x && c1->new_y == c2->new_y) goto hit; - - return 0; - - hit: - if (handle == SDL_TRUE) { - c1->collide(c1); - c2->collide(c2); - } - return 1; -} - -int mf_char_render(struct mf_char *c, SDL_Renderer *renderer) { int e = 0; diff --git a/src/char/char.h b/src/char/char.h index 02bddaa..f5054d5 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -54,7 +54,6 @@ struct mf_char { int (*update)(struct mf_char *); int (*step)(struct mf_char *); int (*turn)(struct mf_char *); - void (*collide)(struct mf_char *); int (*render)(struct mf_char *, SDL_Renderer *); void (*destroy)(struct mf_char *); }; @@ -71,7 +70,6 @@ mf_char_new(size_t size); c->update = &_mf_##name##_update; \ c->step = &_mf_##name##_step; \ c->turn = &_mf_##name##_turn; \ - c->collide = &_mf_##name##_collide; \ c->render = &_mf_##name##_render; \ c->destroy = &_mf_##name##_destroy; \ t_c = (struct mf_##name *) c; \ diff --git a/src/char/enemy.c b/src/char/enemy.c index eeda38d..ff00915 100644 --- a/src/char/enemy.c +++ b/src/char/enemy.c @@ -160,20 +160,6 @@ _mf_enemy_update(struct mf_char *c) } } -static void -_mf_enemy_collide(struct mf_char *c) -{ - /* Don't go forward unless necessary */ - switch (c->cur_dir) { - case MF_CHAR_DIR_U_: c->cur_dir = MF_CHAR_DIR_D_; break; - case MF_CHAR_DIR_D_: c->cur_dir = MF_CHAR_DIR_U_; break; - case MF_CHAR_DIR_L_: c->cur_dir = MF_CHAR_DIR_R_; break; - case MF_CHAR_DIR_R_: c->cur_dir = MF_CHAR_DIR_L_; break; - default: c->cur_dir = MF_CHAR_DIR_N_; break; - } - _mf_enemy_step(c); -} - static int _mf_enemy_render(struct mf_char *c __attribute__((__unused__)), SDL_Renderer *renderer __attribute__((__unused__))) diff --git a/src/char/player.c b/src/char/player.c index fdeac5c..eff0dbd 100644 --- a/src/char/player.c +++ b/src/char/player.c @@ -74,11 +74,6 @@ _mf_player_render(struct mf_char *c __attribute__((__unused__)), } static void -_mf_player_collide(struct mf_char *c __attribute__((__unused__))) -{ -} - -static void _mf_player_destroy(struct mf_char *c __attribute__((__unused__))) { } |