X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=cb59f47cdea7d7d50a9b1cc4bf244796e83b6fe7;hb=bfa20fffe5a4e7e703f67500d6506b5401818efe;hp=bb0fb201f10850eaa5fbcb4cc76669bb406f7123;hpb=914b1aac9034d8d1ff3fe17b3821859de22891fe;p=16.git

diff --git a/src/test.c b/src/test.c
index bb0fb201..cb59f47c 100755
--- a/src/test.c
+++ b/src/test.c
@@ -23,15 +23,18 @@
 #include <stdio.h>
 #include "src/lib/modex16.h"
 #include "src/lib/16_in.h"
+#include "src/lib/scroll16.h"
 
 global_game_variables_t gvar;
 player_t player[MaxPlayers];
+map_view_t mv[2];
+pan_t pan;
 
 void main(int argc, char *argv[])
 {
 	int i, j;
 	word startclk, endclk;
-	word p, k;
+	word k;
 	byte *pal, *pal2;
 	sword bakapee;
 
@@ -71,7 +74,8 @@ void main(int argc, char *argv[])
 	modexPalBlack();
 
 	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
+	IN_Default(0,&player,ctrl_Keyboard1);
+	IN_initplayer(&player, 0);
 
 	textInit();
 	VGAmodeX(bakapee, 1, &gvar);
@@ -79,6 +83,14 @@ void main(int argc, char *argv[])
 
 	/* set up the page, but with 16 pixels on all borders in offscreen mem */
 	modexHiganbanaPageSetup(&gvar.video);
+	for(i=0;i<gvar.video.num_of_pages;i++)
+	{
+		mv[i].page = &gvar.video.page[i];
+		mv[i].video = &gvar.video;
+		mv[i].pan	= &pan;
+		mv[i].tx	= 0;
+		mv[i].ty	= 0;
+	}
 // 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 // 	gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);
 // 	gvar.video.page[0].width += 32;
@@ -87,55 +99,72 @@ void main(int argc, char *argv[])
 
 	/* fill the page with one color, but with a black border */
 	modexShowPage(&gvar.video.page[1]);
-	//modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 0);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);
 	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);
 	modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);
 	modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);
 	modexShowPage(&gvar.video.page[0]);
-	modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height);
+	modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width+32, gvar.video.page[0].height);
 
 	/* fade in */
 	modexFadeOn(1, pal2);
 
-	i=0,k=0,j=0,p=1;
+	i=0,k=0,j=0,pan.pn=1;
 	startclk = *clockw;
 	while(!IN_KeyDown(sc_Escape))
 	{
 		IN_ReadControl(0,&player);
-		if(i<5){
+		panpagemanual(mv, player, 0);
+
+		/*if(i<5){
 		switch (k)
 		{
 			case 0:
-				/* go right */
-				gvar.video.page[p].dx++;
+				pee:
+				// go right
+				gvar.video.page[pan.pn].dx++;
+				if(i==5){ if(j>=31){ i++; j=0; goto baka; }else j++; }else
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 1:
-				/* go left */
-				gvar.video.page[p].dx--;
+				// go left
+				gvar.video.page[pan.pn].dx--;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 2:
-				/* go up */
-				gvar.video.page[p].dy++;
+				// go up
+				gvar.video.page[pan.pn].dy++;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 3:
-				/* go down */
-				gvar.video.page[p].dy--;
+				// go down
+				gvar.video.page[pan.pn].dy--;
 				if(j>=32){ k=0; j=0; i++; }else j++;
 			break;
 			default:
 
 			break;
 		}}else{
-			modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width-32, 16, 45);
-			if(IN_KeyDown(6)) modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width, 16, 45);
-		}
-		if(IN_KeyDown(2)) p=0;
-		if(IN_KeyDown(3)) p=1;
-		//if(IN_KeyDown(6)) modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[0].sw-64, gvar.video.page[0].sh-16, 45);
-		modexShowPage(&gvar.video.page[p]);
+			if(i==5) goto pee;
+			baka:
+			i++;
+			modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width-32, 16, 45);*/
+			if(IN_KeyDown(6))
+			{
+				modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);
+			}
+			if(IN_KeyDown(4+1)){
+				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
+				modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
+				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
+			}
+		//}
+		if(IN_KeyDown(2)) pan.pn=0;
+		if(IN_KeyDown(3)) pan.pn=1;
+		if(IN_KeyDown(25)){
+			modexpdump(&gvar.video.page[pan.pn]);
+		}//p
+		modexShowPage(&gvar.video.page[pan.pn]);
 	}
 
 	endclk = *clockw;
@@ -151,8 +180,12 @@ void main(int argc, char *argv[])
 	for(i=0; i<gvar.video.num_of_pages;i++)
 	{
 		printf("	[%u]=", i);
-		printf("(%Fp)\n", (gvar.video.page[i].data));
+		printf("(%Fp)", (gvar.video.page[i].data));
+		printf(" size=%ld", gvar.video.page[i].pagesize);
+		printf(" sw=%u  sh=%u\n", gvar.video.page[i].sw, gvar.video.page[i].sh);
+		printf("\n");
 	}
+	printf("tx=%d	", mv[pan.pn].tx); printf("ty=%d	", mv[pan.pn].ty); printf("player.d=%d\n", player[0].d);
 	IN_Shutdown();
 	modexPalBlack();
 	modexFadeOn(1, pal);