X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=d4a34e5ccc4879134b3a9242d10d54700c96efff;hb=06a59aa7546448c4e6f6e816f2e01219d4f3c041;hp=7dd71342986882da77e2d47db62931b7e588ac85;hpb=b070d62525540bfa0792d019e0b14fa08c96b987;p=16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 7dd71342..d4a34e5c 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -24,6 +24,8 @@
 */
 #include "src/lib/scroll16.h"
 
+#define ANIMATESPRIFUN ZC_animatePlayer
+
 void oldwalk(map_view_t *pip, player_t *player, word pn)
 {
 	#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;
@@ -43,7 +45,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollRight(pip, player, 3, pn);
 					ScrollRight(pip, player, 2, pn);
 					//mapScrollRight(pip, player, !(pip[0].video->p), pn);
@@ -59,7 +61,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.x+=(player[pn].enti.speed);
-					animatePlayer(pip, player, pn, 0);
+					ANIMATESPRIFUN(pip, player, pn, 0);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }
@@ -87,7 +89,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollLeft(pip, player, 3, pn);
 					ScrollLeft(pip, player, 2, pn);
 					//mapScrollLeft(pip, player, !(pip[0].video->p), pn);
@@ -103,7 +105,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.x-=(player[pn].enti.speed);
-					animatePlayer(pip, player, pn, 0);
+					ANIMATESPRIFUN(pip, player, pn, 0);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }
@@ -131,7 +133,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollDown(pip, player, 3, pn);
 					ScrollDown(pip, player, 2, pn);
 					//mapScrollDown(pip, player, !(pip[0].video->p), pn);
@@ -147,7 +149,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.y+=(player[pn].enti.speed);
-					animatePlayer(pip, player, pn, 0);
+					ANIMATESPRIFUN(pip, player, pn, 0);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }
@@ -175,7 +177,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollUp(pip, player, 3, pn);
 					ScrollUp(pip, player, 2, pn);
 					//mapScrollUp(pip, player, !(pip[0].video->p), pn);
@@ -191,7 +193,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.y-=(player[pn].enti.speed);
-					animatePlayer(pip, player, 0, pn);
+					ANIMATESPRIFUN(pip, player, 0, pn);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }
@@ -240,7 +242,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollRight(pip, player, 3, pn);
 					ScrollRight(pip, player, 2, pn);
 					mapScrollRight(pip, player, (pip[0].video->p), pn);
@@ -254,7 +256,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.x+=(player[pn].enti.speed);
-					animatePlayer(pip, player, pn, 0);
+					ANIMATESPRIFUN(pip, player, pn, 0);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }
 			}
@@ -278,7 +280,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollLeft(pip, player, 3, pn);
 					ScrollLeft(pip, player, 2, pn);
 					mapScrollLeft(pip, player, (pip[0].video->p), pn);
@@ -292,7 +294,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.x-=(player[pn].enti.speed);
-					animatePlayer(pip, player, pn, 0);
+					ANIMATESPRIFUN(pip, player, pn, 0);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }
 			}
@@ -316,7 +318,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollDown(pip, player, 3, pn);
 					ScrollDown(pip, player, 2, pn);
 					mapScrollDown(pip, player, (pip[0].video->p), pn);
@@ -330,7 +332,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.y+=(player[pn].enti.speed);
-					animatePlayer(pip, player, pn, 0);
+					ANIMATESPRIFUN(pip, player, pn, 0);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }
 			}
@@ -354,7 +356,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
+					ANIMATESPRIFUN(pip, player, pn, 1);
 					ScrollUp(pip, player, 3, pn);
 					ScrollUp(pip, player, 2, pn);
 					mapScrollUp(pip, player, (pip[0].video->p), pn);
@@ -368,7 +370,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					player[pn].enti.y-=(player[pn].enti.speed);
-					animatePlayer(pip, player, 0, pn);
+					ANIMATESPRIFUN(pip, player, 0, pn);
 					player[pn].enti.q++;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }
 			}
@@ -1196,9 +1198,11 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
 }
 
 /*
+void animate_spri(struct sprite *spri, global_game_variables_t *gv)
 {
-#define VMEMPAGESIZE2	gv->video.page[0].pagesize+gv->video.page[1].pagesize
-#define VMEMPAGEDATA2	gv->video.page[2].data
+#define GVARVIDEO gv->video
+#define VMEMPAGESIZE2	GVARVIDEO.page[0].pagesize+GVARVIDEO.page[1].pagesize
+#define VMEMPAGEDATA2	GVARVIDEO.page[2].data
 	unsigned int i,o,o2; int j;
 	int x,y,rx,ry,w,h;
 	int overdraw = 1;	// how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.
@@ -1221,25 +1225,25 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
 
 	// render box bounds. y does not need modification, but x and width must be multiple of 4
 	if (x >= overdraw) rx = (x - overdraw) & (~3);
-		else rx = -(gv->video.page[0].dx);
+		else rx = -(GVARVIDEO.page[0].dx);
 	if (y >= overdraw) ry = (y - overdraw);
-		else ry = -(gv->video.page[0].dy);
+		else ry = -(GVARVIDEO.page[0].dy);
 	h = spri->sprite_vrl_cont->vrl_header->height + overdraw + y - ry;
 	w = (x + spri->sprite_vrl_cont->vrl_header->width + (overdraw*2) + 3 - rx) & (~3);//round up
-	if ((rx+w) > gv->video.page[0].width) w = gv->video.page[0].width-rx;
-	if ((ry+h) > gv->video.page[0].height) h = gv->video.page[0].height-ry;
+	if ((rx+w) > GVARVIDEO.page[0].width) w = GVARVIDEO.page[0].width-rx;
+	if ((ry+h) > GVARVIDEO.page[0].height) h = GVARVIDEO.page[0].height-ry;
 
 	// block copy pattern to where we will draw the sprite
 	vga_setup_wm1_block_copy();
 	o2 = VMEMPAGESIZE2;
-	o = (0x10000UL - (uint16_t)VMEMPAGEDATA2) + (ry * gv->video.page[0].stridew) + (rx >> 2); // source offscreen
-	for (i=0;i < h;i++,o += gv->video.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);
+	o = (0x10000UL - (uint16_t)VMEMPAGEDATA2) + (ry * GVARVIDEO.page[0].stridew) + (rx >> 2); // source offscreen
+	for (i=0;i < h;i++,o += GVARVIDEO.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);
 
 	// must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally
 	vga_restore_rm0wm0();
 
 	// replace VGA stride with our own and mem ptr. then sprite rendering at this stage is just (0,0)
-	vga_state.vga_draw_stride_limit = (gv->video.page[0].width + 3 - x) >> 2;//round up
+	vga_state.vga_draw_stride_limit = (GVARVIDEO.page[0].width + 3 - x) >> 2;//round up
 	vga_state.vga_draw_stride = w >> 2;
 	vga_state.vga_graphics_ram = omemptr + VMEMPAGESIZE2;
 
@@ -1259,13 +1263,13 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
 	// block copy to visible RAM from offscreen
 	vga_setup_wm1_block_copy();
 	o = VMEMPAGESIZE2; // source offscreen
-	o2 = (ry * gv->video.page[0].stridew) + (rx >> 2); // dest visible (original stride)
-	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);
+	o2 = (ry * GVARVIDEO.page[0].stridew) + (rx >> 2); // dest visible (original stride)
+	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);
 	// must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally
 	vga_restore_rm0wm0();
 
 	// restore stride
-	vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = gv->video.page[0].stridew;
+	vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = GVARVIDEO.page[0].stridew;
 
 	// Depending on delay, update indices
 	switch(spri->delay){
@@ -1292,13 +1296,12 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
 }
 */
 //void animate_spri(struct sprite *spri, global_game_variables_t *gv)
-void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch, global_game_variables_t *gv)
+void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)
 {
 	sword x = player[pn].enti.x;
 	sword y = player[pn].enti.y;
-	sword bx = x+16;	//buffer's x
-	sword by = y+16;	//buffer's y
-	word dire=32; //direction
+	word dire=10; //direction
+	sword i;
 	sword qq; //scroll offset
 	word ls = player[pn].enti.persist_aniframe;
 
@@ -1317,72 +1320,57 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
 	{
 		case 0:
 			//up
-			dire*=player[pn].enti.d;
+			dire*=(player[pn].enti.d+1);// dire++;
 			y-=qq;
-			by-=4;
 		break;
 		case 3:
 			// right
-			dire*=(player[pn].enti.d-2);
+			dire*=(player[pn].enti.d-1);// dire++;
 			x+=qq;
-			bx+=4;
 		break;
 		case 2:
 		break;
 		case 4:
 			//down
-			dire*=(player[pn].enti.d-2);
+			dire*=(player[pn].enti.d-1);// dire++;
 			y+=qq;
-			by+=4;
 		break;
 		case 1:
 			//left
-			dire*=(player[pn].enti.d+2);
+			dire*=(player[pn].enti.d+3);// dire++;
 			x-=qq;
-			bx-=4;
 		break;
 	}
 
-	//if(!pageflipflop)
-	//	modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);
-	//else{
-		//copy old bg to page0
-		//modexCopyPageRegion(pip[3].page, pip[0].page, bx, by,	0, 0,	20, 36);
-		//update buffer
-		//modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,	x, y,	20, 36);
-	//}
-//modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);
-	//modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);
-	/*modexCopyPageRegion(pip[pip->video->p].page,
- pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36);*/
-//	else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40);
+	//setting xy position
+	player[pn].ent->spri->x = x;
+	player[pn].ent->spri->y = y;
 
 //#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire);
 //#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);
 //#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire);
 //#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);
+#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)
+#define NFRAME1 i = set_anim_by_id(player[pn].ent->spri, 2+dire);	DRAWFRAME;
+#define NFRAME2 i = set_anim_by_id(player[pn].ent->spri, 1+dire);	DRAWFRAME;
+#define NFRAME3 i = set_anim_by_id(player[pn].ent->spri, dire);	DRAWFRAME;
+#define NFRAME4 i = set_anim_by_id(player[pn].ent->spri, 2+dire);	DRAWFRAME;
 
 	switch(ls)
 	{
 		case 1:
-			FRAME1
+			NFRAME1
 		break;
 		case 2:
-			FRAME2
+			NFRAME2;
 		break;
 		case 3:
-			FRAME3
+			NFRAME3
 		break;
 		case 4:
-			FRAME4
+			NFRAME4
 		break;
 	}
-//	if(2>ls && ls>=1) { FRAME1 }else
-//	if(3>ls && ls>=2) { FRAME2 }else
-//	if(4>ls && ls>=3) { FRAME3 }else
-//	if(5>ls && ls>=4) { FRAME4 }
-	//modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 24, 32);
-	//printf("x=%d	y=%d	bx=%d		by=%d\n", x, y, bx, by);
 	pip->video->r=1;
 }