X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=acd6886a6598d5e0ff38f251166f58c2426080f2;hb=cc178d335220ce0be99025be734b84505cc5194b;hp=55db2017830ef7e9a2d5ff3e4222afa16aa4eb61;hpb=cfba60702c8aa81180bb10781950ad7eab914bcc;p=16.git

diff --git a/src/test.c b/src/test.c
index 55db2017..acd6886a 100755
--- a/src/test.c
+++ b/src/test.c
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include "src/lib/16_vl.h"
+#include "src/lib/16_vlpal.h"
 #include "src/lib/16_in.h"
 #include "src/lib/scroll16.h"
 
@@ -32,8 +33,8 @@ static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
 void main(int argc, char *argv[])
 {
+	static word paloffset=0;
 	static global_game_variables_t gvar;
-	static player_t player[MaxPlayers];
 
 	map_t map;
 	map_view_t mv[4];
@@ -41,10 +42,14 @@ void main(int argc, char *argv[])
 	int i, j;
 	word startclk, endclk;
 	word k;
-	//====byte *pal, *pal2;
+
+	imgtestpal_t bmp1, bmp2;
+
+
+	bmp1.width=bmp2.width=	40;
+	bmp1.width=bmp2.height=	30;
 
 	//====word colo=LGQ;
-	gvar.video.panp=0;
 
 	// DOSLIB: check our environment
 	/*probe_dos();
@@ -77,19 +82,26 @@ void main(int argc, char *argv[])
 	Startup16(&gvar);
 
 	/* save the palette */
-	//====pal  = modexNewPal();
 	//====modexPalSave(pal);
 	//====modexFadeOff(1, pal);
 	//====modexPalBlack();
 
 	//IN_Startup();
-	IN_Default(0,&player,ctrl_Keyboard1);
-	EN_initplayer(&player, 0);
+	IN_Default(0,&gvar.player,ctrl_Keyboard1);
+	EN_initPlayer(&gvar.player, 0, &gvar.video);
 
 	VGAmodeX(1, 1, &gvar);
-	//====modexPalBlack();
+	modexPalBlack();
 
 	/* load our palette */
+	VL_LoadPalFile("data/16.pal", &gvar.video.palette);
+	bmp1.offset=(paloffset/3);
+	VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);
+
+	//VL_LoadPalFilewithoffset("data/default.pal", &palette, paloffset);
+	modexLoadPalFile("data/16t.pal", &gvar.video.dpal);
+	bmp2.offset=(paloffset/3);
+	VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);
 	//====modexLoadPalFile("data/default.pal", &pal2);
 
 	/* overscan show */
@@ -112,13 +124,13 @@ void main(int argc, char *argv[])
 	modexShowPage(&gvar.video.page[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);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);
+	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 2);
+	modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 3);
+	modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 2);
 	modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height);
-	modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47);
-	modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);
+	modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 4);
+	modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 6);
 
 
 	/* fade in */
@@ -128,9 +140,9 @@ void main(int argc, char *argv[])
 	startclk = *clockw;
 	while(!IN_KeyDown(sc_Escape))
 	{
-		IN_ReadControl(0,&player);
-		ZC_panPageManual(&mv, &player, 0);
-		//[gvar.video.panp]
+		IN_ReadControl(0,&gvar.player);
+		ZC_panPageManual(&mv, &gvar.player, 0);
+		//[gvar.video.sp]
 		//ZC_MVSync(&mv);
 
 		/*if(i<5){
@@ -139,23 +151,23 @@ void main(int argc, char *argv[])
 			case 0:
 				pee:
 				// go right
-				gvar.video.page[gvar.video.panp].dx++;
+				gvar.video.page[gvar.video.sp].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[gvar.video.panp].dx--;
+				gvar.video.page[gvar.video.sp].dx--;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 2:
 				// go up
-				gvar.video.page[gvar.video.panp].dy++;
+				gvar.video.page[gvar.video.sp].dy++;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 3:
 				// go down
-				gvar.video.page[gvar.video.panp].dy--;
+				gvar.video.page[gvar.video.sp].dy--;
 				if(j>=32){ k=0; j=0; i++; }else j++;
 			break;
 			default:
@@ -176,21 +188,21 @@ void main(int argc, char *argv[])
 // 				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
 // 			}
 		//}
-		PANKEYFUN;
+		TAIL_PANKEYFUN;
 		if(IN_KeyDown(12)) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);
 		if(IN_KeyDown(13)) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);
 /*====		if(IN_KeyDown(7)){
 			for(i=0;i<3;i++)
 			{
 				pal2[i] = rand()%64;
-				modexPalUpdate1(pal2);
+				modexPalUpdate(pal2);
 				colo++;
 				if(colo>HGQ) colo=LGQ;
 			}
 //			if(i>PAL_SIZE) i=0;
 		}//9*/
-		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.panp]); IN_UserInput(1,1); }//p
-		//VL_ShowPage(&gvar.video.page[gvar.video.panp], 0, 0);
+		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1,1); }//p
+		//VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);
 		ZC_ShowMV(&mv, 0, 0);
 	}
 
@@ -203,8 +215,11 @@ void main(int argc, char *argv[])
 	Shutdown16(&gvar);
 	printf("Project 16 test.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
-	modexprintmeminfo(&gvar.video);
-	printf("tx=%d	", mv[gvar.video.panp].tx); printf("ty=%d	", mv[gvar.video.panp].ty); printf("player.d=%d\n", player[0].enti.d);
+	VL_PrintmodexmemInfo(&gvar.video);
+	printf("tx=%d	", mv[gvar.video.sp].tx); printf("ty=%d	", mv[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);
+	printf("\n====\n");
+	printf("0	paloffset=	%d\n", paloffset/3);
+	printf("====\n\n");
 	//IN_Shutdown();
 	//====modexPalBlack();
 	//====modexFadeOn(1, pal);