X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=92b26f2e78e6de979def5efae33635698f9ea6b9;hb=0cde1191c89610551608f41e5bcd58f6d37d267f;hp=1261b7bed93c661b39c8a93cad45001cfdeae8d6;hpb=0b144a0907c57f35e5d7ce1f1293afa802bb65cc;p=16.git diff --git a/src/scroll.c b/src/scroll.c index 1261b7be..92b26f2e 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -21,85 +21,87 @@ */ #include "src/lib/scroll16.h" -//#include "src/lib/mapread.h" +#include "src/lib/timer.h" #include "src/lib/wcpu/wcpu.h" //#define FADE -//#define SPRITE +#define MODEX //this is for mode x initiating //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ -void main() +global_game_variables_t gvar; +static map_t map; +player_t player[MaxPlayers]; +//page_t screen, gvar.video.page[1], gvar.video.page[2]; +map_view_t mv[3]; +map_view_t *bg, *spri, *mask;//, *tmp; +planar_buf_t *p; +float t; +sword bakapee; + +void main(int argc, char *argv[]) { // word panswitch=0, panq=1, pand=0; - global_game_variables_t gvar; word panpagenum=0; //for panning! - int i; - static word paloffset=0; - planar_buf_t *p; + unsigned int i; + //static word paloffset=0; const char *cpus; //static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ - page_t screen, screen2, screen3; - static map_t map; - map_view_t mv[3]; - map_view_t *bg, *spri, *mask;//, *tmp; + //map_view_db_t pgid[4]; + word pg; #ifdef FADE byte *dpal, *gpal; #endif byte *ptr; byte *mappalptr; byte *mesg=malloc(sizeof(dword)); - player_t player[MaxPlayers]; + + + if(argv[1]) bakapee = atoi(argv[1]); + else bakapee = 1; player[0].persist_aniframe=0; player[0].speed=4; - //0000printf("starting timer\n"); -//++++ + + printf("starting timer\n"); start_timer(&gvar); -//++++ gvar.frames_per_second = 60; -//0000 printf("ok\n"); + printf("ok\n"); //extern struct inconfig inpu; // atexit(qclean()); /* create the map */ - //0000printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); -//0000 printf("Total free @ before map load: %zu\n", GetFreeSize()); -//0000 printf("Total near free @ before map load: %zu\n", GetNearFreeSize()); -//0000 printf("Total far free @ before map load: %zu\n", GetFarFreeSize()); -// getch(); -//0000 fprintf(stderr, "testing~\n"); -//++++ loadmap("data/test.map", &map); - map.width=0; - map.height=0; - chkmap(&map, 1); -// printf("chkmap ok\n"); -//0000 fprintf(stderr, "yay map loaded~~\n"); + fprintf(stderr, "testing map load~\n"); + loadmap("data/test.map", &map); +//0000 map.width=0; +//0000 map.height=0; + chkmap(&map, 0); + printf("chkmap ok\n"); + fprintf(stderr, "yay map loaded~~\n"); mv[0].map = ↦ mv[1].map = ↦ mv[2].map = ↦ /* draw the tiles */ +#ifdef MODEX ptr = map.data; mappalptr = map.tiles->data->palette; + /* data */ -//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); player[0].data = bitmapLoadPcx("data/ptmp.pcx"); // load sprite //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite /* create the planar buffer */ -//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); p = planar_buf_from_bitmap(&player[0].data); //0000 printf("planar buffer ok\n"); -//0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); - +#endif /* input! */ -//0000 getch(); IN_Startup(); IN_Default(0,&player,ctrl_Joystick); /* save the palette */ +#ifdef MODEX #ifdef FADE dpal = modexNewPal(); modexPalSave(dpal); @@ -107,10 +109,12 @@ void main() #endif textInit(); - VGAmodeX(1, &gvar); + VGAmodeX(bakapee, &gvar); + printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh); #ifdef FADE modexPalBlack(); //reset the palette~ #endif +#endif // printf("Total used @ before palette initiation: %zu\n", oldfreemem-GetFreeSize()); //++++ player[0].data.offset=(paloffset/3); //++++ modexPalUpdate(&player[0].data, &paloffset, 0, 0); @@ -121,23 +125,25 @@ void main() // printf("\n====\n"); // printf("0 paloffset= %d\n", paloffset/3); // printf("====\n\n"); +#ifdef MODEX #ifdef FADE gpal = modexNewPal(); modexPalSave(gpal); modexSavePalFile("data/g.pal", gpal); modexPalBlack(); //so player will not see loadings~ +#endif #endif /* setup camera and screen~ */ - screen = modexDefaultPage(); - screen.width += (TILEWH*2); - screen.height += (TILEWH*2);//+QUADWH; - mv[0].page = &screen; - screen2 = modexNextPage(mv[0].page); - mv[1].page = &screen2; - screen3 = modexNextPage0(mv[1].page, 320, 240); //(352*176)+1024 is the remaining amount of memory left wwww - //screen3 = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww - mv[2].page = &screen3; + gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]); + gvar.video.page[0].width += (TILEWH*2); + gvar.video.page[0].height += (TILEWH*2);//+QUADWH; + mv[0].page = &gvar.video.page[0]; + gvar.video.page[1] = modexNextPage(mv[0].page); + mv[1].page = &gvar.video.page[1]; + gvar.video.page[2] = modexNextPageFlexibleSize(mv[1].page, gvar.video.page[0].sw, gvar.video.page[0].sh); //(352*176)+1024 is the remaining amount of memory left wwww + //gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww + mv[2].page = &gvar.video.page[2]; /* set up paging */ bg = &mv[0]; @@ -151,8 +157,8 @@ void main() //TODO: put player in starting position of spot //default player position on the viewable map - player[0].tx = bg->tx + 10; - player[0].ty = bg->ty + 8; + player[0].tx = bg->tx + bg->page->tilemidposscreenx; + player[0].ty = bg->ty + bg->page->tilemidposscreeny; player[0].x = player[0].tx*TILEWH; player[0].y = player[0].ty*TILEWH; player[0].triggerx = player[0].tx; @@ -175,23 +181,27 @@ void main() npc0.q=1; npc0.d=0; modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/ + modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height); #ifdef SPRITE +#ifdef BMPTYPE + oldDrawBmp(VGA, player[0].x-4, player[0].y-TILEWH, &player[0].data, 1); +#else modexDrawSpriteRegion(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data); +#endif #else modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15); #endif modexShowPage(spri->page); -// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize()); modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1); +#ifdef MODEX #ifdef FADE modexFadeOn(4, gpal); +#endif #endif while(!IN_KeyDown(sc_Escape) && player[0].hp>0) { - sprintf(mesg, "%lu", gvar.tiku); -//++++ modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg); - shinku(mv[1].page, &gvar); + shinku(mv, &gvar); IN_ReadControl(0,&player); //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction @@ -332,6 +342,7 @@ void main() if(IN_KeyDown(3)){ modexShowPage(spri->page); panpagenum=1; } if(IN_KeyDown(4)){ modexShowPage(mask->page); panpagenum=2; } if(IN_KeyDown(25)){ pdump(bg->page); pdump(spri->page); } //p +#ifdef MODEX #ifdef FADE if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg->page); pdump(spri->page); } if(IN_KeyDown(22)){ @@ -340,6 +351,7 @@ void main() modexPalUpdate(map.tiles->data, &paloffset, 0, 0); printf("2paloffset = %d\n", paloffset/3); pdump(bg->page); pdump(spri->page); } +#endif #endif //pan switch //if(IN_KeyDown(88)){if(!panswitch) panswitch++; else panswitch--; } //f12 @@ -354,20 +366,40 @@ void main() int 21h } } + if(IN_KeyDown(88)) //s + { + switch(gvar.kurokku.fpscap) + { + case 0: + gvar.kurokku.fpscap=1; + break; + case 1: + gvar.kurokku.fpscap=0; + break; + } + IN_Ack(); + } + //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); + } if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break; //incase things go out of sync! - - gvar.tiku++; } /* fade back to text mode */ /* but 1st lets save the game palette~ */ +#ifdef MODEX #ifdef FADE modexPalSave(gpal); modexSavePalFile("data/g.pal", gpal); modexFadeOff(4, gpal); #endif VGAmodeX(0, &gvar); +#endif IN_Shutdown(); printf("Project 16 scroll.exe. This is just a test file!\n"); printf("version %s\n", VERSION); @@ -385,8 +417,11 @@ void main() //++++ printf("Total free: %zu\n", GetFreeSize()); //not used now printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n"); //not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n"); -// printf("Screen: %dx", screen.width); printf("%d\n", screen.height); -// printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height); + printf("Virtual Screen: %dx", gvar.video.page[0].width); printf("%d\n", gvar.video.page[0].height); + printf("Screen: %dx", gvar.video.page[0].sw); printf("%d\n", gvar.video.page[0].sh); + printf("tile resolution: %dx", gvar.video.page[0].tilesh); printf("%d\n", gvar.video.page[0].tilesh); + printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx); printf("%d\n", gvar.video.page[0].tilemidposscreeny); +// printf("Screen2: %dx", gvar.video.page[1].width); printf("%d\n", gvar.video.page[1].height); // printf("map: %dx%d\n", map.width, map.height); // printf("\n"); // printf("player[0].info.x: %d", player[0].info.xaxis); printf(" player[0].info.y: %d\n", player[0].info.yaxis); @@ -401,7 +436,9 @@ void main() default: cpus = "internal error"; break; } printf("detected CPU type: %s\n", cpus); +#ifdef MODEX #ifdef FADE modexFadeOn(4, dpal); #endif +#endif }