safety: movpos: use new movposcomb_feature_posn function as applicable; no functional...

diff --git a/hostside/movpos.c b/hostside/movpos.c
index 75a139d93b73e7cfdac8615ea96ecea8631a5386..d487e0a51084df98278d5b64f560f3e41432aec3 100644 (file)
--- a/hostside/movpos.c
+++ b/hostside/movpos.c
@@ -768,8 +768,8 @@ static int change_needed(int featix, const MovFeatInfo *feati,
   int r;
 
   r= (startpointunk & unkfeatbit(featix)) ||
-    (target / feati->weight) % feati->posns -
-    (startpointpos / feati->weight) % feati->posns;
+    movposcomb_feature_posn(feati, target) -
+    movposcomb_feature_posn(feati, startpointpos);
 
   if (DEBUGP(movpos,eval))
     DPRINTFA(" { %s:%s(%d*%d) %d..%d => %d }",
@@ -841,7 +841,7 @@ static ErrorCode indep_prepare(Segment *move, MovPosComb target,
          DPRINTF2("%s?", feati->pname);
        else
          DPRINTF2("%s%d", feati->pname,
-                  startpointpos / feati->weight % feati->posns);
+                  movposcomb_feature_posn(feati, startpointpos));
       }
     }
   }
@@ -854,7 +854,7 @@ static ErrorCode indep_prepare(Segment *move, MovPosComb target,
                       startpointpos,startpointunk,
                       target))
       continue;
-    MovPosComb posn= target / feati->weight % feati->posns;
+    MovPosComb posn= movposcomb_feature_posn(feati, target);
     Method *meth= feature_method(feati);
 
     int methi;
@@ -1207,7 +1207,7 @@ void movpos_reportall(void) {
     if (SOMEP(seg->movposcomb)) {
       for (feat=0; feat<seg->i->n_movfeats; feat++) {
        const MovFeatInfo *feati= &seg->i->movfeats[feat];
-       MovPosComb posn= (seg->movposcomb / feati->weight) % feati->posns;
+       MovPosComb posn= movposcomb_feature_posn(feati, seg->movposcomb);
        ouposn_feat(seg, feati, posn, feature_method(feati));
       }
     }