X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F0.c;h=b909273f88d9376857d75ab9a1e0f549d75c09e6;hb=340e87b918384afcde08592db5c24fc49ebf0694;hp=69d2c1052b419442a22a9b54450304240ecb64d7;hpb=1d92218e4a5b416429a6c5be3104bf66e4d52f3a;p=16.git

diff --git a/src/0.c b/src/0.c
index 69d2c105..b909273f 100755
--- a/src/0.c
+++ b/src/0.c
@@ -10,13 +10,11 @@
 #define FILENAME_1 "data/spri/chikyuu.vrl"
 #define FILENAME_2 "data/spri/chikyuu.pal"
 
-#define PATTERN
 #define INITTNUM 1
 
-static unsigned char palette[768];
+static byte palette[768];
 player_t player[MaxPlayers];
 map_view_t mv[4];
-pan_t pan;
 
 map_t map;//junk var
 
@@ -33,7 +31,7 @@ int main(int argc,char **argv)
 
 	boolean anim=1,noanim=0;
 
-	pan.pn=0;
+	gvar.video.panp=0;
 
 	bakapee1=malloc(64);
 	bakapee2=malloc(1024);
@@ -81,16 +79,7 @@ int main(int argc,char **argv)
 	modexPalUpdate0(palette);
 
 	/* load color palette */
-	fd = open(bakapee2,O_RDONLY|O_BINARY);
-	if (fd >= 0) {
-		unsigned int i;
-
-		read(fd,palette,768);
-		close(fd);
-
-		vga_palette_lseek(0);
-		for (i=0;i < 256;i++) vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);
-	}
+	VL_LoadPalFile(bakapee2, &palette);
 
 	/* preprocess the sprite to generate line offsets */
 	vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
@@ -98,41 +87,13 @@ int main(int argc,char **argv)
 
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Keyboard1);
-	IN_initplayer(&player, 0);
+	EN_initplayer(&player, 0);
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	modexMVSetup(&mv, &map, &pan, &gvar);
-	modexShowPage(&(gvar.video.page[pan.pn]));
-// 	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[0].tx	= INITTNUM;
-// 		mv[0].ty	= INITTNUM;
-// 	}
-	//player[0].tx = INITTNUM; player[0].ty = INITTNUM;
-	//mapinitmapview(mv, player[0].tx, player[0].tx);
-
-
-	#define VMEMHEIGHT gvar.video.page[0].height+gvar.video.page[1].height
-
-	//4	this draws that pattern on the screen
-#ifdef PATTERN
-	{
-		unsigned int i,j,o;
-		/* fill screen with a distinctive pattern */
-		for (i=0;i < gvar.video.page[0].width;i++) {
-			o = i >> 2;
-			vga_write_sequencer(0x02/*map mask*/,1 << (i&3));
-			for (j=0;j < VMEMHEIGHT;j++,o += gvar.video.page[0].stridew)
-				vga_state.vga_graphics_ram[o] = (i^j)&15; // VRL samples put all colors in first 15!
-		}
-	}
-#else
-	TESTBG;
-#endif
+	ZC_MVSetup(&mv, &map, &gvar);
+	//VL_ShowPage(&(gvar.video.page[gvar.video.panp]), 0, 0);
+	ZC_ShowMV(&mv, 0, 0);
 
 	//DRAWCORNERBOXES;
 
@@ -147,18 +108,15 @@ int main(int argc,char **argv)
 		VGA_RAM_PTR omemptr;
 		int xdir=1,ydir=1;
 
-#ifdef PATTERN
 		int j;
 		/* fill pattern offset with a distinctive pattern */
 		for (i=0;i < gvar.video.page[0].width;i++) {
-			o = (i >> 2) + (0x10000UL - (uint16_t)gvar.video.page[1].data);
+			o = (i >> 2) + (0x10000UL - (uint16_t)gvar.video.page[0].data);
 			vga_write_sequencer(0x02/*map mask*/,1 << (i&3));
-			for (j=0;j < VMEMHEIGHT;j++,o += gvar.video.page[0].stridew)
+			for (j=0;j < gvar.video.page[0].height;j++,o += gvar.video.page[0].stridew)
 				vga_state.vga_graphics_ram[o] = (i^j)&15; // VRL samples put all colors in first 15!
 		}
-#else
-	TESTBG;
-#endif
+		TESTBG;
 		//DRAWCORNERBOXES;
 
 		/* starting coords. note: this technique is limited to x coordinates of multiple of 4 */
@@ -172,7 +130,7 @@ int main(int argc,char **argv)
 		{
 			IN_ReadControl(0,&player);
 			if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1,1); } //f10
-			PANKEY0EXE;
+			PANKEYFUN;
 			if(IN_KeyDown(sc_Space))	//space
 			{
 				anim=!anim;
@@ -182,8 +140,8 @@ int main(int argc,char **argv)
 			if(IN_KeyDown(sc_R)){
 				gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;
 				mv[0].tx = mv[0].ty = mv[1].tx = mv[1].ty = INITTNUM;
-				modexShowPage(&(gvar.video.page[pan.pn]));
-				player[0].q = 1; player[0].d = 2;
+				modexShowPage(&(gvar.video.page[gvar.video.panp]));
+				player[0].enti.q = 1; player[0].enti.d = 2;
 				x=y=0;
 				xdir=ydir=1;
 				//TESTBG;
@@ -218,6 +176,7 @@ int main(int argc,char **argv)
 
 				/* then the sprite. note modding ram ptr means we just draw to (x&3,0) */
 draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
+//printf("x=%d	y=%d	rx=%d	ry=%d\n", x, y, rx, ry);
 
 				/* restore ptr */
 				vga_state.vga_graphics_ram = omemptr;
@@ -246,15 +205,10 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 
 	IN_UserInput(1,1);
 
-// 	while(!IN_KeyDown(sc_Escape))
-// 	{
-// 		IN_ReadControl(0,&player);
-// 		PANKEY0EXE;
-// 	}
-
 //===========================================================================//
 
-	modexShowPage(&(gvar.video.page[0]));
+	//modexShowPage(&(gvar.video.page[0]));
+	ZC_ShowMV(&mv, 0, 0);
 if(!noanim) {
 	/* another handy "demo" effect using VGA write mode 1.
 	 * we can take what's on screen and vertically squash it like an old analog TV set turning off. */
@@ -348,7 +302,8 @@ if(!noanim) {
 	free(bakapee2);
 	printf("\nProject 16 0.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
-	//printf("mv 0\n	tx=%d	ty=%d\n\n", mv[0].tx, mv[0].tx);
-	//printf("mv 1\n	tx=%d	ty=%d\n", mv[1].tx, mv[1].tx);
+	//SCROLLEXITMESG;
+	printf("mv 0\n- tx=%d	ty=%d	dx=%d	dy=%d\n", mv[0].tx, mv[0].ty, gvar.video.page[0].dx, gvar.video.page[0].dy);
+	printf("mv 1\n- tx=%d	ty=%d	dx=%d	dy=%d\n", mv[1].tx, mv[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);
 	return 0;
 }