Sinnvolleres Spawn- und Bewegungsverhalten.

diff --git a/badge/jumpnrun/enemies.c b/badge/jumpnrun/enemies.c
index 61859a8..ed044bd 100644 (file)
--- a/badge/jumpnrun/enemies.c
+++ b/badge/jumpnrun/enemies.c
@@ -101,7 +101,7 @@ static void enemy_spawn(jumpnrun_enemy *self) {
 
 void jumpnrun_enemy_despawn(jumpnrun_enemy *self) {
   // Despawned enemies are reset to their spawn position, so enemy_in_spawn_area will determine whether the spawn point is in the spawn area.
-  self->base.flags  &= ~JUMPNRUN_ENEMY_SPAWNED;
+  self->base.flags  &= ~(JUMPNRUN_ENEMY_SPAWNED | JUMPNRUN_ENEMY_MOVING);
   self->base.hitbox  = rectangle_new(self->spawn_pos, self->type->hitbox.extent);
   self->base.inertia = self->type->spawn_inertia;
 }
@@ -130,7 +130,7 @@ static inline bool enemy_in_area(jumpnrun_enemy const *self, jumpnrun_game_state
 }
 
 static inline bool enemy_on_screen(jumpnrun_enemy const *self, jumpnrun_game_state *state) {
-  return enemy_in_area(self, state, 0);
+  return enemy_in_area(self, state, self->type->animation_frames[self->base.anim_frame].width);
 }
 
 static inline bool enemy_in_spawn_area(jumpnrun_enemy const *self, jumpnrun_game_state *state) {
@@ -148,10 +148,14 @@ void jumpnrun_process_enemy(jumpnrun_enemy                   *self,
     if(!enemy_in_spawn_area(self, state) || fixed_point_gt(rectangle_top (enemy_hitbox(self)), FIXED_INT(BADGE_DISPLAY_HEIGHT))) {
       jumpnrun_enemy_despawn(self);
     } else {
-      self->type->move_tick(self, state, lv, visible_tiles, player_inertia_mod);
-      self->type->collision_shots(self, state);
-      if     (fixed_point_lt(self->base.inertia.x, FIXED_INT(0))) { self->base.flags &= ~JUMPNRUN_MOVEABLE_MIRRORED; }
-      else if(fixed_point_ne(self->base.inertia.x, FIXED_INT(0))) { self->base.flags |=  JUMPNRUN_MOVEABLE_MIRRORED; }
+      if((self->base.flags & JUMPNRUN_ENEMY_MOVING) || enemy_on_screen(self, state)) {
+        self->base.flags |= JUMPNRUN_ENEMY_MOVING;
+
+        self->type->move_tick(self, state, lv, visible_tiles, player_inertia_mod);
+        self->type->collision_shots(self, state);
+        if     (fixed_point_lt(self->base.inertia.x, FIXED_INT(0))) { self->base.flags &= ~JUMPNRUN_MOVEABLE_MIRRORED; }
+        else if(fixed_point_ne(self->base.inertia.x, FIXED_INT(0))) { self->base.flags |=  JUMPNRUN_MOVEABLE_MIRRORED; }
+      }
 
       if(fb) {
         jumpnrun_render_enemy(fb, state, self);
@@ -221,7 +225,6 @@ void enemy_collision_tiles_pass_through(struct jumpnrun_enemy             *self,
   (void) desired_position;
   (void) lv;
   (void) visible_tiles;
-  return;
 }
 
 void enemy_collision_shots_die(struct jumpnrun_enemy      *self,
@@ -485,7 +488,7 @@ jumpnrun_enemy_type const jumpnrun_enemy_type_data[JUMPNRUN_ENEMY_TYPE_COUNT] =
     .animation_length          = ARRAY_SIZE(anim_mushroom),
     .animation_frames          = anim_mushroom,
     .hitbox                    = { { FIXED_INT_I(1), FIXED_INT_I(1) },
-                                   { FIXED_INT_I(5), FIXED_INT_I(4) } },
+                                   { FIXED_INT_I(5), FIXED_INT_I(6) } },
     .spawn_inertia             = { FIXED_POINT_I(0, -80), FIXED_INT_I(0) },
     .collision_tiles           = enemy_collision_tiles_bounce_horiz,
     .collision_player          = enemy_collision_player_jumpable,

diff --git a/badge/jumpnrun/enemies.h b/badge/jumpnrun/enemies.h
index 1cf8f06..075255e 100644 (file)
--- a/badge/jumpnrun/enemies.h
+++ b/badge/jumpnrun/enemies.h
@@ -47,9 +47,10 @@ typedef struct jumpnrun_enemy {
 
 enum {
 // Do not collide with JUMPNRUN_MOVEABLE_* flags
-  JUMPNRUN_ENEMY_SPAWNED        = 4,
-  JUMPNRUN_ENEMY_UNAVAILABLE    = 8,
-  JUMPNRUN_ENEMY_EVENT_TRIGGER1 = 128
+  JUMPNRUN_ENEMY_SPAWNED        = 128,
+  JUMPNRUN_ENEMY_UNAVAILABLE    =  64,
+  JUMPNRUN_ENEMY_MOVING         =  32,
+  JUMPNRUN_ENEMY_EVENT_TRIGGER1 =  16,
 };
 
 static inline rectangle    const *enemy_hitbox(jumpnrun_enemy const *enemy) { return &enemy->base.hitbox; }

diff --git a/badge/jumpnrun/level_load.c b/badge/jumpnrun/level_load.c
index bcdb390..bf491f8 100644 (file)
--- a/badge/jumpnrun/level_load.c
+++ b/badge/jumpnrun/level_load.c
@@ -51,8 +51,8 @@ static void jumpnrun_level_make_enemy(jumpnrun_enemy *dest, level_thing thing) {
 
   dest->type = &jumpnrun_enemy_type_data[thing.type];
 
-  dest->spawn_pos.x = FIXED_POINT( thing.x      * JUMPNRUN_TILE_PIXEL_WIDTH  + fixed_point_cast_int(dest->type->hitbox.pos.x), 0);
-  dest->spawn_pos.y = FIXED_POINT((thing.y + 1) * JUMPNRUN_TILE_PIXEL_HEIGHT - dest->type->animation_frames[0].height        , 0);
+  dest->spawn_pos.x = FIXED_INT( thing.x      * JUMPNRUN_TILE_PIXEL_WIDTH  + fixed_point_cast_int(dest->type->hitbox.pos.x));
+  dest->spawn_pos.y = FIXED_INT((thing.y + 1) * JUMPNRUN_TILE_PIXEL_HEIGHT - fixed_point_cast_int(dest->type->hitbox.extent.y));
   jumpnrun_enemy_despawn(dest);
 }
 

diff --git a/badge/jumpnrun/player.h b/badge/jumpnrun/player.h
index 1b193b5..27e4cc2 100644 (file)
--- a/badge/jumpnrun/player.h
+++ b/badge/jumpnrun/player.h
@@ -7,7 +7,7 @@
 
 enum {
   // Do not collide with JUMPNRUN_MOVEABLE_* flags
-  JUMPNRUN_PLAYER_DEAD = 4
+  JUMPNRUN_PLAYER_DEAD = 128
 };
 
 enum {