Let hoppers change direction, use range bits as offset

Hoppers were ignoring the step-vector toggle. This is now corrected,
with a re-write to get more compact code (toggling the rights bits only
in a single place). The range counter is no longer decremented for
hoppers, so these bits can now be used as flag for something else.
Currently they are used to subtract range*oldStep from the hop square,
so that with range=1 the hop-toggle takes place on the square before
the obstacle, allowing implementation of colliding bifurcators.

diff --git a/fairymax.c b/fairymax.c
index 568a08f..9b3adc7 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -266,15 +266,15 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
        J=f;Z=g;\r
        if(h){h=0;goto A;}                      /* redo after doing old best*/\r
       }\r
-      s=t;v=r^flag>>12;                        /* calc. alternated vector  */\r
+      s=t;v=r^flag>>12;                        /* capt & alternated vector */\r
       if(flag&15^4|u&32||                      /* no double or moved before*/\r
          p>2&!(flag&S)&&                       /* no P & no virgin jump,   */\r
          ((b[G=r<0?x&~15:BW-1|x&112]^32)<33    /* no virgin R in corner G, */\r
          ||b[G^1]|b[G^2]|b[FF=y+v-r])          /* no 2 empty sq. next to R */\r
         )t+=flag&4;                            /* fake capt. for nonsliding*/\r
       else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */\r
-      if(s&&flag&8)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */\r
-      if(--rg<0&!(flag&S))                     /* zig-zag piece? (w. delay)*/\r
+      if(s&&flag&8&&!(y-=rg*r,t=0)             /* hoppers go to next phase */\r
+         ||!(flag&S)&&--rg<0)                  /* zig-zag piece? (w. delay)*/\r
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */\r
      }W(!t);                                   /* if not capt. continue ray*/\r
    }}\r