Makefile: Micropolis build fixes for recent macOS

[micropolis] / src / sim / w_sprite.c

diff --git a/src/sim/w_sprite.c b/src/sim/w_sprite.c
index c7258bb1c2197592722409d220a384aa4a998b48..c8837d5c80c7354814799105c14fff4e94bd0489 100644 (file)
--- a/src/sim/w_sprite.c
+++ b/src/sim/w_sprite.c
@@ -1052,7 +1052,14 @@ DoMonsterSprite(SimSprite *sprite)
 
   if (sprite->count > 0) sprite->count--;
   c = GetChar(sprite->x + sprite->x_hot, sprite->y + sprite->y_hot);
 
   if (sprite->count > 0) sprite->count--;
   c = GetChar(sprite->x + sprite->x_hot, sprite->y + sprite->y_hot);

-  if (c == -1) {
+  if ((c == -1)
+#ifndef ORIGINAL_MONSTER_BEHAVIOUR
+      || ((c == RIVER) &&
+       (sprite->count != 0) &&
+       (sprite->count < 900) &&
+       (sprite->control == -1))
+#endif
+     ) {

     sprite->frame = 0; /* kill zilla */
   }
 
     sprite->frame = 0; /* kill zilla */
   }