*/\r
#include "src/lib/scroll16.h"\r
\r
+#define ANIMATESPRIFUN ZC_animatePlayer\r
+\r
void oldwalk(map_view_t *pip, player_t *player, word pn)\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
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.x+=(player[pn].enti.speed);\r
- animatePlayer(pip, player, pn, 0);\r
+ ANIMATESPRIFUN(pip, player, pn, 0);\r
if(!pageflipflop) modexShowPage(pip[1].page);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.x-=(player[pn].enti.speed);\r
- animatePlayer(pip, player, pn, 0);\r
+ ANIMATESPRIFUN(pip, player, pn, 0);\r
if(!pageflipflop) modexShowPage(pip[1].page);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.y+=(player[pn].enti.speed);\r
- animatePlayer(pip, player, pn, 0);\r
+ ANIMATESPRIFUN(pip, player, pn, 0);\r
if(!pageflipflop) modexShowPage(pip[1].page);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.y-=(player[pn].enti.speed);\r
- animatePlayer(pip, player, 0, pn);\r
+ ANIMATESPRIFUN(pip, player, 0, pn);\r
if(!pageflipflop) modexShowPage(pip[1].page);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.x+=(player[pn].enti.speed);\r
- animatePlayer(pip, player, pn, 0);\r
+ ANIMATESPRIFUN(pip, player, pn, 0);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
}\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.x-=(player[pn].enti.speed);\r
- animatePlayer(pip, player, pn, 0);\r
+ ANIMATESPRIFUN(pip, player, pn, 0);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
}\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.y+=(player[pn].enti.speed);\r
- animatePlayer(pip, player, pn, 0);\r
+ ANIMATESPRIFUN(pip, player, pn, 0);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
}\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
INC_PER_FRAME;\r
- animatePlayer(pip, player, pn, 1);\r
+ ANIMATESPRIFUN(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
{\r
INC_PER_FRAME;\r
player[pn].enti.y-=(player[pn].enti.speed);\r
- animatePlayer(pip, player, 0, pn);\r
+ ANIMATESPRIFUN(pip, player, 0, pn);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
}\r
}\r
\r
/*\r
+void animate_spri(struct sprite *spri, global_game_variables_t *gv)\r
{\r
-#define VMEMPAGESIZE2 gv->video.page[0].pagesize+gv->video.page[1].pagesize\r
-#define VMEMPAGEDATA2 gv->video.page[2].data\r
+#define GVARVIDEO gv->video\r
+#define VMEMPAGESIZE2 GVARVIDEO.page[0].pagesize+GVARVIDEO.page[1].pagesize\r
+#define VMEMPAGEDATA2 GVARVIDEO.page[2].data\r
unsigned int i,o,o2; int j;\r
int x,y,rx,ry,w,h;\r
int overdraw = 1; // how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.\r
\r
// render box bounds. y does not need modification, but x and width must be multiple of 4\r
if (x >= overdraw) rx = (x - overdraw) & (~3);\r
- else rx = -(gv->video.page[0].dx);\r
+ else rx = -(GVARVIDEO.page[0].dx);\r
if (y >= overdraw) ry = (y - overdraw);\r
- else ry = -(gv->video.page[0].dy);\r
+ else ry = -(GVARVIDEO.page[0].dy);\r
h = spri->sprite_vrl_cont->vrl_header->height + overdraw + y - ry;\r
w = (x + spri->sprite_vrl_cont->vrl_header->width + (overdraw*2) + 3 - rx) & (~3);//round up\r
- if ((rx+w) > gv->video.page[0].width) w = gv->video.page[0].width-rx;\r
- if ((ry+h) > gv->video.page[0].height) h = gv->video.page[0].height-ry;\r
+ if ((rx+w) > GVARVIDEO.page[0].width) w = GVARVIDEO.page[0].width-rx;\r
+ if ((ry+h) > GVARVIDEO.page[0].height) h = GVARVIDEO.page[0].height-ry;\r
\r
// block copy pattern to where we will draw the sprite\r
vga_setup_wm1_block_copy();\r
o2 = VMEMPAGESIZE2;\r
- o = (0x10000UL - (uint16_t)VMEMPAGEDATA2) + (ry * gv->video.page[0].stridew) + (rx >> 2); // source offscreen\r
- for (i=0;i < h;i++,o += gv->video.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
+ o = (0x10000UL - (uint16_t)VMEMPAGEDATA2) + (ry * GVARVIDEO.page[0].stridew) + (rx >> 2); // source offscreen\r
+ for (i=0;i < h;i++,o += GVARVIDEO.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
\r
// must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally\r
vga_restore_rm0wm0();\r
\r
// replace VGA stride with our own and mem ptr. then sprite rendering at this stage is just (0,0)\r
- vga_state.vga_draw_stride_limit = (gv->video.page[0].width + 3 - x) >> 2;//round up\r
+ vga_state.vga_draw_stride_limit = (GVARVIDEO.page[0].width + 3 - x) >> 2;//round up\r
vga_state.vga_draw_stride = w >> 2;\r
vga_state.vga_graphics_ram = omemptr + VMEMPAGESIZE2;\r
\r
// block copy to visible RAM from offscreen\r
vga_setup_wm1_block_copy();\r
o = VMEMPAGESIZE2; // source offscreen\r
- o2 = (ry * gv->video.page[0].stridew) + (rx >> 2); // dest visible (original stride)\r
- for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += gv->video.page[0].stridew) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
+ o2 = (ry * GVARVIDEO.page[0].stridew) + (rx >> 2); // dest visible (original stride)\r
+ for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += GVARVIDEO.page[0].stridew) 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
\r
// restore stride\r
- vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = gv->video.page[0].stridew;\r
+ vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = GVARVIDEO.page[0].stridew;\r
\r
// Depending on delay, update indices\r
switch(spri->delay){\r
}\r
*/\r
//void animate_spri(struct sprite *spri, global_game_variables_t *gv)\r
-void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch, global_game_variables_t *gv)\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
sword y = player[pn].enti.y;\r
- sword bx = x+16; //buffer's x\r
- sword by = y+16; //buffer's y\r
- word dire=32; //direction\r
+ word dire=10; //direction\r
+ sword i;\r
sword qq; //scroll offset\r
word ls = player[pn].enti.persist_aniframe;\r
\r
{\r
case 0:\r
//up\r
- dire*=player[pn].enti.d;\r
+ dire*=(player[pn].enti.d+1);// dire++;\r
y-=qq;\r
- by-=4;\r
break;\r
case 3:\r
// right\r
- dire*=(player[pn].enti.d-2);\r
+ dire*=(player[pn].enti.d-1);// dire++;\r
x+=qq;\r
- bx+=4;\r
break;\r
case 2:\r
break;\r
case 4:\r
//down\r
- dire*=(player[pn].enti.d-2);\r
+ dire*=(player[pn].enti.d-1);// dire++;\r
y+=qq;\r
- by+=4;\r
break;\r
case 1:\r
//left\r
- dire*=(player[pn].enti.d+2);\r
+ dire*=(player[pn].enti.d+3);// dire++;\r
x-=qq;\r
- bx-=4;\r
break;\r
}\r
\r
- //if(!pageflipflop)\r
- // 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
+ //setting xy position\r
+ player[pn].ent->spri->x = x;\r
+ player[pn].ent->spri->y = y;\r
\r
//#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire);\r
//#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
//#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire);\r
//#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
+#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)\r
+#define NFRAME1 i = set_anim_by_id(player[pn].ent->spri, 2+dire); DRAWFRAME;\r
+#define NFRAME2 i = set_anim_by_id(player[pn].ent->spri, 1+dire); DRAWFRAME;\r
+#define NFRAME3 i = set_anim_by_id(player[pn].ent->spri, dire); DRAWFRAME;\r
+#define NFRAME4 i = set_anim_by_id(player[pn].ent->spri, 2+dire); DRAWFRAME;\r
\r
switch(ls)\r
{\r
case 1:\r
- FRAME1\r
+ NFRAME1\r
break;\r
case 2:\r
- FRAME2\r
+ NFRAME2;\r
break;\r
case 3:\r
- FRAME3\r
+ NFRAME3\r
break;\r
case 4:\r
- FRAME4\r
+ NFRAME4\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
projects / 16.git / blobdiff