\r
#define INITTNUM 1\r
\r
+map_view_t mv[4];\r
map_t map;//junk var\r
\r
int main(int argc,char **argv)\r
unsigned int bufsz;\r
int fd;\r
//nibble i;\r
- char *bakapee1,*bakapee2;\r
+ //char *bakapee1,*bakapee2;\r
+ char bakapee1[64] = FILENAME_1;\r
+ char bakapee2[64] = FILENAME_2;\r
\r
boolean anim=1,noanim=0,zerostoppause=1;\r
\r
- bakapee1=malloc(64);\r
- bakapee2=malloc(64);\r
+// bakapee1=mALLoc(64);\r
+// bakapee2=mALLoc(64);\r
\r
- if (argc < 2) {\r
+ if (argc >= 2) {\r
+/* if (argc < 2) {\r
//fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
bakapee1 = FILENAME_1;//"data/aconita.vrl";\r
bakapee2 = FILENAME_2;//"data/aconita.pal";\r
\r
}else{\r
if(argv[1]) bakapee1 = argv[1];\r
- if(argv[2]) bakapee2 = argv[2];\r
+ if(argv[2]) bakapee2 = argv[2];*/\r
+ if(argv[1]){ strcpy(bakapee1, argv[1]);//bakapee1[] = *argv[1];\r
+ if(argv[2]) strcpy(bakapee2, argv[2]); }//bakapee2[] = argv[2]; }\r
}\r
\r
fd = open(bakapee1,O_RDONLY|O_BINARY);\r
return 1;\r
}\r
VGAmodeX(1, 1, &gvar);\r
- modexPalUpdate0(gvar.video.palette);\r
+ VL_modexPalScramble(gvar.video.palette);\r
\r
/* load color palette */\r
- VL_LoadPalFile(bakapee2, &gvar.video.palette);\r
+ VL_LoadPalFile(bakapee2, &gvar.video.palette, &gvar);\r
\r
/* preprocess the sprite to generate line offsets */\r
vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
if (vrl_lineoffs == NULL) return 1;\r
\r
- IN_Startup();\r
- IN_Default(0,&gvar.player[0],ctrl_Keyboard1);\r
+ IN_Startup(&gvar);\r
+ IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
EN_initPlayer(&gvar.player[0], &gvar.video);\r
\r
/* setup camera and screen~ */\r
- modexHiganbanaPageSetup(&gvar.video);\r
+ modexHiganbanaPageSetup(&gvar);\r
ZC_MVSetup(&gvar.mv, &map, &gvar);\r
ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);\r
\r
/* do it */\r
omemptr = vga_state.vga_graphics_ram; // save original mem ptr\r
\r
- while(!IN_KeyDown(sc_Escape))\r
+ while(!gvar.in.inst->Keyboard[sc_Escape])\r
{\r
- IN_ReadControl(&gvar.player[0]);\r
- if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1); } //f10\r
+ IN_ReadControl(&gvar.player[0], &gvar);\r
+ if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10\r
TAIL_PANKEYFUN;\r
- if(IN_KeyDown(sc_Space) || zerostoppause) //space\r
+ if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause) //space\r
{\r
anim=!anim;\r
DRAWCORNERBOXES;\r
- if(!zerostoppause) IN_UserInput(1); else zerostoppause=0;\r
+ if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;\r
}\r
- if(IN_KeyDown(sc_R)){\r
+ if(gvar.in.inst->Keyboard[sc_R]){\r
gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;\r
gvar.mv[0].tx = gvar.mv[0].ty = gvar.mv[1].tx = gvar.mv[1].ty = INITTNUM;\r
VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);\r
}\r
}\r
\r
- IN_UserInput(1);\r
+ IN_UserInput(1, &gvar);\r
\r
//===========================================================================//\r
\r
}\r
}\r
}\r
- IN_Shutdown();\r
+ IN_Shutdown(&gvar);\r
VGAmodeX(0, 1, &gvar);\r
free(vrl_lineoffs);\r
buffer = NULL;\r
free(buffer);\r
bufsz = 0;\r
- free(bakapee1);\r
- free(bakapee2);\r
+// free(bakapee1); free(bakapee2);\r
printf("\nProject 16 0.exe. This is just a test file!\n");\r
printf("version %s\n", VERSION);\r
//SCROLLEXITMESG;\r