X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=0adf27512498889c1dcff970e4853d4852e38960;hb=f238018d45d05a57a7ba93381f14f9d1b108c745;hp=f9ef8382438af032ab68c04a1a0ced0b12d017c7;hpb=825e44f7e2255268fedd03109c29a35ff1243c16;p=16.git diff --git a/src/zcroll.c b/src/zcroll.c index f9ef8382..0adf2751 100755 --- a/src/zcroll.c +++ b/src/zcroll.c @@ -22,30 +22,19 @@ #include "src/lib/scroll16.h" #include "src/lib/16_timer.h" -#include "src/lib/wcpu/wcpu.h" #include "src/lib/16render.h" #include "src/lib/16_dbg.h" -#define MODEXZ -boolean dbg_noplayerinpu=0; - -//TODO: known issues the array dependent mv stuff and player arrays -global_game_variables_t gvar; +//bitmap_t p; static map_t map; -player_t player[MaxPlayers]; map_view_t mv[4]; float t; sword bakapee; -pan_t pan; //debugswitches boolean panswitch=0,baka=0; //extern boolean pageflipflop=1; unsigned int i; -const char *cpus; -//static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ -//map_view_db_t pgid[4]; -word pg; #ifdef FADE static word paloffset=0; byte *dpal; @@ -56,30 +45,33 @@ memptr pal; void main(int argc, char *argv[]) { + static global_game_variables_t gvar; + static player_t player[MaxPlayers]; if(argv[1]) bakapee = atoi(argv[1]); else bakapee = 1; Startup16(&gvar); - pan.pn=0; + gvar.video.panp=0; + // OK, this one takes hellova time and needs to be done in farmalloc or MM_... - //TODO: USE MM AND CA AND PM WWWWWWWW + //IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4 player[0].ent = malloc(sizeof(entity_t)); player[0].ent->spri = malloc(sizeof(struct sprite)); player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container)); // create the map - fprintf(stderr, "testing map load~ "); +// fprintf(stderr, "testing map load~ "); loadmap("data/test.map", &map); chkmap(&map, 0); - printf("chkmap ok "); - fprintf(stderr, "yay map loaded~~\n"); +// printf("chkmap ok "); +// fprintf(stderr, "yay map loaded~~\n"); // data read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet); + PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite - // input! -if(!dbg_noplayerinpu) + // input! IN_Default(0, &player,ctrl_Keyboard1); // save the palette @@ -88,13 +80,17 @@ if(!dbg_noplayerinpu) modexPalSave(dpal); modexFadeOff(4, dpal); #endif - textInit(); + VGAmodeX(bakapee, 1, &gvar); -#ifdef MODEXZ + + /* fix up the palette and everything */ #ifdef FADE modexPalBlack(); //reset the palette~ - CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar); - modexPalUpdate1(pal); +#endif + modexPalUpdate1(&PCXBMP->palette); +// CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar); +// modexPalUpdate1(pal); +#ifdef FADE gpal = modexNewPal(); modexPalSave(gpal); modexSavePalFile("data/g.pal", gpal); @@ -102,25 +98,15 @@ if(!dbg_noplayerinpu) #endif // setup camera and screen~ - strcpy(global_temp_status_text, "press a key for video setup"); - modexprint(mv[0].page, 0, 64, 1, 7, 0, global_temp_status_text); - modexHiganbanaPageSetup(&gvar.video); - mv[0].page = &gvar.video.page[0]; - mv[0].map = ↦ - mv[0].video = &gvar.video; - mv[0].pan = &pan; - player[0].ent->spri->x = player[0].ent->spri->y = 20; + ZC_MVSetup(&mv, &map, &gvar); + player[0].ent->spri->x = player[0].ent->spri->y = TILEWH; // set up paging //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen - mapGoTo(mv, 0, 0); -#endif + mapGoTo(&mv, 0, 0); - //TODO: put player in starting position of spot - //default player position on the viewable map - player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx; - player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny; + playerXYpos(0, 0, &player, &mv, 0); IN_initplayer(&player, 0); i = set_anim_by_id(player[0].ent->spri, 11); @@ -130,23 +116,21 @@ if(!dbg_noplayerinpu) #ifdef FADE modexFadeOff(4, gpal); #endif - VGAmodeX(0, 1, &gvar); - Shutdown16(&gvar); - printf("Wrong"); + Quit(&gvar, "Wrong"); #ifdef FADE modexFadeOn(4, dpal); #endif - exit(-4); } - //animate_spri(&(player[0].ent->spri)); + animate_spri((player[0].ent->spri), &gvar); - modexShowPage(mv[0].page);//!(gvar.video.p) - shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible. + VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p) #ifdef FADE modexFadeOn(4, gpal); #endif - if(!dbg_noplayerinpu) - while(!IN_KeyDown(sc_Escape))// && player[0].hp>0) + /*strcpy(global_temp_status_text, "press enter for the loop of zcroll\nescape to quit"); + modexprint(&gvar.video.page[0], 144, 72, 1, 7, 0, global_temp_status_text); + while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1);*///wwww + while(!IN_KeyDown(sc_Escape))// && player[0].enti.hp>0) { shinku(&gvar); //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square @@ -156,8 +140,8 @@ if(!dbg_noplayerinpu) //player movement IN_ReadControl(0, &player); if(!panswitch){ - ZC_walk(player[0].ent, mv); - //walk(mv, &player, 0); + //ZC_walk2(player[0].ent, mv); + ZC_walk(&mv, &player, 0); } //the scripting stuff.... @@ -170,22 +154,18 @@ if(!dbg_noplayerinpu) } nosound(); } - if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; } + 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--; } */ //debugging binds! - if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; } + if(IN_KeyDown(2)){ modexShowPage(mv[0].page); gvar.video.panp=0; } if(IN_KeyDown(25)){ modexpdump(mv[0].page); IN_UserInput(1,1); } //p -#ifdef FADE - if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); IN_UserInput(1,1); } - if(IN_KeyDown(22)){ - printf("2paloffset = %d\n", paloffset/3); - IN_UserInput(1,1); - } -#endif + + if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o + if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u //pan switch - if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);} //f12 + //if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);} //f12 if(IN_KeyDown(87)) //f11 { pageflipflop=!pageflipflop; @@ -202,31 +182,30 @@ if(!dbg_noplayerinpu) } if(IN_KeyDown(66)) //f8 { - // modexDrawSprite(mv[0].page, 16, 16, p); - modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data)); +// modexDrawSprite(mv[0].page, 16, 16, &p); +// modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data)); + switch(i) + { + case 11: + i=0; + player[0].ent->spri->x = 0; + default: + i++; + player[0].ent->spri->delay = 1; animate_spri((player[0].ent->spri), &gvar); player[0].ent->spri->x += 20; + break; + } } - //TODO fmemtest into page - /*if(IN_KeyDown(4+1)) //4 - { - pg=1; - SELECT_ALL_PLANES(); - _fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4); - }*/ + FUNCTIONKEYFUNCTIONS; //9 #ifdef FADE if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); } - //if(IN_KeyDown(11)){ modexPalOverscan(15); } #endif - if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break; //incase things go out of sync! - player[0].hp = 0; - } + if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r - else - while(!kbhit()) - { - shinku(&gvar); - } + if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break; //incase things go out of sync! + player[0].enti.hp = 0; + } /* fade back to text mode */ /* but 1st lets save the game palette~ */ @@ -239,39 +218,8 @@ if(!dbg_noplayerinpu) Shutdown16(&gvar); printf("\nProject 16 zcroll.exe. This is just a test file!\n"); printf("version %s\n", VERSION); - printf("tx: %d ", mv[0].tx); - printf("ty: %d\n", mv[0].ty); - printf("\n"); - printf("player vars:\n"); - printf(" x: %d", player[0].x); printf(" y: %d\n", player[0].y); - //if(player[0].hp==0) printf("%d wwww\n", player[0].y+8); - //else printf("\nplayer[0].y: %d\n", player[0].y); - printf(" tx: %d", player[0].tx); printf(" ty: %d\n", player[0].ty); - printf(" triggx: %d", player[0].triggerx); printf(" triggy: %d\n", player[0].triggery); - printf(" hp: %d", (player[0].hp)); printf(" q: %d", player[0].q); printf(" player.info.dir: %d", player[0].info.dir); printf(" player.d: %d ", player[0].d); - printf(" pdir=%d\n", player[0].pdir); - printf(" tile data value at player trigger position: %d\n\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]); - printf("Virtual Screen: %dx", gvar.video.page[0].width); printf("%d ", gvar.video.page[0].height); - printf("Screen: %dx", gvar.video.page[0].sw); printf("%d\n", gvar.video.page[0].sh); - printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw); printf("%d ", gvar.video.page[0].tilesh); - printf("tile resolution: %dx", gvar.video.page[0].tw); printf("%d\n", gvar.video.page[0].th); - printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx); printf("%d\n", gvar.video.page[0].tilemidposscreeny); - modexprintmeminfo(&gvar.video); - //printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf(" mv[%u].ty: %d ", pan.pn, mv[pan.pn].ty); - printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r); - printf("pageflipflop=%u\n", pageflipflop); - printf("\n"); - //printf("map.width=%d map.height=%d map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]); - - printf("\n"); - switch(detectcpu()) - { - case 0: cpus = "8086/8088 or 186/88"; break; - case 1: cpus = "286"; break; - case 2: cpus = "386 or newer"; break; - default: cpus = "internal error"; break; - } - printf("detected CPU type: %s\n", cpus); + SCROLLEXITMESG; + WCPU_cpufpumesg(); #ifdef FADE modexFadeOn(4, dpal); #endif