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

http://bugs.eressea.de/view.php?id=1438 

"FOLGEnde Einheiten reiten, können aber nicht folgen"
when a unit couldn't keep up, all furhter followers would not travel the entire route. more const ftw
Issue: 1438
This commit is contained in:
Enno Rehling 2008-06-04 14:40:20 +00:00
parent a63cd86e44
commit 310fa1e3f2
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/kernel/move.c
View File

@ -91,11 +91,11 @@ typedef struct follower {
struct follower * next; struct follower * next;
unit * uf; unit * uf;
unit * ut; unit * ut;
region_list * route_end; const region_list * route_end;
} follower; } follower;
static void static void
get_followers(unit * target, region * r, region_list * route_end, follower ** followers) get_followers(unit * target, region * r, const region_list * route_end, follower ** followers)
{ {
unit * uf; unit * uf;
for (uf=r->units;uf;uf=uf->next) { for (uf=r->units;uf;uf=uf->next) {
@ -560,7 +560,7 @@ leave_trail(ship * sh, region * from, region_list *route)
} }
static void static void
mark_travelthru(const unit * u, region * r, region_list * route, region_list * route_end) mark_travelthru(const unit * u, region * r, const region_list * route, const region_list * route_end)
{ {
/* kein travelthru in der letzten region! */ /* kein travelthru in der letzten region! */
while (route!=route_end) { while (route!=route_end) {
@ -1138,12 +1138,12 @@ roadto(const region * r, direction_t dir)
return true; return true;
} }
static region_list * static const region_list *
cap_route(region * r, region_list * route, region_list * route_end, int speed) cap_route(region * r, const region_list * route, const region_list * route_end, int speed)
{ {
region * current = r; region * current = r;
int moves = speed; int moves = speed;
region_list * iroute = route; const region_list * iroute = route;
while (iroute!=route_end) { while (iroute!=route_end) {
region * next = iroute->data; region * next = iroute->data;
direction_t reldir = reldirection(current, next); direction_t reldir = reldirection(current, next);
@ -1180,8 +1180,8 @@ next_region(unit * u, region * current, region * next)
return next; return next;
} }
static region_list * static const region_list *
reroute(unit * u, region_list * route, region_list * route_end) reroute(unit * u, const region_list * route, const region_list * route_end)
{ {
region * current = u->region; region * current = u->region;
while (route!=route_end) { while (route!=route_end) {
@ -1325,12 +1325,12 @@ enum {
TRAVEL_RUNNING TRAVEL_RUNNING
}; };
static region_list * static const region_list *
travel_route(unit * u, region_list * route_begin, region_list * route_end, order * ord, int mode) travel_route(unit * u, const region_list * route_begin, const region_list * route_end, order * ord, int mode)
{ {
region * r = u->region; region * r = u->region;
region * current = u->region; region * current = u->region;
region_list * iroute = route_begin; const region_list * iroute = route_begin;
int steps = 0; int steps = 0;
boolean landing = false; /* aquarians have landed */ boolean landing = false; /* aquarians have landed */
@ -1453,7 +1453,6 @@ 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 walkmode; int walkmode;
region_list **rlist = &route_begin;
setguard(u, GUARD_NONE); setguard(u, GUARD_NONE);
cycle_route(ord, u, steps); cycle_route(ord, u, steps);
@ -1469,14 +1468,6 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
/* Berichte über Durchreiseregionen */ /* Berichte über Durchreiseregionen */
while (*rlist!=iroute) {
rlist = &(*rlist)->next;
}
/* remove excess regions */
*rlist = NULL;
free_regionlist(iroute);
iroute = NULL;
if (mode!=TRAVEL_TRANSPORTED) { if (mode!=TRAVEL_TRANSPORTED) {
ADDMSG(&u->faction->msgs, msg_message("travel", ADDMSG(&u->faction->msgs, msg_message("travel",
"unit mode start end regions", u, walkmode, r, current, route_begin->next?route_begin:NULL)); "unit mode start end regions", u, walkmode, r, current, route_begin->next?route_begin:NULL));
@ -1886,8 +1877,8 @@ run_to(unit * u, region * to)
/* weder transport noch follow */ /* weder transport noch follow */
} }
static region_list * static const region_list *
travel_i(unit * u, region_list * route_begin, region_list * route_end, order * ord, int mode, follower ** followers) travel_i(unit * u, const region_list * route_begin, const region_list * route_end, order * ord, int mode, follower ** followers)
{ {
region * r = u->region; region * r = u->region;
@ -1923,7 +1914,7 @@ travel_i(unit * u, region_list * route_begin, region_list * route_end, order * o
init_tokens(ut->thisorder); init_tokens(ut->thisorder);
skip_token(); skip_token();
if (getunit(u->region, ut->faction) == u) { if (getunit(u->region, ut->faction) == u) {
region_list * route_to = travel_route(ut, route_begin, route_end, ord, TRAVEL_TRANSPORTED); const region_list * route_to = travel_route(ut, route_begin, route_end, ord, TRAVEL_TRANSPORTED);
if (route_to!=route_begin) { if (route_to!=route_begin) {
get_followers(ut, r, route_to, followers); get_followers(ut, r, route_to, followers);
@ -1957,7 +1948,6 @@ static void
travel(unit * u, region_list ** routep) travel(unit * u, region_list ** routep)
{ {
region * r = u->region; region * r = u->region;
region_list * route_end;
region_list * route_begin = NULL; region_list * route_begin = NULL;
follower * followers = NULL; follower * followers = NULL;
@ -1993,14 +1983,14 @@ travel(unit * u, region_list ** routep)
route_begin = *routep; route_begin = *routep;
/* und ab die post: */ /* und ab die post: */
route_end = travel_i(u, route_begin, NULL, u->thisorder, TRAVEL_NORMAL, &followers); travel_i(u, route_begin, NULL, u->thisorder, TRAVEL_NORMAL, &followers);
/* followers */ /* followers */
while (followers!=NULL) { while (followers!=NULL) {
follower * fnext = followers->next; follower * fnext = followers->next;
unit * uf = followers->uf; unit * uf = followers->uf;
unit * ut = followers->ut; unit * ut = followers->ut;
region_list * route_end = followers->route_end; const region_list * route_end = followers->route_end;
free(followers); free(followers);
followers = fnext; followers = fnext;