X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scroll.c;h=057a5ee549df0a0edba744805f4e9c7b445d15fd;hb=223378457fa5f386bc056f7162bba6c523d6164f;hp=787330261ac89e28b53799d5d33f358bb6c3cc76;hpb=f90a79d1d9dcb5994352f90511575e957d207f2a;p=16.git

diff --git a/scroll.c b/scroll.c
index 78733026..057a5ee5 100644
--- a/scroll.c
+++ b/scroll.c
@@ -27,16 +27,16 @@ typedef struct {
 	map_t *map;
 	page_t *page;
 	int tx; //appears to be the top left tile position on the viewable screen map
-	int ty; //appears to be the top left tile position on the viewable screen map
+	int ty; //appears to be the top left tile position on the viewable screen map
 	word dxThresh; //????
 	word dyThresh; //????
 } map_view_t;
 
-struct {
+struct {
 	int x; //player exact position on the viewable map
 	int y; //player exact position on the viewable map
 	int tx; //player tile position on the viewable map
-	int ty; //player tile position on the viewable map
+	int ty; //player tile position on the viewable map
 	int hp; //hitpoints of the player
 } player;
 
@@ -50,203 +50,206 @@ void mapScrollDown(map_view_t *mv, byte offset);
 void mapGoTo(map_view_t *mv, int tx, int ty);
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-void animatePlayer(map_view_t *mv, short d1, short d2, int x, int y, int ls, bitmap_t *bmp);
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
+void animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int y, int ls, bitmap_t *bmp);
 
 #define TILEWH 16
-#define QUADWH (TILEWH/4)
-#define SPEED 2
-
-//place holder definitions
-#define MAPX 40
+#define QUADWH (TILEWH/4)
+#define SPEED 4
+
+//place holder definitions
+#define MAPX 40
 #define MAPY 30
 #define SWAP(a, b) tmp=a; a=b; b=tmp;
 void main() {
 	bitmap_t ptmp; // player sprite
-	int q=0;
+	int q=1;
 	page_t screen, screen2;
 	map_t map;
 	map_view_t mv, mv2;
-	map_view_t *draw, *show, *tmp;
+	map_view_t *bg, *spri, *tmp;
 	byte *ptr;
 
 	setkb(1);
 	/* create the map */
 	map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	initMap(&map);
-	mv.map = ↦
+	mv.map = ↦
 	mv2.map = ↦
 
 	/* draw the tiles */
-	ptr = map.data;
+	ptr = map.data;
 	ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
-	modexEnter();
+	modexEnter();
 	modexPalUpdate(ptmp.palette);
 	screen = modexDefaultPage();
 	screen.width += (TILEWH*2);
+	screen.height += (TILEWH*2);
 	mv.page = &screen;
-	screen2=modexNextPage(mv.page);
+	screen2 = modexNextPage(mv.page);
 	mv2.page = &screen2;
-	modexShowPage(mv.page);
 
 	/* set up paging */
-	show = &mv;
-	draw = &mv2;
-//	draw = &mv;
-
-//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-	mapGoTo(draw, 0, 0);
-	mapGoTo(show, 0, 0);
-
+	bg = &mv;
+	spri = &mv2;
+
+//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
+	mapGoTo(bg, 0, 0);
+	mapGoTo(spri, 0, 0);
+
 	//TODO: put player in starting position of spot
-	//default player position on the viewable map
-	player.tx = draw->tx + 10;
-	player.ty = draw->ty + 8;
-	player.x = player.tx*TILEWH;
-	player.y = player.ty*TILEWH;
-	modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-	
-	modexShowPage(draw->page);
-	while(!keyp(1))
+	//default player position on the viewable map
+	player.tx = bg->tx + 10;
+	player.ty = bg->ty + 8;
+	player.x = player.tx*TILEWH;
+	player.y = player.ty*TILEWH;
+	modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
+	modexCopyPageRegion(bg->page, spri->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+	modexShowPage(bg->page);
+	while(!keyp(1))
 	{
 	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
 	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
-	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
-	
-	//TODO: render the player properly with animation and sprite sheet
-	if(keyp(77))
-	{
-		modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);
-		if(draw->tx >= 0 && draw->tx+20 < MAPX && player.tx == draw->tx + 10)
-		{
-			for(q=0; q<(TILEWH/SPEED); q++)
+	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
+	
+	//TODO: render the player properly with animation and sprite sheet
+	//TODO: fexible speeds
+	if(keyp(77) && !keyp(75))
+	{
+		if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10)
+		{
+			for(q=1; q<=(TILEWH/SPEED); q++)
 			{
-//				modexDrawBmp(draw->page, &bmp);
-				animatePlayer(draw, 1, 1, player.x, player.y, q, &ptmp);
-				mapScrollRight(draw, SPEED);
-				modexShowPage(draw->page);
-//				mapScrollRight(show, SPEED);
-//				SWAP(draw, show);
-			}
-			player.tx++;
-		}
-		else if(player.tx < MAPX)
-		{
-			for(q=0; q<(TILEWH/SPEED); q++)
-			{
-				player.x+=SPEED;
-//				modexDrawBmp(draw->page, player.x, player.y, &bmp);
-				animatePlayer(draw, 1, 0, player.x, player.y, q, &ptmp);
-				modexShowPage(draw->page);
-//				SWAP(draw, show);
-			}
-			player.tx++;
+				animatePlayer(bg, spri, 1, 1, player.x, player.y, q, &ptmp);
+				mapScrollRight(bg, SPEED);
+				mapScrollRight(spri, SPEED);
+				modexShowPage(spri->page);
+			}
+			player.tx++;
+		}
+		else if(player.tx < MAPX)
+		{
+			for(q=1; q<=(TILEWH/SPEED); q++)
+			{
+				player.x+=SPEED;
+				animatePlayer(bg, spri, 1, 0, player.x, player.y, q, &ptmp);
+				modexShowPage(spri->page);
+			}
+			player.tx++;
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);
+			modexShowPage(spri->page);
 		}
 	}
 
-	if(keyp(75))
-	{
-		modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);
-		if(draw->tx > 0 && draw->tx+20 <= MAPX && player.tx == draw->tx + 10)
-		{
-			for(q=0; q<(TILEWH/SPEED); q++)
-			{
-//				modexDrawBmp(draw->page, player.x-((q+1)*SPEED), player.y, &bmp);
-				animatePlayer(draw, 3, 1, player.x, player.y, q, &ptmp);
-				mapScrollLeft(draw, SPEED);
-				modexShowPage(draw->page);
-//				mapScrollLeft(show, SPEED);
-//				SWAP(draw, show);
-			}
+	if(keyp(75) && !keyp(77))
+	{
+		if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10)
+		{
+			for(q=1; q<=(TILEWH/SPEED); q++)
+			{
+				
+				animatePlayer(bg, spri, 3, 1, player.x, player.y, q, &ptmp);
+				mapScrollLeft(bg, SPEED);
+				mapScrollLeft(spri, SPEED);
+				modexShowPage(spri->page);
+			}
+			player.tx--;
+		}
+		else if(player.tx > 1)
+		{
+			for(q=1; q<=(TILEWH/SPEED); q++)
+			{
+				player.x-=SPEED;
+				animatePlayer(bg, spri, 3, 0, player.x, player.y, q, &ptmp);
+				modexShowPage(spri->page);
+			}
 			player.tx--;
-		}
-		else if(player.tx > 1)
-		{
-			for(q=0; q<(TILEWH/SPEED); q++)
-			{
-				player.x-=SPEED;
-//				modexDrawBmp(draw->page, player.x, player.y, &bmp);
-				animatePlayer(draw, 3, 0, player.x, player.y, q, &ptmp);
-				modexShowPage(draw->page);
-//				SWAP(draw, show);
-			}
-			player.tx--;
-		}
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);
+			modexShowPage(spri->page);
+		}
 	}
 
-	if(keyp(80))
-	{
-		modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-		if(draw->ty >= 0 && draw->ty+15 < MAPY && player.ty == draw->ty + 8)
+	if(keyp(80) && !keyp(72))
+	{
+		if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8)
+		{
+			for(q=1; q<=(TILEWH/SPEED); q++)
+			{
+				animatePlayer(bg, spri, 2, 1, player.x, player.y, q, &ptmp);
+				mapScrollDown(bg, SPEED);
+				mapScrollDown(spri, SPEED);
+				modexShowPage(spri->page);
+			}
+			player.ty++;
+		}
+		else if(player.ty < MAPY)
 		{
-			for(q=0; q<(TILEWH/SPEED); q++)
-			{
-//				modexDrawBmp(draw->page, player.x, player.y+((q+1)*SPEED), &bmp);
-				animatePlayer(draw, 2, 1, player.x, player.y, q, &ptmp);
-				mapScrollDown(draw, SPEED);
-				modexShowPage(draw->page);
-//				mapScrollDown(show, SPEED);
-//				SWAP(draw, show);
-			}
-			player.ty++;
-		}
-		else if(player.ty < MAPY)
-		{
-			for(q=0; q<(TILEWH/SPEED); q++)
-			{
-				player.y+=SPEED;
-//				modexDrawBmp(draw->page, player.x, player.y, &bmp);
-				animatePlayer(draw, 2, 0, player.x, player.y, q, &ptmp);
-				modexShowPage(draw->page);
-//				SWAP(draw, show);
-			}
-			player.ty++;
+			for(q=1; q<=(TILEWH/SPEED); q++)
+			{
+				player.y+=SPEED;
+				animatePlayer(bg, spri, 2, 0, player.x, player.y, q, &ptmp);
+				modexShowPage(spri->page);
+			}
+			player.ty++;
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
+			modexShowPage(spri->page);
 		}
 	}
 
-	if(keyp(72))
-	{
-		modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);
-		if(draw->ty > 0 && draw->ty+15 <= MAPY && player.ty == draw->ty + 8)
+	if(keyp(72) && !keyp(80))
+	{
+		if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8)
 		{
-			for(q=0; q<(TILEWH/SPEED); q++)
+			for(q=1; q<=(TILEWH/SPEED); q++)
 			{
-//				modexDrawBmp(draw->page, player.x, player.y-((q+1)*SPEED), &bmp);
-				animatePlayer(draw, 0, 1, player.x, player.y, q, &ptmp);
-				mapScrollUp(draw, SPEED);
-				modexShowPage(draw->page);
-//				mapScrollUp(show, SPEED);
-//				SWAP(draw, show);
-			}
-			player.ty--;
-		}
-		else if(player.ty > 1)
-		{
-			for(q=0; q<(TILEWH/SPEED); q++)
-			{
-				player.y-=SPEED;
-//				modexDrawBmp(draw->page, player.x, player.y, &bmp);
-				animatePlayer(draw, 0, 0, player.x, player.y, q, &ptmp);
-				modexShowPage(draw->page);
-//				SWAP(draw, show);
-			}
-			player.ty--;
+				animatePlayer(bg, spri, 0, 1, player.x, player.y, q, &ptmp);
+				mapScrollUp(bg, SPEED);
+				mapScrollUp(spri, SPEED);
+				modexShowPage(spri->page);
+			}
+			player.ty--;
+		}
+		else if(player.ty > 1)
+		{
+			for(q=1; q<=(TILEWH/SPEED); q++)
+			{
+				player.y-=SPEED;
+				animatePlayer(bg, spri, 0, 0, player.x, player.y, q, &ptmp);
+				modexShowPage(spri->page);
+			}
+			player.ty--;
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);
+			modexShowPage(spri->page);
 		}
 	}
-//	modexDrawBmp(draw->page, player.x, player.y, &bmp);
-	//modexShowPage(draw->page);
 
 	}
-
+
 	modexLeave();
-	setkb(0);
-	printf("Project 16 scroll.exe\n");
-	printf("tx: %d\n", draw->tx);
-	printf("ty: %d\n", draw->ty);
-	printf("player.x: %d\n", player.x);
-	printf("player.y: %d\n", player.y);
-	printf("player.tx: %d\n", player.tx);
-	printf("player.ty: %d\n", player.ty);
+	setkb(0);
+	printf("Project 16 scroll.exe\n");
+	printf("tx: %d\n", bg->tx);
+	printf("ty: %d\n", bg->ty);
+	printf("player.x: %d\n", player.x);
+	printf("player.y: %d\n", player.y);
+	printf("player.tx: %d\n", player.tx);
+	printf("player.ty: %d\n", player.ty);
 }
 
 
@@ -466,43 +469,48 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
 	i += mv->map->width;
 	}
 }
-
-void animatePlayer(map_view_t *mv, short d1, short d2, int x, int y, int ls, bitmap_t *bmp)
+
+void
+animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int y, int ls, bitmap_t *bmp)
 {
-	int qq;
-
-	if(d2==0) qq = 0;
-	else qq = ((ls+1)*SPEED);
-	switch (d1)
-	{
-		case 0:
-			//up
-			if(ls<2) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 24, 0, 24, 32, bmp);
-			if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 48, 0, 24, 32, bmp);
-			if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 0, 0, 24, 32, bmp);
-			if(ls>6) modexDrawSpriteRegion(mv->page, x-4, y-qq-TILEWH, 24, 0, 24, 32, bmp);
-		break;
-		case 1:
-			// right
-		//right
-			if(ls<2) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 24, 32, 24, 32, bmp);
-			if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 48, 32, 24, 32, bmp);
-			if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 0, 32, 24, 32, bmp);
-			if(ls>6) modexDrawSpriteRegion(mv->page, x+qq-4, y-TILEWH, 24, 32, 24, 32, bmp);
-		break;
-		case 2:
-			//down
-			if(ls<2) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 24, 64, 24, 32, bmp);
-			if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 48, 64, 24, 32, bmp);
-			if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 0, 64, 24, 32, bmp);
-			if(ls>6) modexDrawSpriteRegion(mv->page, x-4, y+qq-TILEWH, 24, 64, 24, 32, bmp);
-		break;
-		case 3:
-			//left
-			if(ls<2) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 24, 96, 24, 32, bmp);
-			if(4>ls && ls>=2) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 48, 96, 24, 32, bmp);
-			if(6>ls && ls>=4) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 0, 96, 24, 32, bmp);
-			if(ls>6) modexDrawSpriteRegion(mv->page, x-qq-4, y-TILEWH, 24, 96, 24, 32, bmp);
-		break;
+	short dire=32*d1;
+	short qq;
+	short lo = ((TILEWH / SPEED) / 3);
+	short loo = (ls + lo);
+
+	if(d2==0) qq = 0;
+	else qq = ((ls+1)*SPEED);
+	switch (d1)
+	{
+		case 0:
+			//up
+			x=x-4;
+			y=y-qq-TILEWH;
+		break;
+		case 1:
+			// right
+			x=x+qq-4;
+			y=y-TILEWH;
+		break;
+		case 2:
+			//down
+			x=x-4;
+			y=y+qq-TILEWH;
+		break;
+		case 3:
+			//left
+			x=x-qq-4;
+			y=y-TILEWH;
+		break;
 	}
-}
+	//TODO: make flexible animation thingy
+	if(2>ls && ls>=1) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);
+	modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else
+	if(3>ls && ls>=2) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);
+	modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else
+	if(4>ls && ls>=3) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);
+	modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else
+	if(5>ls && ls>=4) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);
+	modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }
+	modexWaitBorder();
+}