#include "src/lib/scroll16.h"\r
\r
//#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = 1;\r
+#define ZC_WALKR ScrollRight(pip, player, 3, pn); \\r
+ ScrollRight(pip, player, 2, pn); \\r
+ mapScrollRight(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollRight(pip, player, (1), pn);\r
+#define ZC_WALKL ScrollLeft(pip, player, 3, pn); \\r
+ ScrollLeft(pip, player, 2, pn); \\r
+ mapScrollLeft(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollLeft(pip, player, (1), pn);\r
+#define ZC_WALKD ScrollDown(pip, player, 3, pn); \\r
+ ScrollDown(pip, player, 2, pn); \\r
+ mapScrollDown(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollDown(pip, player, (1), pn);\r
+#define ZC_WALKU ScrollUp(pip, player, 3, pn); \\r
+ ScrollUp(pip, player, 2, pn); \\r
+ mapScrollUp(pip, player, (0), pn); \\r
+if(pip[0].video->bgps) mapScrollUp(pip, player, (1), pn);\r
\r
void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
{\r
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, (0), pn);\r
- if(pip[0].video->bgps) mapScrollRight(pip, player, (1), pn);\r
+ ZC_animatePlayer(pip, player, pn, 2);\r
+ ZC_WALKR\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
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, 1);\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, 0);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx+1;\r
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, (0), pn);\r
- if(pip[0].video->bgps) mapScrollLeft(pip, player, (1), pn);\r
+ ZC_animatePlayer(pip, player, pn, 2);\r
+ ZC_WALKL\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
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, 1);\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, 0);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx-1;\r
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, (0), pn);\r
- if(pip[0].video->bgps) mapScrollDown(pip, player, (1), pn);\r
+ ZC_animatePlayer(pip, player, pn, 2);\r
+ ZC_WALKD\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
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, 1);\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, 0);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx;\r
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, (0), pn);\r
- if(pip[0].video->bgps) mapScrollUp(pip, player, (1), pn);\r
+ ZC_animatePlayer(pip, player, pn, 2);\r
+ ZC_WALKU\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
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, 1);\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, 0);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx;\r
}\r
}\r
\r
+//===========================================================================//\r
+\r
\r
void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
{\r
if(player[plid].enti.q==4)\r
#endif\r
// if(id==0)\r
- mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWCOLNUM);\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
if(player[plid].enti.q==4)\r
#endif\r
// if(id==0)\r
- mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWCOLNUM);\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->r=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 4://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 1://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
+ printf("player[pn].enti.d=%u\n", player[pn].enti.d);\r
+ mv->video->r=1;\r
+}\r
\r
//===========================================================================\r
//TODO: put player in starting position of assigned spot on map\r
{\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
//\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
}\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
{\r
sword x = player[pn].enti.x;\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
+ animate_spri(&player[pn].enti, pip->video);\r
//0000if(player[pn].enti.q<2) delay(200);\r
pip->video->r=1;\r
}\r
default:\r
break;\r
}\r
-\r
- mv->video->r=1;\r
}\r
projects / 16.git / blobdiff