X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=aafa30503366d618d6f9de0aa45d1f42c5e2ef07;hb=707c5310d94a386646727cafad91f93cc65052ad;hp=d65782d11641bc32044e06ec523ba528bea702fb;hpb=ffd855e814f3aa4f300915ffca12be6f5763e608;p=16.git diff --git a/src/scroll.c b/src/scroll.c old mode 100644 new mode 100755 index d65782d1..aafa3050 --- a/src/scroll.c +++ b/src/scroll.c @@ -21,28 +21,32 @@ */ #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; +float t; + void main() { // 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; @@ -50,51 +54,50 @@ 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; + gvar.clock_start=*clockdw; + //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 */ - //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); -//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 + 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,6 +109,7 @@ void main() #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); @@ -116,11 +120,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~ */ @@ -130,7 +136,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; @@ -171,7 +177,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 @@ -179,13 +189,13 @@ 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", 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 @@ -327,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)){ @@ -335,6 +346,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 @@ -357,14 +369,17 @@ void main() /* 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); 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); @@ -395,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 }