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

Nächstes mal compilieren wir das, ehe wir committen.

This commit is contained in:
Enno Rehling 2004-04-10 11:05:34 +00:00
parent e319698a43
commit 3316243651
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/kernel/movement.c
View File

@ -447,14 +447,16 @@ travelthru(unit * u, region * r)
} }
static void static void
leave_trail(ship * sh, region **route) leave_trail(unit * u, region **route, region * to)
{ {
region **ri = route; region **ri = route;
ship * sh = u->ship;
while (*ri) { while (*ri) {
region *r = *ri; region * r = *ri++;
direction_t dir = reldirection(*ri, *rn); region * rn = *ri?*ri:to;
attrib * a = a_find((*ri)->attribs, &at_traveldir_new); direction_t dir = reldirection(r, rn);
attrib * a = a_find(r->attribs, &at_traveldir_new);
traveldir * td = NULL; traveldir * td = NULL;
while (a!=NULL) { while (a!=NULL) {
@ -464,7 +466,7 @@ leave_trail(ship * sh, region **route)
} }
if (a!=NULL) { if (a!=NULL) {
a = a_add(&((*ri)->attribs), a_new(&at_traveldir_new)); a = a_add(&(r->attribs), a_new(&at_traveldir_new));
td = (traveldir *)a->data.v; td = (traveldir *)a->data.v;
td->no = sh->no; td->no = sh->no;
} }
@ -472,7 +474,6 @@ leave_trail(ship * sh, region **route)
td->age = 2; td->age = 2;
travelthru(u, r); travelthru(u, r);
++ri;
} }
} }
@ -481,8 +482,6 @@ move_ship(ship * sh, region * from, region * to, region ** route)
{ {
unit **iunit = &from->units; unit **iunit = &from->units;
unit **ulist = &to->units; unit **ulist = &to->units;
direction_t dir;
attrib *a;
boolean trail = (route==NULL); boolean trail = (route==NULL);
if (from!=to) { if (from!=to) {
@ -496,7 +495,7 @@ move_ship(ship * sh, region * from, region * to, region ** route)
if (u->ship == sh) { if (u->ship == sh) {
if (!trail) { if (!trail) {
leave_trail(sh, from, to, route); leave_trail(u, route, to);
trail=true; trail=true;
} }
if (from!=to) { if (from!=to) {

1
src/res/eressea.xml
View File

@ -4,7 +4,6 @@
<comment>Localization</comment> <comment>Localization</comment>
<xi:include href="de/strings.xml"/> <xi:include href="de/strings.xml"/>
<xi:include href="de/strings-eressea.xml"/>
<xi:include href="en/strings.xml"/> <xi:include href="en/strings.xml"/>
<xi:include href="races.xml"/> <xi:include href="races.xml"/>