#include "src/lib/16render.h"\r
#include "src/lib/16_dbg.h"\r
\r
-//bitmap_t p;\r
static map_t map;\r
map_view_t mv[4];\r
float t;\r
-sword bakapee;\r
+\r
//debugswitches\r
boolean panswitch=0,baka=0;\r
//extern boolean pageflipflop=1;\r
+boolean pagenorendermap = 1; //default: 0\r
unsigned int i;\r
\r
#ifdef FADE\r
byte *ptr;\r
memptr pal;\r
\r
-bitmap_t *ptmpdata;\r
+//bitmap_t *ptmpdata;\r
+\r
+#define FILENAME_1 "data/spri/chikyuu.vrs"\r
+#define FILENAME_1P "data/spri/chikyuu.pal"\r
+#define FILENAME_2 "data/spri/ptmp.vrs"\r
+#define FILENAME_2P "data/spri/ptmp.pal"\r
\r
void main(int argc, char *argv[])\r
{\r
static global_game_variables_t gvar;\r
static player_t player[MaxPlayers];\r
- if(argv[1]) bakapee = atoi(argv[1]);\r
- else bakapee = 1;\r
+ char *bakapee1,*bakapee1p;\r
+// sword bakapee;\r
+// if(argv[1]) bakapee = atoi(argv[1]);\r
+// else bakapee = 1;\r
\r
Startup16(&gvar);\r
\r
gvar.video.panp=0;\r
\r
+ bakapee1=malloc(64);\r
+ bakapee1p=malloc(64);\r
+\r
+ if (argc < 2) {\r
+ //fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
+ bakapee1 = FILENAME_2;\r
+ bakapee1p = FILENAME_2P;\r
+\r
+ }else{\r
+ if(argv[1]) bakapee1 = argv[1];\r
+ if(argv[2]) bakapee1p = argv[2];\r
+ }\r
+\r
// OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
//IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4\r
//player[0].ent = malloc(sizeof(entity_t));\r
// fprintf(stderr, "yay map loaded~~\n");\r
\r
// data\r
- read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].enti.spri->spritesheet);\r
- PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
+ read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);\r
\r
// input!\r
IN_Default(0, &player,ctrl_Keyboard1);\r
modexFadeOff(4, dpal);\r
#endif\r
\r
- VGAmodeX(bakapee, 1, &gvar);\r
+ VGAmodeX(1/*bakapee*/, 1, &gvar);\r
\r
/* fix up the palette and everything */\r
#ifdef FADE\r
modexPalBlack(); //reset the palette~\r
#endif\r
- modexPalUpdate1(&PCXBMP->palette);\r
-// CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);\r
+\r
+ /* load color palette */\r
+ VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
+// CA_LoadFile("data/spri/"BAKAPEEFILE1".pal", &pal, &gvar);\r
// modexPalUpdate1(pal);\r
#ifdef FADE\r
gpal = modexNewPal();\r
if(!panswitch){\r
//ZC_walk2(player[0].ent, mv);\r
ZC_walk(&mv, &player, 0);\r
+ }else{\r
+ PANKEYFUNZC;\r
+ //printf(" player[0].enti.q: %d", player[0].enti.q); printf(" player[0].d: %d\n", player[0].d);\r
}\r
\r
//the scripting stuff....\r
-/* if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))\r
+ //if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
+ if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
{\r
short i;\r
for(i=800; i>=400; i--)\r
}\r
nosound();\r
}\r
- if(player[0].enti.q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].enti.hp--; }\r
-*/ //debugging binds!\r
- if(IN_KeyDown(2)){ modexShowPage(mv[0].page); gvar.video.panp=0; }\r
- if(IN_KeyDown(25)){ modexpdump(mv[0].page);\r
- IN_UserInput(1,1);\r
- } //p\r
+ if(player[0].enti.q == (TILEWH/(player[0].enti.speed))+1 && player[0].info.dir != 2 && (player[0].enti.triggerx == 5 && player[0].enti.triggery == 5)){ player[0].enti.hp--; }\r
+ //debugging binds!\r
\r
if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u\r
\r
//pan switch\r
- //if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);} //f12\r
- if(IN_KeyDown(87)) //f11\r
- {\r
- pageflipflop=!pageflipflop;\r
- IN_UserInput(1,1);\r
- }\r
- if(IN_KeyDown(68)) //f10\r
- {\r
- gvar.kurokku.fpscap=!gvar.kurokku.fpscap;\r
- IN_UserInput(1,1);\r
- }\r
- if(IN_KeyDown(67)) //f9\r
- {\r
- modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 2);\r
- }\r
if(IN_KeyDown(66)) //f8\r
{\r
// modexDrawSprite(mv[0].page, 16, 16, &p);\r
break;\r
}\r
}\r
- FUNCTIONKEYFUNCTIONS;\r
+ FUNCTIONKEYFUNCTIONS\r
+ FUNCTIONKEYDRAWJUNK\r
if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }\r
- if(IN_KeyDown(sc_J)){ read_vrs(&gvar, "data/spri/ptmp.vrs", player[0].enti.spri->spritesheet); *ptmpdata = bitmapLoadPcx("data/ptmp.pcx", &gvar); modexPalUpdate1(ptmpdata->palette); }\r
- if(IN_KeyDown(sc_K)){ read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].enti.spri->spritesheet); PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); modexPalUpdate1(&PCXBMP->palette); }\r
-\r
- //9\r
+ if(IN_KeyDown(sc_J) || IN_KeyDown(sc_K))\r
+ {\r
+ if(IN_KeyDown(sc_J))\r
+ {\r
+ bakapee1=FILENAME_1;\r
+ bakapee1p=FILENAME_1P;\r
+ }\r
+ if(IN_KeyDown(sc_K))\r
+ {\r
+ bakapee1=FILENAME_2;\r
+ bakapee1p=FILENAME_2P;\r
+ }\r
+ read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);\r
+ VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
+ }//JK\r
#ifdef FADE\r
if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
#endif\r
projects / 16.git / blobdiff