X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=23307d63ff47179e057430db08d018e347d96f51;hb=54129e6005814d4ee140040cce7ae35b6350f599;hp=af5c48f429cf839e2ea40fb16b61a63861e4a5be;hpb=b154546fbe0e686932cf700482f994ad123268a1;p=16.git diff --git a/src/scroll.c b/src/scroll.c index af5c48f4..23307d63 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -32,30 +32,36 @@ global_game_variables_t gvar; static map_t map; player_t player[MaxPlayers]; -page_t screen, screen2, screen3; +//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; +bitmap_t p; float t; +sword bakapee; -void main() +void main(int argc, char *argv[]) { // word panswitch=0, panq=1, pand=0; word panpagenum=0; //for panning! 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 */ //map_view_db_t pgid[4]; word pg; -#ifdef FADE - byte *dpal, *gpal; -#endif +//#ifdef FADE + static word paloffset=0; + byte *dpal, *default_pal; +//#endif + byte *gpal; byte *ptr; byte *mappalptr; byte *mesg=malloc(sizeof(dword)); + + if(argv[1]) bakapee = atoi(argv[1]); + else bakapee = 1; + player[0].persist_aniframe=0; player[0].speed=4; @@ -81,14 +87,14 @@ void main() /* draw the tiles */ #ifdef MODEX ptr = map.data; - mappalptr = map.tiles->data->palette; + mappalptr = map.tiles->btdata->palette; /* data */ - player[0].data = bitmapLoadPcx("data/ptmp.pcx"); // load sprite + p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite /* create the planar buffer */ - p = planar_buf_from_bitmap(&player[0].data); + (player[0].data) = *planar_buf_from_bitmap(&p); //0000 printf("planar buffer ok\n"); #endif /* input! */ @@ -99,19 +105,23 @@ void main() #ifdef MODEX #ifdef FADE dpal = modexNewPal(); + default_pal = modexNewPal(); + *default_pal = *dpal; modexPalSave(dpal); modexFadeOff(4, dpal); #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); +//++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0); + modexPalUpdate1(p.palette); //printf(" %d\n", sizeof(ptmp->data)); //printf("1: %d\n", paloffset); //++++ map.tiles->data->offset=(paloffset/3); @@ -129,15 +139,15 @@ void main() #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 = modexNextPageFlexibleSize(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 +161,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,14 +185,11 @@ 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); +#else + modexDrawSpritePBufRegion(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data); #endif modexShowPage(spri->page); @@ -380,6 +387,9 @@ void main() _fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4); } + //9 + if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); } + //if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); } if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break; //incase things go out of sync! } @@ -410,8 +420,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);