make monster behaviour configurable

diff --git a/src/sim/makefile b/src/sim/makefile
index f773cd9a3ae65bb60df3808e4ba66010694a2163..bdf58472a6e1aa166281b2d9a0602b46ddf1d9f2 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -13,8 +13,14 @@ CC = gcc
 OPTFLAGS = -O3
 #OPTFLAGS = -g
 
 OPTFLAGS = -O3
 #OPTFLAGS = -g
 

+#Possible defines:
+#ORIGINAL_MONSTER_BEHAVIOUR: The monster is able to walk over water and not die
+#NO_AIRCRASH: The Aircrash-Disaster is disables completely
+#CAM: ?
+#NET: ?
+

 #DEFINES = -DIS_LINUX -DCAM -DNET
 #DEFINES = -DIS_LINUX -DCAM -DNET

-DEFINES = -DIS_LINUX #-DNO_AIRCRASH
+DEFINES = -DIS_LINUX -DORIGINAL_MONSTER_BEHAVIOUR #-DNO_AIRCRASH

 
 CFLAGS += $(OPTFLAGS) $(DEFINES) -Wall
 
 
 CFLAGS += $(OPTFLAGS) $(DEFINES) -Wall
 

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 */
   }