unsigned int i;\r
//#ifdef FADE\r
static word paloffset=0;\r
- byte *dpal;\r
+ byte *gvar.video.dpal;\r
//#endif\r
- byte *gpal;\r
// byte *ptr;\r
byte *mappalptr;\r
\r
/* save the palette */\r
#ifdef MODEX\r
#ifdef FADE\r
- dpal = modexNewPal();\r
- modexPalSave(dpal);\r
- modexFadeOff(4, dpal);\r
+ gvar.video.dpal = modexNewPal();\r
+ modexPalSave(gvar.video.dpal);\r
+ modexFadeOff(4, gvar.video.dpal);\r
#endif\r
\r
VGAmodeX(bakapee, 1, &gvar);\r
// printf("====\n\n");\r
#ifdef MODEX\r
#ifdef FADE\r
- gpal = modexNewPal();\r
- modexPalSave(gpal);\r
- modexSavePalFile("data/g.pal", gpal);\r
+ &gvar.video.palette = modexNewPal();\r
+ modexPalSave(&gvar.video.palette);\r
+ modexSavePalFile("data/g.pal", &gvar.video.palette);\r
modexPalBlack(); //so player will not see loadings~\r
#endif\r
#endif\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
#ifdef FADE\r
- modexFadeOn(4, dpal);\r
+ modexFadeOn(4, gvar.video.dpal);\r
#endif\r
}\r
\r
\r
#ifdef MODEX\r
#ifdef FADE\r
- modexFadeOn(4, gpal);\r
+ modexFadeOn(4, &gvar.video.palette);\r
#endif\r
#endif\r
while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\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
//debugging binds!\r
#ifdef MODEX\r
#ifdef FADE\r
- if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); IN_UserInput(1,1); } //p\r
+ if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); IN_UserInput(1,1); } //p\r
/*if(IN_KeyDown(22)){\r
paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);\r
printf("1paloffset = %d\n", paloffset/3);\r
\r
//9\r
#ifdef FADE\r
- if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(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
/* but 1st lets save the game palette~ */\r
#ifdef MODEX\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
VGAmodeX(0, 1, &gvar);\r
#endif\r
WCPU_cpufpumesg();\r
#ifdef MODEX\r
#ifdef FADE\r
- modexFadeOn(4, dpal);\r
+ modexFadeOn(4, gvar.video.dpal);\r
#endif\r
#endif\r
}\r