X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=0c37c8c43f8a112902e171e216254e0f7a6fbdeb;hb=bb3be3ebd67ad43d7b5705efc2b5be70fad01422;hp=c6316e5628cea25a85c2b2d86aaa3f95fdc55ea5;hpb=bd1fcae44f46be994efadf246b1cfc05da14a1c7;p=16.git diff --git a/src/scroll.c b/src/scroll.c old mode 100644 new mode 100755 index c6316e56..0c37c8c4 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 * * This file is part of Project 16. * @@ -21,181 +21,188 @@ */ #include "src/lib/scroll16.h" -#include "src/lib/mapread.h" +#include "src/lib/16_timer.h" #include "src/lib/wcpu/wcpu.h" -//====#include "src\lib\ems.c" + +//#define FADE +#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; +bitmap_t p; +word pn=0; +static planar_buf_t huge *pp; +float t; +sword bakapee; + // word panswitch=0, panq=1, pand=0; word panpagenum=0; //for panning! - int i; - static word paloffset=0; - planar_buf_t *p; + 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 */ - 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]; - byte *dpal, *gpal; + word pg; +//#ifdef FADE + static word paloffset=0; + byte *dpal, *default_pal; +//#endif + byte *gpal; byte *ptr; byte *mappalptr; - player_t player[MaxPlayers]; - player[0].persist_aniframe=0; - player[0].speed=4; - //extern struct inconfig inpu; - - //player_t npc0; +void main(int argc, char *argv[]) +{ + byte *mesg=malloc(sizeof(dword)); -// atexit(qclean()); - /*if(!emmtest()) - { - printf("Expanded memory is not present\n"); - exit(0); - } + if(argv[1]) bakapee = atoi(argv[1]); + else bakapee = 1; - if(!emmok()) - { - printf("Expanded memory manager is not present\n"); - exit(0); - } + // DOSLIB: check our environment + probe_dos(); - emsavail = emmavail(); - if(emsavail == -1) - { - printf("Expanded memory manager error\n"); - exit(0); + // DOSLIB: what CPU are we using? + // NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS. + // So this code by itself shouldn't care too much what CPU it's running on. Except that other + // parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for + // the CPU to carry out tasks. --J.C. + cpu_probe(); + + // DOSLIB: check for VGA + if (!probe_vga()) { + printf("VGA probe failed\n"); + return; + } + // hardware must be VGA or higher! + if (!(vga_state.vga_flags & VGA_IS_VGA)) { + printf("This program requires VGA or higher graphics hardware\n"); + return; } - printf("There are %ld pages available\n",emsavail); - if((emmhandle = emmalloc(emsavail)) < 0) - { - printf("Insufficient pages available\n"); - exit(0); - }*/ + testcontrolnoisy=0; + + player[0].persist_aniframe=0; + player[0].speed=4; + //player[0].data = &pp; + + printf("starting timer "); + start_timer(&gvar); + printf("ok\n"); + +// atexit(qclean()); /* create the map */ - //printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); - printf("Total free @ before map load: %zu\n", GetFreeSize()); - printf("Total far free @ before map load: %zu\n", GetFarFreeSize()); - getch(); -//0000 fprintf(stderr, "testing~\n"); -// loadmap("data/test.map", &map); -//0000 fprintf(stderr, "yay map loaded~~\n"); -//---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly - //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); -//---- initMap(&map); + fprintf(stderr, "testing map load~ "); + loadmap("data/test.map", &map); + chkmap(&map, 0); + printf("chkmap ok "); + 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; + //mappalptr = map.tiles->btdata->palette; + /* data */ -//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); - 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 */ -//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); - p = planar_buf_from_bitmap(&player[0].data); -//0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); - - /*if(isEMS()) - { - XMOVE mm; - mm.length=sizeof(map); - mm.sourceH=0; - mm.sourceOff=(long)↦ - mm.destH=emmhandle; - mm.destOff=1; - //halp! - ist = move_emem(&mm); - printf("%d\n", coretotalEMS()); - if(!ist){ dealloc_emem(emmhandle); exit(5); } - //printf("%d\n", emmhandle); - } - - if(isEMS()) - { - XMOVE mm; - mm.length=emmhandle; - mm.sourceH=0; - mm.sourceOff=(long)&ptmp; - mm.destH=emmhandle; - mm.destOff=0; - //halp! - ist = move_emem(&mm); - printf("%d\n", coretotalEMS()); - if(!ist){ dealloc_emem(emmhandle); exit(5); } - //printf("%d\n", emmhandle); - } -*/ +////++++ (player[0].data) = *planar_buf_from_bitmap(&p); + printf("load pee!! "); + pp = planar_buf_from_bitmap(&p); + printf("done!\n"); +#endif /* input! */ IN_Startup(); IN_Default(0,&player,ctrl_Joystick); /* save the palette */ +#ifdef MODEX +#ifdef FADE dpal = modexNewPal(); + default_pal = modexNewPal(); + *default_pal = *dpal; modexPalSave(dpal); modexFadeOff(4, dpal); +#endif - VGAmodeX(1); + textInit(); + VGAmodeX(bakapee, 1, &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); +//++++ player[0].data.offset=(paloffset/3); +//++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0); + //modexPalUpdate1(p.palette); + modexPalUpdate1(map.tiles->btdata->palette); //printf(" %d\n", sizeof(ptmp->data)); //printf("1: %d\n", paloffset); - map.tiles->data->offset=(paloffset/3); +//++++ map.tiles->data->offset=(paloffset/3); //XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0); - printf("\n====\n"); - printf("0 paloffset= %d\n", paloffset/3); - printf("====\n\n"); +// 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]; spri = &mv[1]; mask = &mv[2]; - +//IN_Ack(); //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen mapGoTo(bg, 0, 0); mapGoTo(spri, 0, 0); //mapGoTo(mask, 0, 0); - +//IN_Ack(); //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; player[0].triggery = player[0].ty+1; +/* player[0].info.x = player[0].tx; + player[0].info.xaxis = player[0].tx*TILEWH; + player[0].info.y = player[0].ty; + player[0].info.yaxis = player[0].ty*TILEWH;*/ player[0].q=1; - player[0].info.dir=2; + player[0].d=2; player[0].hp=4; +// player[0].persist_aniframe=0; //npc /*npc0.tx = bg->tx + 1; npc0.ty = bg->ty + 1; @@ -206,14 +213,25 @@ void main() npc0.q=1; npc0.d=0; modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/ - modexDrawSpriteRegion(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data); + + 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[0].x-4, player[0].y-TILEWH, 24, 32, 15); +#else + //PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA); + PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp); +#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); + //modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1); +#ifdef MODEX +#ifdef FADE modexFadeOn(4, gpal); - while(!IN_KeyDown(sc_Escape) && player[0].hp>0) +#endif +#endif + while(!IN_KeyDown(sc_Escape) && player[0].hp>0) { + 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 @@ -354,6 +372,8 @@ 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)){ paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0); @@ -361,12 +381,14 @@ 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 //TSR if(IN_KeyDown(87)) //f11 { - VGAmodeX(0); + VGAmodeX(0, 0, &gvar); IN_Shutdown(); __asm { @@ -374,19 +396,46 @@ 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); + } + //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! - } /* 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); - VGAmodeX(0); +#endif + VGAmodeX(0, 1, &gvar); +#endif IN_Shutdown(); - printf("Project 16 scroll.exe\n"); + printf("Project 16 scroll.exe. This is just a test file!\n"); + printf("version %s\n", VERSION); printf("tx: %d\n", bg->tx); printf("ty: %d\n", bg->ty); printf("player[0].x: %d", player[0].x); printf(" player[0].y: %d\n", player[0].y); @@ -394,23 +443,25 @@ void main() //else printf("\nplayer[0].y: %d\n", player[0].y); printf("player[0].tx: %d", player[0].tx); printf(" player[0].ty: %d\n", player[0].ty); printf("player[0].triggx: %d", player[0].triggerx); printf(" player[0].triggy: %d\n", player[0].triggery); - printf("player[0].hp: %d", (player[0].hp)); printf(" player[0].q: %d", player[0].q); printf(" player[0].info.dir: %d\n", player[0].info.dir); + printf("player[0].hp: %d", (player[0].hp)); printf(" player[0].q: %d", player[0].q); printf(" player[0].info.dir: %d", player[0].info.dir); printf(" player[0].d: %d\n", player[0].d); + printf("pdir=%d\n", player[0].pdir); printf("tile data value at player trigger position: %d\n", bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]); - printf("palette offset: %d\n", paloffset/3); +// printf("palette offset: %d\n", paloffset/3); //++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize()); //++++ printf("Total free: %zu\n", GetFreeSize()); - printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n"); - 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("map: %dx%d\n", map.width, map.height); +//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("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); +// printf("player[0].info.tx: %d", player[0].info.x); printf(" player[0].info.ty: %d\n", player[0].info.y); //printf("map.width=%d map.height=%d map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]); - //xmsfree(&map); - //xmsfree(bg); - //xmsfree(spri); - //xmsfree(mask); - //xmsreport(); - //emmclose(emmhandle); + switch(detectcpu()) { case 0: cpus = "8086/8088 or 186/88"; break; @@ -419,5 +470,9 @@ void main() default: cpus = "internal error"; break; } printf("detected CPU type: %s\n", cpus); +#ifdef MODEX +#ifdef FADE modexFadeOn(4, dpal); +#endif +#endif }