From: ian Date: Sun, 4 May 2008 21:06:18 +0000 (+0000) Subject: correct argument order for change_needed X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=bd9da1a409d2bf8800a04d8c98e006b387d293c7;p=trains.git correct argument order for change_needed --- diff --git a/hostside/movpos.c b/hostside/movpos.c index 35196c0..586bcf7 100644 --- a/hostside/movpos.c +++ b/hostside/movpos.c @@ -551,15 +551,15 @@ static Change *mp_allocate(const KindInfo *ki, Segment *move, return chg; } -static int change_needed(const MovFeatInfo *feati, MovPosComb target, - MovPosComb startpoint) { +static int change_needed(const MovFeatInfo *feati, + MovPosComb startpoint, MovPosComb target) { int r; r= startpoint<0 || (target - startpoint) / feati->weight % feati->posns; - oprintf(DUPO("movpos/change-needed") "%s:%s(%d*%d) %d<-%d => %d\n", + oprintf(DUPO("movpos/change-needed") "%s:%s(%d*%d) %d..%d => %d\n", methodinfos[feati->kind].pname, feati->pname, feati->posns, feati->weight, - target, startpoint, r); + startpoint, target, r); return r; } @@ -584,7 +584,7 @@ static int evaluate_target(Segment *move, MovPosComb target, for (feat=0, feati=movei->movfeats, tchanges=0, kind= mfk_none; featn_movfeats; feat++, feati++) { - if (!change_needed(feati,target,startpoint)) continue; + if (!change_needed(feati,startpoint,target)) continue; tchanges++; if (kind && feati->kind != kind) return -1; kind= feati->kind;