summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/char/enemy.c71
1 files changed, 35 insertions, 36 deletions
diff --git a/src/char/enemy.c b/src/char/enemy.c
index 3f9f994..a8cda76 100644
--- a/src/char/enemy.c
+++ b/src/char/enemy.c
@@ -112,39 +112,6 @@ _mf_enemy_step(struct mf_char *c)
static int
_mf_enemy_turn(struct mf_char *c)
{
- struct mf_enemy *e = (struct mf_enemy *) c;
- int dx;
- int dy;
- int i;
-
- switch (c->cur_dir) {
- case MF_CHAR_DIR_U_: dx = 0; dy = -1; break;
- case MF_CHAR_DIR_D_: dx = 0; dy = 1; break;
- case MF_CHAR_DIR_L_: dx = -1; dy = 0; break;
- case MF_CHAR_DIR_R_: dx = 1; dy = 0; break;
- default: dx = 0; dy = 0; break;
- }
-
- for (i = 0; i < e->num_allies; ++i) {
- if (e->allies[i] == c) {
- /* Found self */
- continue;
- }
- if (e->allies[i]->cur_x == c->cur_x + dx &&
- e->allies[i]->cur_y == c->cur_y + dy) {
- /* Another enemy currently in this direction */
- return _mf_enemy_step(c);
- }
- if (e->allies[i]->new_x == c->cur_x + dx &&
- e->allies[i]->new_y == c->cur_y + dy) {
- /* Another enemy moving in this direction */
- return _mf_enemy_step(c);
- }
- }
-
- /* Go straight */
- c->new_dir = c->cur_dir;
-
return 0;
}
@@ -244,9 +211,41 @@ mf_enemy_random_jump(struct mf_char *c, int maze_size)
int
mf_enemy_postupdate(struct mf_char *c)
{
- if (c->travel == 0 && c->turning == 0) {
- return _mf_enemy_turn(c);
- } else {
+ struct mf_enemy *e = (struct mf_enemy *) c;
+ int dx;
+ int dy;
+ int i;
+
+ if (c->turning > 0 || c->new_dir != MF_CHAR_DIR_N_) {
return 0;
}
+
+ switch (c->cur_dir) {
+ case MF_CHAR_DIR_U_: dx = 0; dy = -1; break;
+ case MF_CHAR_DIR_D_: dx = 0; dy = 1; break;
+ case MF_CHAR_DIR_L_: dx = -1; dy = 0; break;
+ case MF_CHAR_DIR_R_: dx = 1; dy = 0; break;
+ default: dx = 0; dy = 0; break;
+ }
+
+ for (i = 0; i < e->num_allies; ++i) {
+ if (e->allies[i] == c) {
+ /* Found self */
+ continue;
+ }
+ if (e->allies[i]->cur_x == c->cur_x + dx &&
+ e->allies[i]->cur_y == c->cur_y + dy) {
+ /* Another enemy currently in this direction */
+ return _mf_enemy_step(c);
+ }
+ if (e->allies[i]->new_x == c->cur_x + dx &&
+ e->allies[i]->new_y == c->cur_y + dy) {
+ /* Another enemy moving in this direction */
+ return _mf_enemy_step(c);
+ }
+ }
+
+ /* Go straight */
+ c->new_dir = c->cur_dir;
+ return 0;
}