]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/scroll16.c
made a new function modexMVSetup() and made scroller use dx and dy on page[0].dx
[16.git] / src / lib / scroll16.c
index b94e768a77c1a8d4813111caa3e2bdae39c36cf3..7f4ff16d57934b9325926c6f4d31bb4c244f8a41 100755 (executable)
@@ -214,7 +214,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 }\r
 \r
 //panning page\r
-void panpagemanual(map_view_t *pip, player_t *player, word pn)\r
+void panPageManual(map_view_t *pip, player_t *player, word pn)\r
 {\r
        switch(player[pn].d)\r
        {\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
@@ -273,6 +273,87 @@ void panpagemanual(map_view_t *pip, player_t *player, word pn)
        //if (player[pn].d!=2) printf("player[%u].d=%u player[%u].q=%u\n", pn, player[pn].d, pn, player[pn].q);\r
 }\r
 \r
+//panning vmem\r
+void panVmemManual(map_view_t *pip, player_t *player, word pn)\r
+{\r
+       switch(player[pn].d)\r
+       {\r
+               //right movement\r
+               case 3:\r
+                       if(pip[pip[0].pan->pn].tx >= 0 && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tw < pip[pip[0].pan->pn].page->tilesw)\r
+                       {\r
+                               if(player[pn].q<=player[pn].spt)\r
+                               {\r
+                                       pip[pip[0].pan->pn].page[0].dx+=4;\r
+                                       modexShowPageVsync(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
+                       }\r
+               break;\r
+\r
+               //left movement\r
+               case 1:\r
+                       if(pip[pip[0].pan->pn].tx > 0 && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tw <= pip[pip[0].pan->pn].page->tilesw)\r
+                       {\r
+                               if(player[pn].q<=player[pn].spt)\r
+                               {\r
+                                       pip[pip[0].pan->pn].page[0].dx-=4;\r
+                                       modexShowPageVsync(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
+                       }\r
+               break;\r
+\r
+               //down movement\r
+               case 4:\r
+                       if(pip[pip[0].pan->pn].ty >= 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th < pip[pip[0].pan->pn].page->tilesh)\r
+                       {\r
+                               if(player[pn].q<=player[pn].spt)\r
+                               {\r
+                                       pip[pip[0].pan->pn].page[0].dy+=4;\r
+                                       modexShowPageVsync(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
+                       }\r
+               break;\r
+\r
+               //up movement\r
+               case 0:\r
+                       if(pip[pip[0].pan->pn].ty > 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th <= pip[pip[0].pan->pn].page->tilesh)\r
+                       {\r
+                               if(player[pn].q<=player[pn].spt)\r
+                               {\r
+                                       pip[pip[0].pan->pn].page[0].dy-=4;\r
+                                       modexShowPageVsync(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
+                       }\r
+                       break;\r
+       }\r
+       //if (player[pn].d!=2) printf("player[%u].d=%u player[%u].q=%u\n", pn, player[pn].d, pn, player[pn].q);\r
+}\r
+\r
+/*\r
+ * modex mv setup\r
+*/\r
+void modexMVSetup(map_view_t *mv, map_t *map, pan_t *pan, global_game_variables_t *gv)\r
+{\r
+       byte i;\r
+       // 1st page\r
+       mv[0].page = &gv->video.page[0];\r
+       mv[0].map = map;\r
+       mv[0].video = &gv->video;\r
+       mv[0].pan       = pan;\r
+\r
+       for(i=1;i<gv->video.num_of_pages;i++)\r
+       {\r
+               mv[i].page      =       &gv->video.page[i];\r
+               mv[i].map       =       mv[0].map;\r
+               mv[i].video     =       mv[0].video;\r
+               mv[i].pan       =       mv[0].pan;\r
+       }\r
+}\r
+\r
 /*map_t\r
 allocMap(int w, int h) {\r
        map_t result;\r
@@ -362,27 +443,27 @@ initMap(map_t *map) {
 \r
 void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
 {\r
-       word x, y;  /* coordinate for drawing */\r
+       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
@@ -392,27 +473,27 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 \r
 void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)\r
 {\r
-       word xy;  /* coordinate for drawing */\r
+       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
@@ -422,27 +503,27 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 \r
 void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)\r
 {\r
-       word x, y;  /* coordinate for drawing */\r
+       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
@@ -451,27 +532,27 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 \r
 void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)\r
 {\r
-       word x, y;  /* coordinate for drawing */\r
+       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
@@ -483,68 +564,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)\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[0].dxThresh )\r
+       if(mv[id].page[0].dx >= mv[0].dxThresh )\r
        {\r
 //             vga_setup_wm1_block_copy();\r
 //             _fmemmove(mv[id].page->data+4, mv[id].page->data, mv[id].page->pagesize);\r
 //             vga_restore_rm0wm0();\r
                /* Snap the origin forward */\r
                mv[id].page->data += 4;\r
-               mv[id].page->dx = mv[0].map->tiles->tileWidth;\r
+               mv[id].page[0].dx = mv[0].map->tiles->tileWidth;\r
        }\r
 }\r
 \r
 void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid)\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
 //             vga_setup_wm1_block_copy();\r
 //             _fmemmove(mv[id].page->data-4, mv[id].page->data, mv[id].page->pagesize);\r
 //             vga_restore_rm0wm0();\r
                /* Snap the origin backward */\r
                mv[id].page->data -= 4;\r
-               mv[id].page->dx = mv[0].map->tiles->tileWidth;\r
+               mv[id].page[0].dx = mv[0].map->tiles->tileWidth;\r
        }\r
 }\r
 \r
 void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid)\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
 //             vga_setup_wm1_block_copy();\r
 //             _fmemmove(mv[id].page->data-mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);\r
 //             vga_restore_rm0wm0();\r
                /* Snap the origin backward */\r
                mv[id].page->data -= mv[id].page->pi;\r
-               mv[id].page->dy = mv[0].map->tiles->tileWidth;\r
+               mv[id].page[0].dy = mv[0].map->tiles->tileWidth;\r
        }\r
 }\r
 \r
 void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)\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[0].dxThresh )\r
+       if(mv[id].page[0].dy >= mv[0].dxThresh )\r
        {\r
 //             vga_setup_wm1_block_copy();\r
 //             _fmemmove(mv[id].page->data+mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);\r
 //             vga_restore_rm0wm0();\r
                /* Snap the origin forward */\r
                mv[id].page->data += mv[id].page->pi;\r
-               mv[id].page->dy = mv[0].map->tiles->tileWidth;\r
+               mv[id].page[0].dy = mv[0].map->tiles->tileWidth;\r
        }\r
 }\r
 \r
@@ -580,32 +661,30 @@ sword chkmap(map_t *map, word q)
                //fix this to be far~\r
 //             bp = bitmapLoadPcx("data/ed.pcx");\r
 //             map->tiles->data = &bp;\r
-               map->tiles->debug_data = map->data;\r
+#ifdef __DEBUG_MAP__\r
+               dbg_mapdata = map->data;\r
+#endif\r
                map->tiles->tileHeight = 16;\r
                map->tiles->tileWidth = 16;\r
                map->tiles->rows = 1;\r
                map->tiles->cols = 1;\r
-               map->tiles->debug_text = true;\r
+#ifdef __DEBUG_MAP__\r
+               dbg_maptext = true;\r
+#endif\r
        }\r
-       else map->tiles->debug_text = false;\r
+#ifdef __DEBUG_MAP__\r
+       else dbg_maptext = false;\r
+#endif\r
        return 0;\r
 }\r
 \r
 //TODO: player position here\r
 void mapGoTo(map_view_t *mv, int tx, int ty)\r
 {\r
-       int px, py;\r
+       int py;//px,\r
        unsigned int i;\r
 \r
-       /* set up the coordinates */\r
-       mv[0].tx = mv[1].tx = tx;\r
-       mv[0].ty = mv[1].ty = ty;\r
-       mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->tiles->tileWidth;\r
-       mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->tiles->tileHeight;\r
-\r
-       /* set up the thresholds */\r
-       mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileWidth * 2;\r
-       mv[0].dyThresh = mv[1].dyThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileHeight * 2;\r
+       mapinitmapview(mv, tx, ty);\r
 \r
        /* draw the tiles */\r
        modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 0);\r
@@ -629,13 +708,25 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
        modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 24, 32);\r
 }\r
 \r
+void mapinitmapview(map_view_t *mv, int tx, int ty)\r
+{\r
+       /* set up the coordinates */\r
+       mv[0].tx = mv[1].tx = tx;\r
+       mv[0].ty = mv[1].ty = ty;\r
+       mv[0].page[0].dx = mv[1].page[0].dx = mv[2].page[0].dx = mv[3].page[0].dx = mv->map->tiles->tileWidth;\r
+       mv[0].page[0].dy = mv[1].page[0].dy = mv[2].page[0].dy = mv[3].page[0].dy = mv->map->tiles->tileHeight;\r
+\r
+       /* set up the thresholds */\r
+       mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileWidth * 2;\r
+       mv[0].dyThresh = mv[1].dyThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileHeight * 2;\r
+}\r
+\r
 void near\r
 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)\r
 {\r
        word rx;\r
        word ry;\r
-       word textx=0;\r
-       word texty=0;\r
+       //word textx=0, texty=0;\r
        //if(i==0) i=2;\r
        if(i==0)\r
        {\r
@@ -647,11 +738,13 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
                ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);\r
 ////0000printf("i=%d\n", i);\r
-               switch(t->debug_text)\r
+#ifdef __DEBUG_MAP__\r
+               switch(dbg_maptext)\r
                {\r
                        case 0:\r
+#endif\r
 #ifndef TILERENDER\r
-                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1));\r
+                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((dbg_mapdata[i])+1));\r
                                //modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i]));\r
 #else\r
                                PBUFBFUN                (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
@@ -659,9 +752,10 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                                //draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
                                //modexDrawBmpRegion    (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
 #endif\r
+#ifdef __DEBUG_MAP__\r
                        break;\r
                        case 1:\r
-                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i])+1);\r
+                               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (dbg_mapdata[i])+1);\r
                                //modexprintbig(page, x, y, 1, 15, 0, (t->debug_data));\r
                                /*for(texty=0; texty<2; texty++)\r
                                {\r
@@ -672,6 +766,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                                }*/\r
                        break;\r
                }\r
+#endif\r
        }\r
 }\r
 \r
@@ -761,8 +856,8 @@ void shinku(global_game_variables_t *gv)
 {\r
        word x = (0) + gv->video.page[/*!*/(gv->video.p)].dx; // follow the screen\r
        word y = (0) + gv->video.page[/*!*/(gv->video.p)].dy; // follow the screen\r
-       word w = 64, h = 8, col = 7, bgcol = 0, type = 1;\r
-       byte o,o2,i;\r
+       word col = 7, bgcol = 0, type = 1;//w = 64, h = 8,\r
+       //byte o,o2,i;\r
        //modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);\r
        /* block copy to visible RAM from offscreen */\r
 //     vga_setup_wm1_block_copy();\r
@@ -774,9 +869,16 @@ void shinku(global_game_variables_t *gv)
 //     vga_restore_rm0wm0();\r
        if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
        {\r
-               sprintf(gv->pee, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv));\r
+        // NTS: For some bizarre reason, gv->pee is not initialized, but the pointer is not NULL even\r
+        //      though it should be. Instead it's NULL as a near pointer but contains a non-null\r
+        //      segment value, so testing against NULL doesn't work. It is initialized properly if\r
+        //      you call start_timer() though which uses near malloc. Rather than fight with that,\r
+        //      I decided it would be better to declare a temp buffer statically and sprintf to that.\r
+        //\r
+        //      This fixes *** Null pointer assignment detected error message in ZCROLL.EXE on exit.\r
+               sprintf(global_temp_status_text, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv));\r
                //modexClearRegion(&(gv->video.page[shinku_fps_indicator_page]), x, y, w, h, 45);\r
-               modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, gv->pee);\r
+               modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);\r
                gv->kurokku.tiku=0;\r
                /* block copy to visible RAM from offscreen */\r
 //             vga_setup_wm1_block_copy();\r
@@ -914,3 +1016,95 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
        //printf("x=%d  y=%d    bx=%d           by=%d\n", x, y, bx, by);\r
        pip->video->r=1;\r
 }\r
+\r
+/*\r
+ * from zcroll16.c\r
+*/\r
+\r
+boolean boundary_check(int x, int y, int dx, int dy, int h, int w)\r
+{\r
+       return (dx > 0 && (x + dx) < w) || (dx < 0 && (x + dx) >= 0) || (dy > 0 && (y + dy) < h) || (dy < 0 && (y + dy) >= 0) || (dx == dy && dx == 0);\r
+}\r
+\r
+boolean coll_check(int x, int y, int dx, int dy, map_view_t *map_v)\r
+{\r
+       // Assume everything crosses at most 1 tile at once\r
+       return dx && 1;//crossable_tile(x + dx, map_v) || dy && crossable_tile(y + dy, map_v);\r
+}\r
+\r
+boolean ZC_walk(entity_t *ent, map_view_t *map_v)\r
+{\r
+       //return 1;\r
+       int dx = 1;\r
+       int dy = 1;\r
+       switch(ent->d)\r
+       {\r
+               case 2:\r
+                       return 0;\r
+               case 1:\r
+                       dx = -dx;\r
+               case 3:\r
+                       dy = 0;\r
+                       break;\r
+               case 0:\r
+                       dy = -dy;\r
+               case 4:\r
+                       dx = 0;\r
+                       break;\r
+       }\r
+       if(coll_check(ent->x, ent->y, dx, dy,  map_v))\r
+       {\r
+               // Allow movement\r
+               // Set speed\r
+               // Start animation\r
+               // Mark next tile as occupied\r
+               // Mark this tile as vacant\r
+               return 1;\r
+       }\r
+       return 0;\r
+}\r
+\r
+void player_walk(player_t *player, map_view_t *map_v){\r
+       int dx=16, dy=16;\r
+       if(ZC_walk(player->ent, map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->tilesw, map_v->map->height - 2*map_v->page->tilesh))\r
+       {\r
+               mapScroll(map_v, player);\r
+               // (Un)load stuff?\r
+       }\r
+}\r
+\r
+void near mapScroll(map_view_t *mv, player_t *player)\r
+{\r
+       //word x, y;  /* coordinate for drawing */\r
+       int c = 1;\r
+       int delta;\r
+       mv->delta += player->dx | player->dy;\r
+       delta = mv->delta;\r
+       mv->d = (player->dx) ? (player->dx > 0) ? 3 : 1 : (player->dy) ? (player->dy > 0) ? 4 : 0 : 2;\r
+       switch(mv->d){\r
+               case 4:\r
+                       c = -1;\r
+                       delta = -delta;\r
+               case 0:\r
+                       if(!(delta + mv->dxThresh))\r
+                       {\r
+                               mv->delta = 0;\r
+                               mv->ty += c;\r
+                       }\r
+                       break;\r
+               case 3:\r
+                       c = -1;\r
+                       delta = -delta;\r
+               case 1:\r
+                       if(!(delta + mv->dyThresh))\r
+                       {\r
+                               mv->delta = 0;\r
+                               mv->tx += c;\r
+                       }\r
+                       break;\r
+               default:\r
+                       break;\r
+       }\r
+\r
+       mv->video->r=1;\r
+}\r