]> git.pond.sub.org Git - empserver/commitdiff
(move): Don't trigger interdiction when moving stuff that cannot be
authorMarkus Armbruster <armbru@pond.sub.org>
Tue, 27 Jun 2006 05:30:47 +0000 (05:30 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Tue, 27 Jun 2006 05:30:47 +0000 (05:30 +0000)
harmed (bars with opt_SUPER_BARS enabled).

src/lib/commands/move.c

index ae4f41447738d863d77fbcd0945cb5280b5b9b59..5bcaf755f8f5cd6626239b9aa14161de2c556e6f 100644 (file)
@@ -44,6 +44,7 @@
 #include "nsc.h"
 #include "land.h"
 #include "path.h"
+#include "optlist.h"
 #include "commands.h"
 
 
@@ -186,7 +187,7 @@ move(void)
     /*
      * Now parse the path and return ending sector.
      */
-    dam = (istest ? 0 : 1);
+    dam = !istest && !(opt_SUPER_BARS && vtype == I_BAR);
     if (dam && !chance(weight / 200.0))
        dam = 0;
     mcost = move_ground(&sect, &endsect, weight, player->argp[4],