X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=fa6df24b88708ad4bcb7a34ed1a4b088041472f5;hb=eae4d66409e20e893ac6c407a908c08daafaf098;hp=e6eda6fabfd568ab3b7ae298e98a03a193dc6b47;hpb=6925ca09eb13977c9d45441c47dac8ebf1de8330;p=16.git diff --git a/src/scroll.c b/src/scroll.c index e6eda6fa..fa6df24b 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -33,14 +33,16 @@ 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 mv[4]; bitmap_t p; -word pn=0; +//word pn=0; //i forgot ww static planar_buf_t huge *pp; float t; sword bakapee; pan_t pan; -boolean panswitch=1; +//debugswitches +boolean panswitch=0; +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 */ @@ -83,12 +85,20 @@ void main(int argc, char *argv[]) return; } + if (_DEBUG_INIT() == 0) { +#ifdef DEBUGSERIAL + printf("WARNING: Failed to initialize DEBUG output\n"); +#endif + } + _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log + _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U); + pan.pn=1; //player[0].data = &pp; - printf("starting timer "); + //printf("starting timer "); start_timer(&gvar); - printf("ok\n"); + //printf("ok\n"); // atexit(qclean()); @@ -118,7 +128,7 @@ void main(int argc, char *argv[]) /* input! */ IN_Startup(); IN_Default(0,&player,ctrl_Joystick); - IN_Default(1,&player,ctrl_Joystick); + //IN_Default(1,&player,ctrl_Joystick); /* save the palette */ #ifdef MODEX @@ -160,62 +170,77 @@ void main(int argc, char *argv[]) /* setup camera and screen~ */ modexHiganbanaPageSetup(&gvar.video); - for(i=0;iwidth+TILEWH, mv[0].page->height+TILEWH, 15); + /* 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); + modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height); //TODO: put player in starting position of spot //default player position on the viewable map - player[panswitch].tx = mv[0].tx + mv[0].page->tilemidposscreenx; - player[panswitch].ty = mv[0].ty + mv[0].page->tilemidposscreeny; + player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx; + player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny; IN_initplayer(&player, 0); - IN_initplayer(&player, 1); + //IN_initplayer(&player, 1); -// modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height); #ifndef SPRITE -// modexClearRegion(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 32, 15); + modexClearRegion(mv[0].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15); + modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15); #else - //PBUFSFUN(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA); -// PBUFSFUN(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 64, 24, 32, &pp); + //PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA); + PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp); #endif - modexShowPage(mv[pan.pn].page); - shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible. - //modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1); + if(!pageflipflop) modexShowPage(mv[1].page); + else modexShowPage(mv[(gvar.video.p)].page); + shinku_fps_indicator_page = 1; // we're on page 1 now, shinku(). follow along please or it will not be visible. + + /* buffer pages */ +// modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47); +// modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45); + { + unsigned int k,j,o; + /* fill screen with a distinctive pattern */ + for (k=0;k < vga_state.vga_width;k++) { + o = k >> 2; + vga_write_sequencer(0x02/*map mask*/,1 << (k&3)); + for (j=0;j < vga_state.vga_height;j++,o += vga_state.vga_stride) + vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15! + } + } + modexClearRegion(mv[3].page, 0, 128, 28, 36, 15); + #ifdef MODEX #ifdef FADE modexFadeOn(4, gpal); #endif #endif - while(!IN_KeyDown(sc_Escape) && player[panswitch].hp>0) + while(!IN_KeyDown(sc_Escape) && player[0].hp>0) { shinku(&gvar); //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 - //when player[panswitch].tx or player[panswitch].ty == 0 or player[panswitch].tx == 20 or player[panswitch].ty == 15 then stop because that is edge of map and you do not want to walk of the map + //when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map //player movement - IN_ReadControl(panswitch,&player); + IN_ReadControl(0,&player); if(!panswitch){ - walk(mv, player, panswitch); + walk(mv, player, 0); }else{ - panpagemanual(mv, player, pan.pn); - //printf(" player[panswitch].q: %d", player[panswitch].q); printf(" player[panswitch].d: %d\n", player[panswitch].d); + panpagemanual(mv, player, 0); + //printf(" player[0].q: %d", player[0].q); printf(" player[0].d: %d\n", player[0].d); } - //the scripting stuff.... - //if(((player[panswitch].triggerx == TRIGGX && player[panswitch].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[panswitch].tx == 5 && player[panswitch].ty == 5)) - if(((mv[panswitch].map->data[(player[panswitch].triggerx-1)+(map.width*(player[panswitch].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[panswitch].tx == 5 && player[panswitch].ty == 5)) + //if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5)) + if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5)) { short i; for(i=800; i>=400; i--) @@ -224,34 +249,34 @@ void main(int argc, char *argv[]) } nosound(); } - if(player[panswitch].q == (TILEWH/(player[panswitch].speed))+1 && player[panswitch].info.dir != 2 && (player[panswitch].triggerx == 5 && player[panswitch].triggery == 5)){ player[panswitch].hp--; } + 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--; } //debugging binds! - //if(IN_KeyDown(0x0E)) while(1){ if(xmsmalloc(24)) break; } if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; } if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; } - //if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; } - //if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; } + if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; } + if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; } if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page); - //IN_Ack(); + IN_UserInput(1,1); } //p #ifdef MODEX #ifdef FADE - if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); } + if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); IN_UserInput(1,1); } if(IN_KeyDown(22)){ - paloffset=0; modexPalBlack(); modexPalUpdate(&player[panswitch].data, &paloffset, 0, 0); + paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0); printf("1paloffset = %d\n", paloffset/3); modexPalUpdate(map.tiles->data, &paloffset, 0, 0); printf("2paloffset = %d\n", paloffset/3); - modexpdump(mv[0].page); modexpdump(mv[1].page); } + modexpdump(mv[0].page); modexpdump(mv[1].page); + IN_UserInput(1,1); + } #endif #endif //pan switch - if(IN_KeyDown(88)){panswitch=!panswitch;} //f12 - //TSR + if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);} //f12 if(IN_KeyDown(87)) //f11 { pageflipflop=!pageflipflop; - //IN_Ack(); + IN_UserInput(1,1); // VGAmodeX(0, 0, &gvar); // IN_Shutdown(); // __asm @@ -260,10 +285,26 @@ void main(int argc, char *argv[]) // int 21h // } } - if(IN_KeyDown(68)) //s + if(IN_KeyDown(68)) //f10 { gvar.kurokku.fpscap=!gvar.kurokku.fpscap; - //IN_Ack(); + switch(gvar.kurokku.fpscap) + { + case 0: + gvar.kurokku.frames_per_second=1; + break; + case 1: + gvar.kurokku.frames_per_second=60; + break; + } + IN_UserInput(1,1); + } + if(IN_KeyDown(67)) //f9 + { +// modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47); +// modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45); + modexClearRegion(mv[3].page, 0, 128, 28, 36, 15); + //IN_UserInput(1,1); } //TODO fmemtest into page /*if(IN_KeyDown(4+1)) //4 @@ -274,9 +315,9 @@ void main(int argc, char *argv[]) }*/ //9 - if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); } - //if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); } - if((player[panswitch].q==1) && !(player[panswitch].x%TILEWH==0 && player[panswitch].y%TILEWH==0)) break; //incase things go out of sync! + if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(default_pal); IN_UserInput(1,1); } + //if(IN_KeyDown(11)){ modexPalOverscan(15); } + if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break; //incase things go out of sync! } /* fade back to text mode */ @@ -290,43 +331,36 @@ void main(int argc, char *argv[]) VGAmodeX(0, 1, &gvar); #endif IN_Shutdown(); - printf("Project 16 scroll.exe. This is just a test file!\n"); + printf("\n\n\n\nProject 16 scroll.exe. This is just a test file!\n"); printf("version %s\n", VERSION); - printf("tx: %d\n", mv[0].tx); + printf("tx: %d ", mv[0].tx); printf("ty: %d\n", mv[0].ty); - printf("player.x: %d", player[panswitch].x); printf(" player.y: %d\n", player[panswitch].y); + 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("player.tx: %d", player[panswitch].tx); printf(" player.ty: %d\n", player[panswitch].ty); - printf("player.triggx: %d", player[panswitch].triggerx); printf(" player.triggy: %d\n", player[panswitch].triggery); - printf("player.hp: %d", (player[panswitch].hp)); printf(" player.q: %d", player[panswitch].q); printf(" player.info.dir: %d", player[panswitch].info.dir); printf(" player.d: %d ", player[panswitch].d); - printf("pdir=%d\n", player[panswitch].pdir); - printf("tile data value at player trigger position: %d\n", mv[0].map->data[(player[panswitch].triggerx-1)+(map.width*(player[panswitch].triggery-1))]); + 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("palette offset: %d\n", paloffset/3); //++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize()); //++++ 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("Virtual Screen: %dx", gvar.video.page[0].width); printf("%d\n", gvar.video.page[0].height); + 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\n", gvar.video.page[0].tilesh); - printf("tile resolution: %dx", gvar.video.page[0].tw); printf("%d \n", gvar.video.page[0].th); + 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); - printf("video memory remaining: %ld\n", gvar.video.vmem_remain); - printf("page "); - for(i=0; iwidth, mv[0].map->height, mv[0].map->data[0]); printf("\n");