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

Flucht richtig anzeigen, und transporte nicht doppelt zeigen.

This commit is contained in:
Enno Rehling 2004-12-19 22:18:39 +00:00
parent 41c4568c02
commit 35ae4b0a60
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/eressea.c
View File

@ -586,7 +586,7 @@ shipspeed (const ship * sh, const unit * u)
} }
a = a_find(sh->attribs, &at_speedup); a = a_find(sh->attribs, &at_speedup);
while(a != NULL) { while (a != NULL) {
k += a->data.i; k += a->data.i;
a = a->nexttype; a = a->nexttype;
} }

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

@ -1299,7 +1299,7 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
if (iroute!=route_begin) { if (iroute!=route_begin) {
/* the unit has moved at least one region */ /* the unit has moved at least one region */
int mode; int walkmode;
region_list *rlist = route_begin; region_list *rlist = route_begin;
char * p = buf; char * p = buf;
region * next = r; region * next = r;
@ -1307,12 +1307,14 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
setguard(u, GUARD_NONE); setguard(u, GUARD_NONE);
cycle_route(u, steps); cycle_route(u, steps);
if (canride(u)) { if (mode==TRAVEL_RUNNING) {
mode = 1; walkmode = 0;
} if (canride(u)) {
walkmode = 1;
produceexp(u, SK_RIDING, u->number); produceexp(u, SK_RIDING, u->number);
} else { } else {
mode = 2; walkmode = 2;
} /* TODO: Flucht mit 0, was mit transport? */ }
/* Berichte über Durchreiseregionen */ /* Berichte über Durchreiseregionen */
@ -1330,8 +1332,10 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
next = rlist->data; next = rlist->data;
rlist = rlist->next; rlist = rlist->next;
} }
ADDMSG(&u->faction->msgs, msg_message("travel", if (mode!=TRAVEL_TRANSPORTED) {
"unit mode start end regions", u, mode, r, current, strdup(buf))); ADDMSG(&u->faction->msgs, msg_message("travel",
"unit mode start end regions", u, walkmode, r, current, strdup(buf)));
}
mark_travelthru(u, r, route_begin, iroute); mark_travelthru(u, r, route_begin, iroute);
move_unit(u, current, NULL); move_unit(u, current, NULL);