From: Wintermute <wintermute@hannover.ccc.de>
Date: Sat, 19 Oct 2013 12:13:51 +0000 (+0200)
Subject: Pilzverhalten: Läuft unter Spieler hin und her.
X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/commitdiff_plain/d8c4e7ab615a1d81ff3ba7d8a967f3dd2f250abc

Pilzverhalten: Läuft unter Spieler hin und her.
---

diff --git a/badge/jumpnrun/enemies.c b/badge/jumpnrun/enemies.c
index cc72db3..914d342 100644
--- a/badge/jumpnrun/enemies.c
+++ b/badge/jumpnrun/enemies.c
@@ -280,13 +280,12 @@ void enemy_tick_straight_follow(jumpnrun_enemy            *self,
   self->type->collision_player(self, state, player_inertia_mod);
   rectangle_move_to(&self->base.current_box, new_pos);
 
-  if(fixed_point_le(rectangle_mid_x(&state->player.current_box), rectangle_mid_x(enemy_box(self)))) {
+  if(fixed_point_lt(rectangle_right(&state->player.current_box), rectangle_left(enemy_box(self)))) {
     self->base.inertia.x = self->type->spawn_inertia.x;
-  } else {
+  } else if(fixed_point_gt(rectangle_left(&state->player.current_box), rectangle_right(enemy_box(self)))) {
     self->base.inertia.x = fixed_point_neg(self->type->spawn_inertia.x);
   }
 
-
   enemy_animation_advance(self);
 }