Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Verschönerung Reportausgabe, Wirbel.

This commit is contained in:
Enno Rehling 2005-07-07 19:31:47 +00:00
parent a970f3b883
commit 17a6be3d0f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/gamecode/report.c
View File

@ -1273,7 +1273,6 @@ describe(FILE * F, const region * r, int partial, faction * f)
strcpy(bufp++, "."); strcpy(bufp++, ".");
dh = 1; dh = 1;
} }
if (dh) strcpy(bufp++, ".");
} }
} else { } else {
bufp += strxcpy(bufp, " Große Verwirrung befällt alle Reisenden in dieser Region."); bufp += strxcpy(bufp, " Große Verwirrung befällt alle Reisenden in dieser Region.");

12
src/common/kernel/spell.c
View File

@ -3002,8 +3002,7 @@ static region *
wall_move(const border * b, struct unit * u, struct region * from, struct region * to, boolean routing) wall_move(const border * b, struct unit * u, struct region * from, struct region * to, boolean routing)
{ {
wall_data * fd = (wall_data*)b->data.v; wall_data * fd = (wall_data*)b->data.v;
if (routing) return to; if (!routing && fd->active) {
if (fd->active) {
int hp = dice(3, fd->force) * u->number; int hp = dice(3, fd->force) * u->number;
hp = min (u->hp, hp); hp = min (u->hp, hp);
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; u->hp = u->number;
} }
} }
return NULL; return to;
} }
border_type bt_firewall = { 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; wall_data * wd = (wall_data*)b->data.v;
assert(reldir!=D_SPECIAL); assert(reldir!=D_SPECIAL);
if (!routing) return NULL; if (routing && wd->active) {
if (wd->active) {
/* pick left and right region: */ /* pick left and right region: */
region * rl = rconnect(from, (direction_t)((reldir+MAXDIRECTIONS-1)%MAXDIRECTIONS)); region * rl = rconnect(from, (direction_t)((reldir+MAXDIRECTIONS-1)%MAXDIRECTIONS));
region * rr = rconnect(from, (direction_t)((reldir+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, 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"); "Wirbel");
create_special_direction(rt, r, 2, 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"); "Wirbel");
new_border(&bt_chaosgate, r, rt); new_border(&bt_chaosgate, r, rt);