ok i appropriately use page[0].dx and page[0].dy

diff --git a/src/lib/.16_vl.c.kate-swp b/src/lib/.16_vl.c.kate-swp
deleted file mode 100755 (executable)
index b908d86..0000000
Binary files a/src/lib/.16_vl.c.kate-swp and /dev/null differ

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index cbc9793eb11749a42fc63aa68ee7f25b6207e0ad..8d0f49c9cc1760fcefd25cbb48d78825c2f755e0 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);\r
                                        ScrollRight(pip, player, 3, pn);\r
                                        ScrollRight(pip, player, 2, pn);\r
-                                       mapScrollRight(pip, player, !(pip[0].video->p), pn);\r
+                                       //mapScrollRight(pip, player, !(pip[0].video->p), pn);\r
                                        mapScrollRight(pip, player, (pip[0].video->p), pn);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].q++;\r
@@ -90,7 +90,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                        animatePlayer(pip, player, pn, 1);\r
                                        ScrollLeft(pip, player, 3, pn);\r
                                        ScrollLeft(pip, player, 2, pn);\r
-                                       mapScrollLeft(pip, player, !(pip[0].video->p), pn);\r
+                                       //mapScrollLeft(pip, player, !(pip[0].video->p), pn);\r
                                        mapScrollLeft(pip, player, (pip[0].video->p), pn);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].q++;\r
@@ -134,7 +134,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                        animatePlayer(pip, player, pn, 1);\r
                                        ScrollDown(pip, player, 3, pn);\r
                                        ScrollDown(pip, player, 2, pn);\r
-                                       mapScrollDown(pip, player, !(pip[0].video->p), pn);\r
+                                       //mapScrollDown(pip, player, !(pip[0].video->p), pn);\r
                                        mapScrollDown(pip, player, (pip[0].video->p), pn);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].q++;\r
@@ -178,7 +178,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
                                        animatePlayer(pip, player, pn, 1);\r
                                        ScrollUp(pip, player, 3, pn);\r
                                        ScrollUp(pip, player, 2, pn);\r
-                                       mapScrollUp(pip, player, !(pip[0].video->p), pn);\r
+                                       //mapScrollUp(pip, player, !(pip[0].video->p), pn);\r
                                        mapScrollUp(pip, player, (pip[0].video->p), pn);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].q++;\r
@@ -224,7 +224,7 @@ void panPageManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dx+=4;\r
+                                       pip[pip[0].pan->pn].page[0].dx+=4;\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
                                } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].tx++; }\r
@@ -237,7 +237,7 @@ void panPageManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dx-=4;\r
+                                       pip[pip[0].pan->pn].page[0].dx-=4;\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
                                } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].tx--; }\r
@@ -250,7 +250,7 @@ void panPageManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dy+=4;\r
+                                       pip[pip[0].pan->pn].page[0].dy+=4;\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
                                } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].ty++; }\r
@@ -263,7 +263,7 @@ void panPageManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dy-=4;\r
+                                       pip[pip[0].pan->pn].page[0].dy-=4;\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
                                } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].ty--; }\r
@@ -284,7 +284,7 @@ void panVmemManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dx+=4;\r
+                                       pip[pip[0].pan->pn].page[0].dx+=4;\r
                                        //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
@@ -298,7 +298,7 @@ void panVmemManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dx-=4;\r
+                                       pip[pip[0].pan->pn].page[0].dx-=4;\r
                                        //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
@@ -312,7 +312,7 @@ void panVmemManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dy+=4;\r
+                                       pip[pip[0].pan->pn].page[0].dy+=4;\r
                                        //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
@@ -326,7 +326,7 @@ void panVmemManual(map_view_t *pip, player_t *player, word pn)
                        {\r
                                if(player[pn].q<=player[pn].spt)\r
                                {\r
-                                       pip[pip[0].pan->pn].page->dy-=4;\r
+                                       pip[pip[0].pan->pn].page[0].dy-=4;\r
                                        //modexShowPageVsync(pip[pip[0].pan->pn].page);\r
                                        modexShowPage(pip[pip[0].pan->pn].page);\r
                                        player[pn].q++;\r
@@ -459,24 +459,24 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
        word x;//, y;  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
-       mv[id].page->dx += player[plid].speed;\r
+       mv[id].page[0].dx += player[plid].speed;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv[id].page->dx >= mv[id].dxThresh )\r
+       if(mv[id].page[0].dx >= mv[id].dxThresh )\r
        {\r
        /* go forward one tile */\r
        mv[id].tx++;\r
        /* Snap the origin forward */\r
        mv[id].page->data += 4;\r
 \r
-       mv[id].page->dx = mv[id].map->tiles->tileWidth;\r
+       mv[id].page[0].dx = mv[id].map->tiles->tileWidth;\r
        }\r
 \r
        /* draw the next column */\r
        x= mv[0].page->sw + mv[id].map->tiles->tileWidth;\r
        if(player[plid].q%4)\r
                if(id==0)\r
-                       mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page->dx);\r
+                       mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page[0].dx);\r
                else\r
                        if(!pageflipflop && !pageploop)\r
                                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));\r
@@ -489,24 +489,24 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
        word x;//,y;  /* coordinate for drawing */\r
 \r
        /* decrement the pixel position and update the page */\r
-       mv[id].page->dx -= player[plid].speed;\r
+       mv[id].page[0].dx -= player[plid].speed;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv[id].page->dx == 0)\r
+       if(mv[id].page[0].dx == 0)\r
        {\r
        /* go backward one tile */\r
        mv[id].tx--;\r
        /* Snap the origin backward */\r
        mv[id].page->data -= 4;\r
 \r
-       mv[id].page->dx = mv[id].map->tiles->tileWidth;\r
+       mv[id].page[0].dx = mv[id].map->tiles->tileWidth;\r
        }\r
 \r
        /* draw the next column */\r
        x= 0;\r
        if(player[plid].q%4)\r
                if(id==0)\r
-                       mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page->dx);\r
+                       mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page[0].dx);\r
                else\r
                        if(!pageflipflop && !pageploop)\r
                                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));\r
@@ -519,24 +519,24 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
        word y;//x,  /* coordinate for drawing */\r
 \r
        /* decrement the pixel position and update the page */\r
-       mv[id].page->dy -= player[plid].speed;\r
+       mv[id].page[0].dy -= player[plid].speed;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv[id].page->dy == 0 )\r
+       if(mv[id].page[0].dy == 0 )\r
        {\r
        /* go down one tile */\r
        mv[id].ty--;\r
        /* Snap the origin downward */\r
        mv[id].page->data -= mv[id].page->pi;\r
 \r
-       mv[id].page->dy = mv[id].map->tiles->tileHeight;\r
+       mv[id].page[0].dy = mv[id].map->tiles->tileHeight;\r
        }\r
 \r
        /* draw the next row */\r
        y= 0;\r
        if(player[plid].q%3)\r
                if(id==0)\r
-                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page->dy);\r
+                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page[0].dy);\r
                else\r
                        if(!pageflipflop && !pageploop)\r
                                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);\r
@@ -548,24 +548,24 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
        word y;//x,  /* coordinate for drawing */\r
 \r
        /* increment the pixel position and update the page */\r
-       mv[id].page->dy += player[plid].speed;\r
+       mv[id].page[0].dy += player[plid].speed;\r
 \r
        /* check to see if this changes the tile */\r
-       if(mv[id].page->dy >= mv[id].dyThresh )\r
+       if(mv[id].page[0].dy >= mv[id].dyThresh )\r
        {\r
        /* go down one tile */\r
        mv[id].ty++;\r
        /* Snap the origin downward */\r
        mv[id].page->data += mv[id].page->pi;\r
 \r
-       mv[id].page->dy = mv[id].map->tiles->tileHeight;\r
+       mv[id].page[0].dy = mv[id].map->tiles->tileHeight;\r
        }\r
 \r
        /* draw the next row */\r
        y= mv[0].page->sh + mv[id].map->tiles->tileHeight;\r
        if(player[plid].q%3)\r
                if(id==0)\r
-                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page->dy);\r
+                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page[0].dy);\r
                else\r
                        if(!pageflipflop && !pageploop)\r
                                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);\r