Documented 16_vrs files

[16.git] / src / lib / scroll16.c

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index faf53fcbfb518fa485b7d260bc67f4db037b583e..eb83157e71866405efb4d4bb62b6c7d697556d74 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -46,7 +46,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                        animatePlayer(pip, player, pn, 1);
                                        ScrollRight(pip, player, 3, pn);
                                        ScrollRight(pip, player, 2, pn);
-                                       if(!pageploop){ mapScrollRight(pip, player, !(pip[0].video->p), pn); } else ScrollRight(pip, player, !(pip[0].video->p), pn);
+                                       mapScrollRight(pip, player, !(pip[0].video->p), pn);
                                        mapScrollRight(pip, player, (pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
@@ -90,7 +90,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                        animatePlayer(pip, player, pn, 1);
                                        ScrollLeft(pip, player, 3, pn);
                                        ScrollLeft(pip, player, 2, pn);
-                                       if(!pageploop){ mapScrollLeft(pip, player, !(pip[0].video->p), pn); } else ScrollLeft(pip, player, !(pip[0].video->p), pn);
+                                       mapScrollLeft(pip, player, !(pip[0].video->p), pn);
                                        mapScrollLeft(pip, player, (pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
@@ -134,7 +134,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                        animatePlayer(pip, player, pn, 1);
                                        ScrollDown(pip, player, 3, pn);
                                        ScrollDown(pip, player, 2, pn);
-                                       if(!pageploop){ mapScrollDown(pip, player, !(pip[0].video->p), pn); } else ScrollDown(pip, player, !(pip[0].video->p), pn);
+                                       mapScrollDown(pip, player, !(pip[0].video->p), pn);
                                        mapScrollDown(pip, player, (pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
@@ -178,7 +178,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                        animatePlayer(pip, player, pn, 1);
                                        ScrollUp(pip, player, 3, pn);
                                        ScrollUp(pip, player, 2, pn);
-                                       if(!pageploop){ mapScrollUp(pip, player, !(pip[0].video->p), pn); } else ScrollUp(pip, player, !(pip[0].video->p), pn);
+                                       mapScrollUp(pip, player, !(pip[0].video->p), pn);
                                        mapScrollUp(pip, player, (pip[0].video->p), pn);
                                        if(!pageflipflop) modexShowPage(pip[1].page);
                                        player[pn].q++;
@@ -374,6 +374,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
        mv[id].tx++;
        /* Snap the origin forward */
        mv[id].page->data += 4;
+
        mv[id].page->dx = mv[id].map->tiles->tileWidth;
        }
 
@@ -383,7 +384,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
                if(id==0)
                        mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page->dx);
                else
-                       if(!pageflipflop)
+                       if(!pageflipflop && !pageploop)
                                modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->th+2));
        mv[0].video->r=1;
 }
@@ -403,6 +404,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
        mv[id].tx--;
        /* Snap the origin backward */
        mv[id].page->data -= 4;
+
        mv[id].page->dx = mv[id].map->tiles->tileWidth;
        }
 
@@ -412,7 +414,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
                if(id==0)
                        mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page->dx);
                else
-                       if(!pageflipflop)
+                       if(!pageflipflop && !pageploop)
                                modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->th+2));
        mv[0].video->r=1;
 }
@@ -432,6 +434,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
        mv[id].ty--;
        /* Snap the origin downward */
        mv[id].page->data -= mv[id].page->pi;
+
        mv[id].page->dy = mv[id].map->tiles->tileHeight;
        }
 
@@ -441,7 +444,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
                if(id==0)
                        mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page->dy);
                else
-                       if(!pageflipflop)
+                       if(!pageflipflop && !pageploop)
                                modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);
        mv[0].video->r=1;
 }
@@ -460,6 +463,7 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
        mv[id].ty++;
        /* Snap the origin downward */
        mv[id].page->data += mv[id].page->pi;
+
        mv[id].page->dy = mv[id].map->tiles->tileHeight;
        }
 
@@ -469,7 +473,7 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
                if(id==0)
                        mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page->dy);
                else
-                       if(!pageflipflop)
+                       if(!pageflipflop && !pageploop)
                                modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);
        mv[0].video->r=1;
 }
@@ -479,68 +483,68 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 {
        /* increment the pixel position and update the page */
-       mv[0].video->page[id].dx += player[plid].speed;
+       mv[id].page->dx += player[plid].speed;
 
        /* check to see if this changes the tile */
-       if(mv[0].video->page[id].dx >= mv[0].dxThresh )
+       if(mv[id].page->dx >= mv[0].dxThresh )
        {
 //             vga_setup_wm1_block_copy();
-//             _fmemmove(mv[0].video->page[id].data+4, mv[0].video->page[id].data, mv[0].video->page[id].pagesize);
+//             _fmemmove(mv[id].page->data+4, mv[id].page->data, mv[id].page->pagesize);
 //             vga_restore_rm0wm0();
                /* Snap the origin forward */
-               mv[0].video->page[id].data += 4;
-               mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth;
+               mv[id].page->data += 4;
+               mv[id].page->dx = mv[0].map->tiles->tileWidth;
        }
 }
 
 void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 {
        /* decrement the pixel position and update the page */
-       mv[0].video->page[id].dx -= player[plid].speed;
+       mv[id].page->dx -= player[plid].speed;
 
        /* check to see if this changes the tile */
-       if(mv[0].video->page[id].dx == 0)
+       if(mv[id].page->dx == 0)
        {
 //             vga_setup_wm1_block_copy();
-//             _fmemmove(mv[0].video->page[id].data-4, mv[0].video->page[id].data, mv[0].video->page[id].pagesize);
+//             _fmemmove(mv[id].page->data-4, mv[id].page->data, mv[id].page->pagesize);
 //             vga_restore_rm0wm0();
                /* Snap the origin backward */
-               mv[0].video->page[id].data -= 4;
-               mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth;
+               mv[id].page->data -= 4;
+               mv[id].page->dx = mv[0].map->tiles->tileWidth;
        }
 }
 
 void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 {
        /* decrement the pixel position and update the page */
-       mv[0].video->page[id].dy -= player[plid].speed;
+       mv[id].page->dy -= player[plid].speed;
 
        /* check to see if this changes the tile */
-       if(mv[0].video->page[id].dy == 0)
+       if(mv[id].page->dy == 0)
        {
 //             vga_setup_wm1_block_copy();
-//             _fmemmove(mv[0].video->page[id].data-mv[0].video->page[id].pi, mv[0].video->page[id].data, mv[0].video->page[id].pagesize);
+//             _fmemmove(mv[id].page->data-mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);
 //             vga_restore_rm0wm0();
                /* Snap the origin backward */
-               mv[0].video->page[id].data -= mv[0].video->page[id].pi;
-               mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth;
+               mv[id].page->data -= mv[id].page->pi;
+               mv[id].page->dy = mv[0].map->tiles->tileWidth;
        }
 }
 
 void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 {
        /* increment the pixel position and update the page */
-       mv[0].video->page[id].dy += player[plid].speed;
+       mv[id].page->dy += player[plid].speed;
 
        /* check to see if this changes the tile */
-       if(mv[0].video->page[id].dy >= mv[0].dxThresh )
+       if(mv[id].page->dy >= mv[0].dxThresh )
        {
 //             vga_setup_wm1_block_copy();
-//             _fmemmove(mv[0].video->page[id].data+mv[0].video->page[id].pi, mv[0].video->page[id].data, mv[0].video->page[id].pagesize);
+//             _fmemmove(mv[id].page->data+mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);
 //             vga_restore_rm0wm0();
                /* Snap the origin forward */
-               mv[0].video->page[id].data += mv[0].video->page[id].pi;
-               mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth;
+               mv[id].page->data += mv[id].page->pi;
+               mv[id].page->dy = mv[0].map->tiles->tileWidth;
        }
 }
 
@@ -622,7 +626,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
 //                                     vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!
 //             }
 //     }
-       modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 16, 40);
+       modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 16, 32);
 }
 
 void near
@@ -647,7 +651,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                {
                        case 0:
 #ifndef TILERENDER
-                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])));
+                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1));
                                //modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i]));
 #else
                                PBUFBFUN                (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
@@ -657,7 +661,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 #endif
                        break;
                        case 1:
-                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i]));
+                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i])+1);
                                //modexprintbig(page, x, y, 1, 15, 0, (t->debug_data));
                                /*for(texty=0; texty<2; texty++)
                                {
@@ -878,9 +882,9 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
                modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);
        else{
                //copy old bg to page0
-               modexCopyPageRegion(pip[3].page, pip[0].page, bx, by,   0, 0,   20, 36);
+               //modexCopyPageRegion(pip[3].page, pip[0].page, bx, by, 0, 0,   20, 36);
                //update buffer
-               modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,     x, y,   20, 36);
+               //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,   x, y,   20, 36);
        }
 //modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);
        //modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);