From 17a6be3d0f4deecc00a42f8dd21f565bfabd1cec Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 7 Jul 2005 19:31:47 +0000
Subject: [PATCH] =?UTF-8?q?Versch=C3=B6nerung=20Reportausgabe,=20Wirbel.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/report.c |  1 -
 src/common/kernel/spell.c    | 12 +++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 4f98a9701..af581bc00 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -1273,7 +1273,6 @@ describe(FILE * F, const region * r, int partial, faction * f)
 				strcpy(bufp++, ".");
 				dh = 1;
 			}
-			if (dh) strcpy(bufp++, ".");
 		}
 	} else {
 		bufp += strxcpy(bufp, " Große Verwirrung befällt alle Reisenden in dieser Region.");
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index 16f47aef0..d4935c282 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -3002,8 +3002,7 @@ static region *
 wall_move(const border * b, struct unit * u, struct region * from, struct region * to, boolean routing)
 {
   wall_data * fd = (wall_data*)b->data.v;
-  if (routing) return to;
-  if (fd->active) {
+  if (!routing && fd->active) {
     int hp = dice(3, fd->force) * u->number;
     hp = min (u->hp, hp);
     u->hp -= hp;
@@ -3017,7 +3016,7 @@ wall_move(const border * b, struct unit * u, struct region * from, struct region
       u->hp = u->number;
     }
   }
-  return NULL;
+  return to;
 }
 
 border_type bt_firewall = {
@@ -3120,8 +3119,7 @@ wisps_move(const border * b, struct unit * u, struct region * from, struct regio
   wall_data * wd = (wall_data*)b->data.v;
   assert(reldir!=D_SPECIAL);
 
-  if (!routing) return NULL;
-  if (wd->active) {
+  if (routing && wd->active) {
     /* pick left and right region: */
     region * rl = rconnect(from, (direction_t)((reldir+MAXDIRECTIONS-1)%MAXDIRECTIONS));
     region * rr = rconnect(from, (direction_t)((reldir+1)%MAXDIRECTIONS));
@@ -3626,10 +3624,10 @@ sp_chaossuction(castorder *co)
 	}
 
 	create_special_direction(r, rt, 2,
-			"Ein Wirbel aus reinem Chaos zieht über die Region.",
+			"Ein Wirbel aus reinem Chaos zieht über die Region",
 			"Wirbel");
 	create_special_direction(rt, r, 2,
-			"Ein Wirbel aus reinem Chaos zieht über die Region.",
+			"Ein Wirbel aus reinem Chaos zieht über die Region",
 			"Wirbel");
   new_border(&bt_chaosgate, r, rt);