X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2F0.c;h=fb3d0fc908ebf8c2f972324c5fc6aefbe603ed68;hb=8402804d56a98a48de98aba30941670f6ac6c5a3;hp=d3c6ba505ad3ad73d3c94a135090e8ea65672cd2;hpb=cbd1a853acf0cd2feb3cf359b98d80694dec7ca9;p=16.git

diff --git a/src/0.c b/src/0.c
index d3c6ba50..fb3d0fc9 100755
--- a/src/0.c
+++ b/src/0.c
@@ -35,7 +35,6 @@
 #define INITTNUM 1
 
 map_view_t mv[4];
-
 map_t map;//junk var
 
 int main(int argc,char **argv)
@@ -47,21 +46,26 @@ int main(int argc,char **argv)
 	unsigned int bufsz;
 	int fd;
 	//nibble i;
-	char *bakapee1,*bakapee2;
+	//char *bakapee1,*bakapee2;
+	char bakapee1[64] = FILENAME_1;
+	char bakapee2[64] = FILENAME_2;
 
 	boolean anim=1,noanim=0,zerostoppause=1;
 
-	bakapee1=malloc(64);
-	bakapee2=malloc(64);
+//	bakapee1=mALLoc(64);
+//	bakapee2=mALLoc(64);
 
-	if (argc < 2) {
+	if (argc >= 2) {
+/*	if (argc < 2) {
 		//fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");
 		bakapee1 = FILENAME_1;//"data/aconita.vrl";
 		bakapee2 = FILENAME_2;//"data/aconita.pal";
 
 	}else{
 		if(argv[1]) bakapee1 = argv[1];
-		if(argv[2]) bakapee2 = argv[2];
+		if(argv[2]) bakapee2 = argv[2];*/
+		if(argv[1]){ strcpy(bakapee1, argv[1]);//bakapee1[] = *argv[1];
+		if(argv[2]) strcpy(bakapee2, argv[2]); }//bakapee2[] = argv[2]; }
 	}
 
 	fd = open(bakapee1,O_RDONLY|O_BINARY);
@@ -93,23 +97,23 @@ int main(int argc,char **argv)
 		return 1;
 	}
 	VGAmodeX(1, 1, &gvar);
-	modexPalUpdate0(gvar.video.palette);
+	VL_modexPalScramble(gvar.video.palette);
 
 	/* load color palette */
-	VL_LoadPalFile(bakapee2, &gvar.video.palette);
+	VL_LoadPalFile(bakapee2, &gvar.video.palette, &gvar);
 
 	/* preprocess the sprite to generate line offsets */
 	vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
 	if (vrl_lineoffs == NULL) return 1;
 
 	IN_Startup(&gvar);
-	IN_Default(0,&gvar.player,ctrl_Keyboard1);
-	EN_initPlayer(&gvar.player, 0, &gvar.video);
+	IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);
+	EN_initPlayer(&gvar.player[0], &gvar.video);
 
 	/* setup camera and screen~ */
-	modexHiganbanaPageSetup(&gvar.video);
-	ZC_MVSetup(&mv, &map, &gvar);
-	ZC_ShowMV(&mv, gvar.video.sp, 0);
+	modexHiganbanaPageSetup(&gvar);
+	ZC_MVSetup(&gvar.mv, &map, &gvar);
+	ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);
 
 //	VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);
 	VL_PatternDraw(&gvar.video, 0/*gvar.video.sp*/, 0, 1);
@@ -139,20 +143,20 @@ int main(int argc,char **argv)
 		/* do it */
 		omemptr = vga_state.vga_graphics_ram; // save original mem ptr
 
-		while(!IN_KeyDown(sc_Escape))
+		while(!gvar.in.inst->Keyboard[sc_Escape])
 		{
-			IN_ReadControl(0,&gvar.player);
-			if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1,1); } //f10
+			IN_ReadControl(&gvar.player[0], &gvar);
+			if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10
 			TAIL_PANKEYFUN;
-			if(IN_KeyDown(sc_Space) || zerostoppause)	//space
+			if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause)	//space
 			{
 				anim=!anim;
 				DRAWCORNERBOXES;
-				if(!zerostoppause) IN_UserInput(1,1); else zerostoppause=0;
+				if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;
 			}
-			if(IN_KeyDown(sc_R)){
+			if(gvar.in.inst->Keyboard[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;
+				gvar.mv[0].tx = gvar.mv[0].ty = gvar.mv[1].tx = gvar.mv[1].ty = INITTNUM;
 				VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);
 				gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2;
 				x=y=0;
@@ -214,11 +218,11 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 		}
 	}
 
-	IN_UserInput(1,1);
+	IN_UserInput(1, &gvar);
 
 //===========================================================================//
 
-	ZC_ShowMV(&mv, 0, 0);
+	ZC_ShowMV(&gvar.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. */
@@ -308,12 +312,11 @@ if(!noanim) {
 	buffer = NULL;
 	free(buffer);
 	bufsz = 0;
-	free(bakapee1);
-	free(bakapee2);
+//	free(bakapee1); free(bakapee2);
 	printf("\nProject 16 0.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	//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);
+	printf("mv 0\n- tx=%d	ty=%d	dx=%d	dy=%d\n", gvar.mv[0].tx, gvar.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", gvar.mv[1].tx, gvar.mv[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);
 	return 0;
 }