X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F0.c;h=fff125c455c9ac92d25f6a57cd0a58be1cc57097;hb=99ff9b1e8a8ef76386572f4576aa04f2e60b9010;hp=96d8e7aa0553f5f0061cfd473c3af4fdcb463537;hpb=af2715fef8681d909afe82f7baaf5e13baabb76f;p=16.git

diff --git a/src/0.c b/src/0.c
index 96d8e7aa..fff125c4 100755
--- a/src/0.c
+++ b/src/0.c
@@ -46,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);
@@ -92,7 +97,7 @@ 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);
@@ -138,18 +143,18 @@ 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(&gvar.player[0], &gvar);
-			if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10
+			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, &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;
 				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);
@@ -307,8 +312,7 @@ 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;