modified: src/scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index bf2f41436bd8a80b863a98da3deb1fc841775c86..9fd7ad8790b29326afaee0459f5ecde92bc34f4c 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -46,16 +46,14 @@ struct {
 
 map_t allocMap(int w, int h);
 void initMap(map_t *map);
-void mapScrollRight(map_view_t *mv, byte offset, short lp);
-void mapScrollLeft(map_view_t *mv, byte offest, short lp);
-void mapScrollUp(map_view_t *mv, byte offset, short lp);
-void mapScrollDown(map_view_t *mv, byte offset, short lp);
+void mapScrollRight(map_view_t *mv, byte offset);
+void mapScrollLeft(map_view_t *mv, byte offest);
+void mapScrollUp(map_view_t *mv, byte offset);
+void mapScrollDown(map_view_t *mv, byte offset);
 void mapGoTo(map_view_t *mv, int tx, int ty);
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
-void mapDrawRow(map_view_t *mv, int tx, int ty, word y, word poopoffset);
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x, word poopoffset);
-void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
-void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
+void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
 void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp);
 
 #define TILEWH 16
@@ -408,7 +406,7 @@ initMap(map_t *map) {
 
 
 void
-mapScrollRight(map_view_t *mv, byte offset, short lp) {
+mapScrollRight(map_view_t *mv, byte offset) {
        word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
@@ -425,14 +423,13 @@ mapScrollRight(map_view_t *mv, byte offset, short lp) {
 
        /* draw the next column */
        x= SCREEN_WIDTH + mv->map->tiles->tileWidth;
-       //if(lp%4)
-               mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x, mv->page->dx);
+               mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);
        }
 }
 
 
 void
-mapScrollLeft(map_view_t *mv, byte offset, short lp) {
+mapScrollLeft(map_view_t *mv, byte offset) {
        word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
@@ -448,14 +445,13 @@ mapScrollLeft(map_view_t *mv, byte offset, short lp) {
        mv->page->dx = mv->map->tiles->tileWidth;
        //}
        /* draw the next column */
-       //if(lp%4)
-               mapDrawCol(mv, mv->tx-1, mv->ty-1, 0, mv->page->dx);
+               mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);
        }
 }
 
 
 void
-mapScrollUp(map_view_t *mv, byte offset, short lp) {
+mapScrollUp(map_view_t *mv, byte offset) {
        word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
@@ -472,14 +468,13 @@ mapScrollUp(map_view_t *mv, byte offset, short lp) {
 
        /* draw the next row */
        y= 0;
-       //if(lp%3)
-               mapDrawRow(mv, mv->tx-1 , mv->ty-1, y, mv->page->dy);
+               mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);
        }
 }
 
 
 void
-mapScrollDown(map_view_t *mv, byte offset, short lp) {
+mapScrollDown(map_view_t *mv, byte offset) {
        word x, y;  /* coordinate for drawing */
 
        /* increment the pixel position and update the page */
@@ -496,8 +491,7 @@ mapScrollDown(map_view_t *mv, byte offset, short lp) {
 
        /* draw the next row */
        y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;
-       //if(lp%3)
-               mapDrawRow(mv, mv->tx-1 , mv->ty+15, y, mv->page->dy);
+               mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);
        }
 
 }
@@ -540,45 +534,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
 
 
 void 
-mapDrawRow(map_view_t *mv, int tx, int ty, word y, word poopoffset) {
-       word x;
-       int i;
-       poopoffset%=SPEED;
-//printf("y: %d\n", poopoffset);
-       /* the position within the map array */
-       i=ty * mv->map->width + tx;
-       for(x=poopoffset; x<(SCREEN_WIDTH+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
-       if(i>=0) {
-               /* we are in the map, so copy! */
-               mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-       }
-       i++; /* next! */
-       }
-}
-
-
-void 
-mapDrawCol(map_view_t *mv, int tx, int ty, word x, word poopoffset) {
-       int y;
-       int i;
-       poopoffset%=SPEED;
-//printf("x: %d\n", poopoffset);
-       /* location in the map array */
-       i=ty * mv->map->width + tx;
-
-       /* We'll copy all of the columns in the screen, 
-          i + 1 row above and one below */
-       for(y=poopoffset; y<(SCREEN_HEIGHT+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
-       if(i>=0) {
-               /* we are in the map, so copy away! */
-               mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-       }
-       i += mv->map->width;
-       }
-}
-
-void 
-mapDrawWRow(map_view_t *mv, int tx, int ty, word y) {
+mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
        word x;
        int i;
 
@@ -594,7 +550,7 @@ mapDrawWRow(map_view_t *mv, int tx, int ty, word y) {
 }
 
 void 
-mapDrawWCol(map_view_t *mv, int tx, int ty, word x) {
+mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
        int y;
        int i;