//debugswitches\r
boolean panswitch=0,baka=0;\r
//extern boolean pageflipflop=1;\r
-boolean pagenorendermap = 0; //default: 0\r
+extern boolean pagenorendermap; //default: 0\r
unsigned int i;\r
\r
#ifdef FADE\r
//static word paloffset=0;\r
-byte *dpal;\r
#endif\r
-byte *gpal;\r
byte *ptr;\r
memptr pal;\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
- player[0].enti.spri = malloc(sizeof(struct sprite));\r
- player[0].enti.spri->spritesheet = malloc(sizeof(struct vrs_container));\r
+ //player[0].enti.spri = malloc(sizeof(struct sprite));\r
+ player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
\r
// create the map\r
// fprintf(stderr, "testing map load~ ");\r
- loadmap("data/test.map", &map);\r
+ CA_loadmap("data/test.map", &map, &gvar);\r
chkmap(&map, 0);\r
// initMap(&map);\r
// printf("chkmap ok ");\r
\r
// save the palette\r
#ifdef FADE\r
- dpal = modexNewPal();\r
- modexPalSave(dpal);\r
- modexFadeOff(4, dpal);\r
+ modexPalSave(&gvar.video.dpal);\r
+ modexFadeOff(4, &gvar.video.dpal);\r
+ modexPalBlack();\r
#endif\r
\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
-\r
/* load color palette */\r
+ /*ptmp.offset=(paloffset/3);\r
+ modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
+ //modexClearRegion(bg->page, 0, 0, 320, 240, 255);\r
+ //printf(" %d\n", sizeof(ptmp.data));\r
+ //printf("1: %d\n", paloffset);\r
+ map.tiles->data->offset=(paloffset/3);\r
+ modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
-// CA_LoadFile("data/spri/"BAKAPEEFILE1".pal", &pal, &gvar);\r
-// modexPalUpdate1(pal);\r
+ //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
+\r
#ifdef FADE\r
- gpal = modexNewPal();\r
- modexPalSave(gpal);\r
- modexSavePalFile("data/g.pal", gpal);\r
+ modexPalSave(&gvar.video.palette);\r
+ modexSavePalFile("data/g.pal", &gvar.video.palette);\r
modexPalBlack(); //so player will not see loadings~\r
#endif\r
\r
\r
ZC_playerXYpos(0, 0, &player, &mv, 0, 1);\r
EN_initplayer(&player, 0, &gvar.video);\r
+ //print_anim_ids(player[0].enti.spri);\r
if (gvar.video.sprifilei == -1)\r
{\r
#ifdef FADE\r
- modexFadeOff(4, gpal);\r
+ modexFadeOff(4, &gvar.video.palette);\r
#endif\r
- Quit(&gvar, "Wrong");\r
+ Quit(&gvar, "Wrong ID for sprite");\r
#ifdef FADE\r
- modexFadeOn(4, dpal);\r
+ modexFadeOn(4, &gvar.video.dpal);\r
#endif\r
}\r
\r
// while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
-// VL_ShowPage(mv[0].page, gvar.kurokku.fpscap, 0);\r
- ZC_ShowMV(&mv, gvar.kurokku.fpscap, 0);\r
+ gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
+ gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
+ shinku(&gvar);\r
+//modexpdump(mv[0].page);\r
#ifdef FADE\r
- modexFadeOn(4, gpal);\r
+ modexFadeOn(4, &gvar.video.palette);\r
#endif\r
while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
{\r
+ gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
+ gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
shinku(&gvar);\r
//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
\r
//the scripting stuff....\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
+ if(((mv[0].map->layerdata[0].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
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
+ if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
+ if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u\r
\r
FUNCTIONKEYFUNCTIONS\r
FUNCTIONKEYDRAWJUNK\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
+ if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1,1); }\r
#endif\r
if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
\r
/* fade back to text mode */\r
/* but 1st lets save the game palette~ */\r
#ifdef FADE\r
- modexPalSave(gpal);\r
- modexSavePalFile("data/g.pal", gpal);\r
- modexFadeOff(4, gpal);\r
+ modexPalSave(&gvar.video.palette);\r
+ modexSavePalFile("data/g.pal", &gvar.video.palette);\r
+ modexFadeOff(4, &gvar.video.palette);\r
#endif\r
Shutdown16(&gvar);\r
printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
SCROLLEXITMESG;\r
WCPU_cpufpumesg();\r
#ifdef FADE\r
- modexFadeOn(4, dpal);\r
+ modexFadeOn(4, gvar.video.dpal);\r
#endif\r
}\r
projects / 16.git / blobdiff