X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=2885dc4666e8bbeee42f55a2d9ff128d7fd75b15;hb=610f077e5822d18bef7bc9ee4f2b7b90a116bc17;hp=839915fca95c245e818eb6384a30b9f67841ee24;hpb=0a79071b241fd133918bf178f5bd322368e4957c;p=16.git

diff --git a/src/test.c b/src/test.c
index 839915fc..2885dc46 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,6 +33,7 @@ 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];
 
@@ -41,7 +43,12 @@ 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;
 
@@ -76,7 +83,6 @@ void main(int argc, char *argv[])
 	Startup16(&gvar);
 
 	/* save the palette */
-	//====pal  = modexNewPal();
 	//====modexPalSave(pal);
 	//====modexFadeOff(1, pal);
 	//====modexPalBlack();
@@ -86,9 +92,17 @@ void main(int argc, char *argv[])
 	EN_initplayer(&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 */
@@ -111,13 +125,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 */
@@ -182,7 +196,7 @@ void main(int argc, char *argv[])
 			for(i=0;i<3;i++)
 			{
 				pal2[i] = rand()%64;
-				modexPalUpdate1(pal2);
+				modexPalUpdate(pal2);
 				colo++;
 				if(colo>HGQ) colo=LGQ;
 			}
@@ -204,6 +218,9 @@ void main(int argc, char *argv[])
 	printf("version %s\n", VERSION);
 	VL_PrintmodexmemInfo(&gvar.video);
 	printf("tx=%d	", mv[gvar.video.sp].tx); printf("ty=%d	", mv[gvar.video.sp].ty); printf("player.d=%d\n", player[0].enti.d);
+	printf("\n====\n");
+	printf("0	paloffset=	%d\n", paloffset/3);
+	printf("====\n\n");
 	//IN_Shutdown();
 	//====modexPalBlack();
 	//====modexFadeOn(1, pal);