X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=cb06bb22c3faafab1550a637edb4319494bce8a0;hb=5bd5a11b2c5204aa38cfc7a22d8f0a7f9b4cbedb;hp=7919971abc6a8e4aedf4a3fd07386ced07588c0d;hpb=3dc6dfae836293380daf9e7dbd7c04d211a2cb16;p=16.git diff --git a/src/scroll.c b/src/scroll.c old mode 100644 new mode 100755 index 7919971a..cb06bb22 --- a/src/scroll.c +++ b/src/scroll.c @@ -21,29 +21,31 @@ */ #include "src/lib/scroll16.h" -#include "src/lib/mapread.h" +//#include "src/lib/mapread.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 */ +global_game_variables_t gvar; +static map_t map; +player_t player[MaxPlayers]; +page_t screen, screen2, screen3; +map_view_t mv[3]; +map_view_t *bg, *spri, *mask;//, *tmp; +planar_buf_t *p; + void main() { - dword tiku = 0; // 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]; #ifdef FADE byte *dpal, *gpal; @@ -51,54 +53,49 @@ void main() byte *ptr; byte *mappalptr; byte *mesg=malloc(sizeof(dword)); - player_t player[MaxPlayers]; player[0].persist_aniframe=0; player[0].speed=4; - - start_timer(&gvar); - gvar.frames_per_second = 60; + //0000printf("starting timer\n"); +//++++ + //++++????start_timer(&gvar); +//++++ gvar.frames_per_second = 60; +//0000 printf("ok\n"); //extern struct inconfig inpu; // 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 near free @ before map load: %zu\n", GetNearFreeSize()); - 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); -//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~\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("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); - +//0000 printf("planar buffer ok\n"); +#endif /* input! */ IN_Startup(); IN_Default(0,&player,ctrl_Joystick); /* save the palette */ +#ifdef MODEX #ifdef FADE dpal = modexNewPal(); modexPalSave(dpal); @@ -106,10 +103,11 @@ void main() #endif textInit(); - VGAmodeX(1); + VGAmodeX(1, &gvar); #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); @@ -120,11 +118,13 @@ 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~ */ @@ -134,7 +134,7 @@ void main() 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 = 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; @@ -175,7 +175,11 @@ void main() npc0.d=0; modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/ #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 @@ -183,14 +187,16 @@ void main() 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", tiku); - modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg); - shinku(mv[1].page, &gvar); + sprintf(mesg, "%lu", gvar.tiku); +//++++ modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg); + //++++shinku(mv[1].page, &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 @@ -331,6 +337,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)){ @@ -339,13 +346,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, &gvar); IN_Shutdown(); __asm { @@ -356,19 +364,22 @@ void main() if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break; //incase things go out of sync! - tiku++; + 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); + VGAmodeX(0, &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); @@ -378,24 +389,19 @@ void main() 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", player[0].info.dir); printf(" player[0].d: %d\n", player[0].d); 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); - printf("\n"); +//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("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; @@ -404,7 +410,9 @@ void main() default: cpus = "internal error"; break; } printf("detected CPU type: %s\n", cpus); +#ifdef MODEX #ifdef FADE modexFadeOn(4, dpal); #endif +#endif }