//debugswitches\r
boolean panswitch=0;//1\r
//extern boolean pageflipflop=1;\r
-boolean pagenorendermap = 1;\r
+extern boolean pagenorendermap;\r
unsigned int i;\r
//#ifdef FADE\r
static word paloffset=0;\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
// printf("chkmap ok ");\r
// fprintf(stderr, "yay map loaded~~\n");\r
#endif\r
#endif\r
//++++ PCXBMPVAR.offset=(paloffset/3);\r
-//++++ modexPalUpdate1(&PCXBMPVAR, &paloffset, 0, 0);\r
- modexPalUpdate1(&PCXBMP->palette);\r
-//++++0000 modexPalUpdate1(map.tiles->btdata->palette);\r
+//++++ modexPalUpdate(&PCXBMPVAR, &paloffset, 0, 0);\r
+ modexPalUpdate(&PCXBMP->palette);\r
+//++++0000 modexPalUpdate(map.tiles->btdata->palette);\r
//printf(" %d\n", sizeof(ptmp->data));\r
//printf("1: %d\n", paloffset);\r
//++++ map.tiles->data->offset=(paloffset/3);\r
//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
mapGoTo(&mv, 0, 0);\r
\r
- ZC_playerXYpos(0, 0, &player, &mv, 0);\r
+ ZC_playerXYpos(0, 0, &player, &mv, 0, 1);\r
EN_initplayer(&player, 0, &gvar.video);\r
- player[0].enti.spri->x = player[0].enti.x-4;\r
- player[0].enti.spri->y = player[0].enti.y-16;\r
+ if (gvar.video.sprifilei == -1)\r
+ {\r
+#ifdef FADE\r
+ modexFadeOff(4, gpal);\r
+#endif\r
+ Quit(&gvar, "Wrong");\r
+#ifdef FADE\r
+ modexFadeOn(4, dpal);\r
+#endif\r
+ }\r
\r
#ifndef SPRITE\r
modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);\r
modexClearRegion(mv[3].page, 0, 0, 20, 36, 15);\r
//IN_UserInput(1,1);\r
}\r
-#ifdef SPRITE\r
- if(IN_KeyDown(66)) //f8\r
- {\r
-// modexDrawSprite(mv[0].page, 16, 16, &p);\r
- modexDrawSprite(mv[0].page, 32+72, 16, (PCXBMPVAR));\r
- }\r
-#endif\r
+\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
\r
//9\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(dpal); IN_UserInput(1,1); }\r
#endif\r
if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
\r