hmmm

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 1743318efc9716483fd5dee9079c9f3ed439f934..2103a8a641f34d591881299d298fcb3be0a7efa5 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -483,12 +483,12 @@ void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid)
        mv[0].video->page[id].dx += player[plid].speed;
 
        /* check to see if this changes the tile */
-       //if(mv[0].video->page[id].dx >= mv[0].dxThresh )
-       //{
+       if(mv[0].video->page[id].dx >= mv[0].dxThresh )
+       {
                /* Snap the origin forward */
                mv[0].video->page[id].data += 4;
                mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth;
-       //}
+       }
 }
 
 
@@ -498,12 +498,12 @@ void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
        mv[0].video->page[id].dx -= player[plid].speed;
 
        /* check to see if this changes the tile */
-       //if(mv[0].video->page[id].dx == 0)
-       //{
+       if(mv[0].video->page[id].dx == 0)
+       {
                /* Snap the origin backward */
                mv[0].video->page[id].data -= 4;
                mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth;
-       //}
+       }
 }
 
 void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid)
@@ -512,12 +512,12 @@ void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid)
        mv[0].video->page[id].dy -= player[plid].speed;
 
        /* check to see if this changes the tile */
-       //if(mv[0].video->page[id].dy == 0)
-       //{
+       if(mv[0].video->page[id].dy == 0)
+       {
                /* Snap the origin backward */
                mv[0].video->page[id].data -= 4;
                mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth;
-       //}
+       }
 }
 
 void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)
@@ -526,12 +526,12 @@ void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)
        mv[0].video->page[id].dy += player[plid].speed;
 
        /* check to see if this changes the tile */
-       //if(mv[0].video->page[id].dy >= mv[id].dxThresh )
-       //{
+       if(mv[0].video->page[id].dy >= mv[id].dxThresh )
+       {
                /* Snap the origin forward */
                mv[0].video->page[id].data += 4;
                mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth;
-       //}
+       }
 }
 
 sword chkmap(map_t *map, word q)
@@ -585,12 +585,12 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
        /* set up the coordinates */
        mv[0].tx = mv[1].tx = tx;
        mv[0].ty = mv[1].ty = ty;
-       mv[0].page->dx = mv[1].page->dx = mv->map->tiles->tileWidth;
-       mv[0].page->dy = mv[1].page->dy = mv->map->tiles->tileHeight;
+       mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->tiles->tileWidth;
+       mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->tiles->tileHeight;
 
        /* set up the thresholds */
-       mv[0].dxThresh = mv[1].dxThresh = mv->map->tiles->tileWidth * 2;
-       mv[0].dyThresh = mv[1].dyThresh = mv->map->tiles->tileHeight * 2;
+       mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileWidth * 2;
+       mv[0].dyThresh = mv[1].dyThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileHeight * 2;
 
        /* draw the tiles */
        modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 0);

diff --git a/src/scroll.c b/src/scroll.c
index 73bf194edfbab70c0304c8f35a3905610213f296..15666d095c32a06a95ae6617af91fb60f85b1ec0 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -188,7 +188,6 @@ void main(int argc, char *argv[])
        player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
        IN_initplayer(&player, 0);
        //IN_initplayer(&player, 1);
-       modexCopyPageRegion(mv[3].page, mv[0].page, player[0].x-4, player[0].y-TILEWH, 0, 128, 24, 32);
 
 #ifndef        SPRITE
        modexClearRegion(mv[0].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);