OSDN Git Service

something else broke when i worked on this
[proj16/16.git] / src / lib / scroll16.c
index 5a9659c..77d3d4d 100755 (executable)
@@ -42,11 +42,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollRight(pip, player, 3, pn);\r
-                                       ScrollRight(pip, player, 2, pn);\r
-                                       mapScrollRight(pip, player, (pip[0].video->p), pn);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
+                                       ZC_mapScroll(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
@@ -56,16 +53,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.x+=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx+1;\r
@@ -79,11 +75,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollLeft(pip, player, 3, pn);\r
-                                       ScrollLeft(pip, player, 2, pn);\r
-                                       mapScrollLeft(pip, player, (pip[0].video->p), pn);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
+                                       ZC_mapScroll(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
@@ -93,16 +86,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.x-=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx-1;\r
@@ -116,11 +108,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollDown(pip, player, 3, pn);\r
-                                       ScrollDown(pip, player, 2, pn);\r
-                                       mapScrollDown(pip, player, (pip[0].video->p), pn);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
+                                       ZC_mapScroll(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
@@ -130,16 +119,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.y+=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
@@ -153,11 +141,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=2;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
-                                       ANIMATESPRIFUN(pip, player, pn, 2);\r
-                                       ScrollUp(pip, player, 3, pn);\r
-                                       ScrollUp(pip, player, 2, pn);\r
-                                       mapScrollUp(pip, player, (pip[0].video->p), pn);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
+                                       ZC_mapScroll(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
@@ -167,16 +152,15 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                player[pn].walktype=1;\r
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
-                                       //INC_PER_FRAME;\r
                                        player[pn].enti.y-=(player[pn].enti.speed);\r
-                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
+                                       ZC_animatePlayer(pip, player, pn);\r
                                        player[pn].enti.q++;\r
                                } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
                        }\r
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-                               ANIMATESPRIFUN(pip, player, pn, 0);\r
+                               ZC_animatePlayer(pip, player, pn);\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
@@ -285,7 +269,6 @@ void ZC_MVInit(map_view_t *pip, int tx, int ty)
 \r
 void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)\r
 {\r
-       //VL_ShowPage(moo[moo[0].video->sp].page, vsync, sr);\r
        word high_address, low_address, offset;\r
        byte crtcOffset;\r
 \r
@@ -343,6 +326,8 @@ initMap(map_t *map) {
        }\r
 }\r
 \r
+//===========================================================================//\r
+\r
 \r
 void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
 {\r
@@ -351,18 +336,18 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
        ScrollRight(mv, player, id, plid);\r
 \r
        /* draw the next column */\r
-       x= mv[0].page->sw + mv[id].map->tiles->tileWidth;\r
+       x= mv[0].page->sw + mv[0].map->tiles->tileWidth;\r
 #ifndef FULLRCREND\r
        if(player[plid].enti.q%4)\r
 #else\r
        if(player[plid].enti.q==4)\r
 #endif\r
-               if(id==0)\r
-                       mapDrawCol(&mv[0], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player, DRAWCOLNUM);\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->ti.th+2));\r
-       mv[0].video->r=1;\r
+//             if(id==0)\r
+                       mapDrawCol(&mv[id], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player, DRAWCOLNUM);\r
+//             else\r
+//                     if(mv[0].video->bgps)\r
+//                             modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);\r
+       mv[0].video->dorender=1;\r
 }\r
 \r
 \r
@@ -379,12 +364,12 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 #else\r
        if(player[plid].enti.q==4)\r
 #endif\r
-               if(id==0)\r
-                       mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, DRAWCOLNUM);\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->ti.th+2));\r
-       mv[0].video->r=1;\r
+//             if(id==0)\r
+                       mapDrawCol(&mv[id], mv[0].tx - 1, mv[0].ty-1, x, player, DRAWCOLNUM);\r
+//             else\r
+//                     if(mv[0].video->bgps)\r
+//                             modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);\r
+       mv[0].video->dorender=1;\r
 }\r
 \r
 \r
@@ -401,12 +386,12 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 #else\r
        if(player[plid].enti.q==4)\r
 #endif\r
-               if(id==0)\r
-                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWCOLNUM);\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->ti.tw+2), mv[id].map->tiles->tileHeight);\r
-       mv[0].video->r=1;\r
+//             if(id==0)\r
+                       mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWROWNUM);\r
+//             else\r
+//                     if(mv[0].video->bgps)\r
+//                             modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
+       mv[0].video->dorender=1;\r
 }\r
 \r
 \r
@@ -417,29 +402,72 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
        ScrollDown(mv, player, id, plid);\r
 \r
        /* draw the next row */\r
-       y= mv[0].page->sh + mv[id].map->tiles->tileHeight;\r
+       y= mv[0].page->sh + mv[0].map->tiles->tileHeight;\r
 #ifndef FULLRCREND\r
        if(player[plid].enti.q%3)\r
 #else\r
        if(player[plid].enti.q==4)\r
 #endif\r
-               if(id==0)\r
-                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWCOLNUM);\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->ti.tw+2), mv[id].map->tiles->tileHeight);\r
-       mv[0].video->r=1;\r
+//             if(id==0)\r
+                       mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWROWNUM);\r
+//             else\r
+//                     if(mv[0].video->bgps)\r
+//                             modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
+       mv[0].video->dorender=1;\r
 }\r
 \r
-\r
+void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)\r
+{\r
+       word b = mv[0].video->bgps;\r
+       switch(player[pn].enti.d)\r
+       {\r
+               case 2://none\r
+               break;\r
+               case 3://right\r
+                               ScrollRight(mv, player, 3, pn);\r
+                               ScrollRight(mv, player, 2, pn);\r
+                               mapScrollRight(mv, player, (0), pn);\r
+                       if(b)   mapScrollRight(mv, player, (1), pn);\r
+               break;\r
+               case 1://left\r
+                               ScrollLeft(mv, player, 3, pn);\r
+                               ScrollLeft(mv, player, 2, pn);\r
+                               mapScrollLeft(mv, player, (0), pn);\r
+                       if(b)   mapScrollLeft(mv, player, (1), pn);\r
+               break;\r
+               case 4://down\r
+                               ScrollDown(mv, player, 3, pn);\r
+                               ScrollDown(mv, player, 2, pn);\r
+                               mapScrollDown(mv, player, (0), pn);\r
+                       if(b)   mapScrollDown(mv, player, (1), pn);\r
+               break;\r
+               case 0://up\r
+                               ScrollUp(mv, player, 3, pn);\r
+                               ScrollUp(mv, player, 2, pn);\r
+                               mapScrollUp(mv, player, (0), pn);\r
+                       if(b)   mapScrollUp(mv, player, (1), pn);\r
+               break;\r
+       }\r
+       mv[0].video->dorender=1;\r
+}\r
 \r
 //===========================================================================\r
 //TODO: put player in starting position of assigned spot on map\r
 //default player position on the viewable map\r
-void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn)\r
+void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw)\r
 {\r
-       player[pn].enti.tx = x + pip[0].tx + pip[0].page->ti.tilemidposscreenx;\r
-       player[pn].enti.ty = y + pip[0].ty + pip[0].page->ti.tilemidposscreeny;\r
+       player[pn].enti.tx = x + pip[0].tx;\r
+       player[pn].enti.ty = y + pip[0].ty;\r
+\r
+       switch(defaultsw)\r
+       {\r
+               case 1:\r
+                       player[pn].enti.tx += pip[0].page->ti.tilemidposscreenx;\r
+                       player[pn].enti.ty += pip[0].page->ti.tilemidposscreeny;\r
+               break;\r
+               case 0:\r
+               break;\r
+       }\r
 }\r
 //===========================================================================\r
 \r
@@ -498,7 +526,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
        int py;//px,\r
        unsigned int i;\r
 \r
-       mapinitmapview(mv, tx, ty);\r
+       ZC_mapinitMV(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
@@ -506,13 +534,19 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
        i=mv[0].ty * mv[0].map->width + mv[0].tx;\r
        for(ty=mv[0].ty-1; py < mv[0].page->sh+mv->dyThresh && ty < mv[0].map->height; ty++, py+=mv[0].map->tiles->tileHeight) {\r
                mapDrawWRow(&mv[0], tx-1, ty, py);\r
-       i+=mv->map->width - tx;\r
+               mapDrawWRow(&mv[1], tx-1, ty, py);\r
+               i+=mv->map->width - tx;\r
        }\r
-//     if(!pageploop) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);\r
-       modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 24, 32);\r
+//     py=0;\r
+//     i=mv[1].ty * mv[1].map->width + mv[1].tx;\r
+//     for(ty=mv[1].ty-1; py < mv[1].page->sh+mv->dyThresh && ty < mv[1].map->height; ty++, py+=mv[1].map->tiles->tileHeight) {\r
+//             mapDrawWRow(&mv[1], tx-1, ty, py);\r
+//             i+=mv->map->width - tx;\r
+//     }\r
+       //if(mv[0].video->bgps) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);\r
 }\r
 \r
-void mapinitmapview(map_view_t *mv, int tx, int ty)\r
+void ZC_mapinitMV(map_view_t *mv, int tx, int ty)\r
 {\r
        /* set up the coordinates */\r
        mv[0].tx = mv[1].tx = tx;\r
@@ -644,8 +678,6 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
        //setkb(0);\r
 }*/\r
 \r
-//boolean pageflipflop = 1;\r
-//boolean pageploop = 1;\r
 boolean pagenorendermap = 0;\r
 boolean pagedelayrendermap = 0;\r
 \r
@@ -654,17 +686,7 @@ 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 col = 2, bgcol = 1, type = 1;//w = 64, h = 8, //col7bgcol0\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
-//     modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x+w, 0, w, h);\r
-//     o =     *(gv->video.page[2].data); // source offscreen\r
-//     o2 =    *(gv->video.page[gv->video->sfip].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)\r
-//     for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
-       /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */\r
-//     vga_restore_rm0wm0();\r
+       word col = 2, bgcol = 1, type = 1;//w = 64, h = 8,\r
        if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
        {\r
         // NTS: For some bizarre reason, gv->pee is not initialized, but the pointer is not NULL even\r
@@ -675,171 +697,47 @@ void shinku(global_game_variables_t *gv)
         //\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[gv->video->sfip]), x, y, w, h, 45);\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
-//             o =     *(gv->video.page[gv->video->sfip].data); // source offscreen\r
-//             o2 =    *(gv->video.page[2].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)\r
-//             for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
-//             modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x, 0, w, h);\r
-               /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */\r
-//             vga_restore_rm0wm0();\r
        }else //copy dat sheet\r
        gv->kurokku.tiku++;\r
 \r
        switch(gv->kurokku.fpscap)\r
        {\r
                case 0:\r
-                       //modexprint(&(gv->video.page[gv->video->sfip]), x, y+8, type, col, bgcol, "sanic!");\r
+                       //modexprint(&(gv->video.page[0]), x, y+8, type, col, bgcol, "sanic!");\r
                        gv->kurokku.frames_per_second=1;\r
                break;\r
                case 1:\r
                        //turn this off if XT\r
-                       //modexWaitBorder();\r
+                       modexWaitBorder_start();\r
                        //vga_wait_for_vsync();\r
                        gv->kurokku.frames_per_second=60;\r
                break;\r
        }\r
        //render!!\r
-//     if(pageflipflop){\r
-       if(gv->video.r ){//r=1\r
-               //vga_setup_wm1_block_copy();\r
-               //_fmemcpy((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);\r
-               //vga_restore_rm0wm0();\r
-//             if(!pageploop) modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);\r
+       if(gv->video.dorender )\r
+       {//r=1\r
+               /*if(video->bgp s)\r
+               {\r
+                       modexCopyPageRegion(&(gv->video.page[ ]), &(gv->video.page[ ]), 0, 0, 0, 0, gv->video.page[ ].width, gv->video.page[ ].height);\r
+               }else{\r
+                       //modexCopyPageRegion(&video->page[0], &video->page[1], enti->x, enti->y, 0, 0, 24, 32);\r
+               }*/\r
                VL_ShowPage(&(gv->video.page[gv->video.sp]), gv->kurokku.fpscap, 0);\r
-//             if(!pageploop) gv->video.p=!gv->video.p;\r
-               gv->video.r =!gv->video.r ;\r
+               gv->video.dorender =!gv->video.dorender ;\r
                //0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2;\r
-//     }\r
        }\r
 }\r
 \r
-void near ZC_drawframe(map_view_t *pip, entity_t *enti, sword x, sword y)\r
-{\r
-       switch(pip[0].video->rss)\r
-       {\r
-               case 0:\r
-                       animate_spri(enti, pip->video);\r
-               break;\r
-               case 1:\r
-                       animate_spri(enti, pip->video);\r
-               break;\r
-//             case 2:\r
-//                     modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, player[pn].enti.dire);\r
-//             break;\r
-       }\r
-}\r
-\r
-#ifdef SPRITE\r
-#define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#define FRAME3 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 0, player[pn].enti.dire, 24, 32,    PLAYERBMPDATAPTR);\r
-#define FRAME4 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#else\r
-#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+player[pn].enti.dire);\r
-#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
-#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, player[pn].enti.dire);\r
-#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
-#endif\r
-\r
-void animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
-{\r
-       sword x = player[pn].enti.x;\r
-       sword y = player[pn].enti.y;\r
-       sword bx = x+16;        //buffer's x\r
-       sword by = y+16;        //buffer's y\r
-       sword qq; //scroll offset\r
-       word ls = 0;//player[pn].enti.persist_aniframe;\r
-       player[pn].enti.dire=32; //direction\r
-\r
-       switch(scrollswitch)\r
-       {\r
-               case 0:\r
-                       qq = 0;\r
-               break;\r
-               default:\r
-                       qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
-               break;\r
-       }\r
-       //x-=4;\r
-       y-=pip[0].map->tiles->tileHeight;\r
-       switch (player[pn].enti.d)\r
-       {\r
-               case 0:\r
-                       //up\r
-                       player[pn].enti.dire*=player[pn].enti.d;\r
-                       y-=qq;\r
-                       by-=4;\r
-               break;\r
-               case 3:\r
-                       // right\r
-                       player[pn].enti.dire*=(player[pn].enti.d-2);\r
-                       x+=qq;\r
-                       bx+=4;\r
-               break;\r
-               case 2:\r
-               break;\r
-               case 4:\r
-                       //down\r
-                       player[pn].enti.dire*=(player[pn].enti.d-2);\r
-                       y+=qq;\r
-                       by+=4;\r
-               break;\r
-               case 1:\r
-                       //left\r
-                       player[pn].enti.dire*=(player[pn].enti.d+2);\r
-                       x-=qq;\r
-                       bx-=4;\r
-               break;\r
-       }\r
-\r
-//     if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);\r
-//     else{\r
-//             //copy old bg to page0\r
-//             //modexCopyPageRegion(pip[3].page, pip[0].page, bx, by, 0, 0,   20, 36);\r
-//             //update buffer\r
-//             //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,   x, y,   20, 36);\r
-//     }\r
-//modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);\r
-       //modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);\r
-       /*modexCopyPageRegion(pip[pip->video->p].page,\r
- pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36);*/\r
-//     else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40);\r
-       switch(ls)\r
-       {\r
-               case 1:\r
-                       FRAME1\r
-               break;\r
-               case 2:\r
-                       FRAME2\r
-               break;\r
-               case 3:\r
-                       FRAME3\r
-               break;\r
-               case 4:\r
-                       FRAME4\r
-               break;\r
-       }\r
-//     if(2>ls && ls>=1) { FRAME1 }else\r
-//     if(3>ls && ls>=2) { FRAME2 }else\r
-//     if(4>ls && ls>=3) { FRAME3 }else\r
-//     if(5>ls && ls>=4) { FRAME4 }\r
-       //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 24, 32);\r
-       //printf("x=%d  y=%d    bx=%d           by=%d\n", x, y, bx, by);\r
-       pip->video->r=1;\r
-}\r
-\r
-void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
+void near ZC_animatePlayer(map_view_t *pip, player_t *player, nibble pn)\r
 {\r
        sword x = player[pn].enti.x;\r
        sword y = player[pn].enti.y;\r
        sword qq,dd; //scroll offset\r
        player[pn].enti.dire=10; //direction\r
 \r
-       switch(scrollswitch)\r
+       switch(player[pn].walktype)\r
        {\r
                case 0:\r
                        dd = 0;\r
@@ -851,7 +749,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
                break;\r
                case 2:\r
                        dd = 1;\r
-                       qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
+                       qq = player[pn].enti.q*player[pn].enti.speed;\r
                break;\r
        }\r
        x-=4;\r
@@ -884,6 +782,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
        player[pn].enti.dire+=dd;\r
        if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)\r
        {\r
+               //0000printf("  q=%u    pred=%u d=%u    dd=%u\n", player[pn].enti.q, player[pn].enti.pred, player[pn].enti.d, dd);\r
                set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire);       if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; }\r
                player[pn].enti.pred = player[pn].enti.d;\r
        }\r
@@ -892,10 +791,12 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
        player[pn].enti.spri->x = x;\r
        player[pn].enti.spri->y = y;\r
 \r
+       if(pip[0].video->bgps)\r
+               modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40);\r
        //draw sprite\r
-       ZC_drawframe(pip, &player[pn].enti, x, y);\r
-//0000if(player[pn].enti.q<2) delay(200);\r
-       pip->video->r=1;\r
+       animate_spri(&player[pn].enti, pip[0].video);\r
+//0000if(player[pn].enti.q<4) delay(200);\r
+       pip[0].video->dorender = 1;\r
 }\r
 \r
 /*\r
@@ -986,6 +887,4 @@ void mapScroll(map_view_t *mv, player_t *player)
                default:\r
                        break;\r
        }\r
-\r
-       mv->video->r=1;\r
 }\r