]> 4ch.mooo.com Git - 16.git/blobdiff - src/scroll.c
readded OLD sprite drawing now for fixing the background stuff ww
[16.git] / src / scroll.c
index f58490f9988ad3ee79f46638329c8b2227ff18f5..ff380454e7831d0efe74a7c2644d31872125d107 100755 (executable)
 #define MODEX  //this is for mode x initiating
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
-
+bitmap_t *p;
 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];
-bitmap_t p;
-word pn=0;
-static planar_buf_t huge *pp;
+map_view_t mv[4];
+//word pn=0; //i forgot ww
+//static planar_buf_t huge *pp;
 float t;
 sword bakapee;
-
-//     word panswitch=0, panq=1, pand=0;
-       word panpagenum=0; //for panning!
+pan_t pan;
+//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 */
@@ -84,13 +84,20 @@ void main(int argc, char *argv[])
                return;
        }
 
-       player[0].persist_aniframe=0;
-       player[0].speed=4;
+       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());
 
@@ -100,9 +107,6 @@ void main(int argc, char *argv[])
        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
@@ -110,7 +114,11 @@ void main(int argc, char *argv[])
        //mappalptr = map.tiles->btdata->palette;
 
        /* data */
-       //++++p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+       //++++
+       p = malloc(48*128);
+       player[0].data = p;
+       *p = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite
+       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
        /* create the planar buffer */
@@ -123,6 +131,7 @@ void main(int argc, char *argv[])
        /*      input!  */
        IN_Startup();
        IN_Default(0,&player,ctrl_Joystick);
+       //IN_Default(1,&player,ctrl_Joystick);
 
        /* save the palette */
 #ifdef MODEX
@@ -144,7 +153,7 @@ void main(int argc, char *argv[])
 //     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());
 //++++ player[0].data.offset=(paloffset/3);
 //++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-               //modexPalUpdate1(p.palette);
+               modexPalUpdate1(p->palette);
 //++++0000             modexPalUpdate1(map.tiles->btdata->palette);
        //printf("      %d\n", sizeof(ptmp->data));
        //printf("1:    %d\n", paloffset);
@@ -164,32 +173,55 @@ void main(int argc, char *argv[])
 
        /* setup camera and screen~ */
        modexHiganbanaPageSetup(&gvar.video);
-       mv[0].page = &gvar.video.page[0];
-       mv[1].page = &gvar.video.page[1];
-       mv[2].page = &gvar.video.page[2];
+       for(i=0;i<gvar.video.num_of_pages;i++)
+       {
+               mv[i].page = &gvar.video.page[i];
+               mv[i].map = &map;
+               mv[i].video = &gvar.video;
+               mv[i].pan       = &pan;
+       }
 
        /* 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, 0);
-       mapGoTo(&mv[1], 0, 0);
-       //mapGoTo(mask, 0, 0);
+       //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
+       mapGoTo(mv, 0, 0);
+       //_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
+
        //TODO: put player in starting position of spot
        //default player position on the viewable map
        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);
 
-       modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
+       modexDrawSprite(mv[0].page, 16, 16, p);
+       modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));
 #ifndef        SPRITE
-       modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
+       modexClearRegion(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);
+       //modexClearRegion(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);
 #else
-       //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);
+       //PBUFSFUN(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 64, 24, 32, PLAYERBMPDATA);
+       PBUFSFUN(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 64, 16, 32,   p);
 #endif
 
-       modexShowPage(mv[1].page);
-       shinku_fps_indicator_page = 1; // 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[0].page);//!(gvar.video.p)
+               shinku_fps_indicator_page = 0; // 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, 24, 36, 15);
+
 #ifdef MODEX
 #ifdef FADE
        modexFadeOn(4, gpal);
@@ -198,129 +230,20 @@ void main(int argc, char *argv[])
        while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
        {
                shinku(&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
        //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
-       //if(!panswitch){
+               IN_ReadControl(0,&player);
+       if(!panswitch){
                walk(mv, player, 0);
-       /*}else{
-//88 switch!
-       //right movement
-       if((IN_KeyDown(77) && !IN_KeyDown(75) && pand == 0) || pand == 2)
-       {
-               if(pand == 0){ pand = 2; }
-                       if(panq<=(TILEWH/(player[0].speed)))
-                       {
-                               switch(panpagenum)
-                               {
-                                       case 0:
-                                               //bg
-                                               mv[0].page->dx++;
-                                               modexShowPage(mv[0].page);
-                                       break;
-                                       case 1:
-                                               //spri
-                                               mv[1].page->dx++;
-                                               modexShowPage(mv[1].page);
-                                       break;
-                                       case 2:
-                                               //fg
-                                               mv[2].page->dx++;
-                                               modexShowPage(mv[2].page);
-                                       break;
-                               }
-                               panq++;
-                       } else { panq = 1; pand = 0; }
-       }
-       //left movement
-       if((IN_KeyDown(75) && !IN_KeyDown(77) && pand == 0) || pand == 4)
-       {
-               if(pand == 0){ pand = 4; }
-                       if(panq<=(TILEWH/(player[0].speed)))
-                       {
-                               switch(panpagenum)
-                               {
-                                       case 0:
-                                               //bg
-                                               mv[0].page->dx--;
-                                               modexShowPage(mv[0].page);
-                                       break;
-                                       case 1:
-                                               //spri
-                                               mv[1].page->dx--;
-                                               modexShowPage(mv[1].page);
-                                       break;
-                                       case 2:
-                                               //fg
-                                               mv[2].page->dx--;
-                                               modexShowPage(mv[2].page);
-                                       break;
-                               }
-                               panq++;
-                       } else { panq = 1; pand = 0; }
-       }
-       //down movement
-       if((IN_KeyDown(72) && !IN_KeyDown(80) && pand == 0) || pand == 3)
-       {
-               if(pand == 0){ pand = 3; }
-                       if(panq<=(TILEWH/(player[0].speed)))
-                       {
-                               switch(panpagenum)
-                               {
-                                       case 0:
-                                               //bg
-                                               mv[0].page->dy--;
-                                               modexShowPage(mv[0].page);
-                                       break;
-                                       case 1:
-                                               //spri
-                                               mv[1].page->dy--;
-                                               modexShowPage(mv[1].page);
-                                       break;
-                                       case 2:
-                                               //fg
-                                               mv[2].page->dy--;
-                                               modexShowPage(mv[2].page);
-                                       break;
-                               }
-                               panq++;
-                       } else { panq = 1; pand = 0; }
-       }
-       //up movement
-       if((IN_KeyDown(80) && !IN_KeyDown(72) && pand == 0) || pand == 1)
-       {
-               if(pand == 0){ pand = 1; }
-                       if(panq<=(TILEWH/(player[0].speed)))
-                       {
-                               switch(panpagenum)
-                               {
-                                       case 0:
-                                               //bg
-                                               mv[0].page->dy++;
-                                               modexShowPage(mv[0].page);
-                                       break;
-                                       case 1:
-                                               //spri
-                                               mv[1].page->dy++;
-                                               modexShowPage(mv[1].page);
-                                       break;
-                                       case 2:
-                                               //fg
-                                               mv[2].page->dy++;
-                                               modexShowPage(mv[2].page);
-                                       break;
-                               }
-                               panq++;
-                       } else { panq = 1; pand = 0; }
+       }else{
+               panpagemanual(mv, player, 0);
+               //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);
        }
-}*/
-
-
-       //the scripting stuf....
 
+       //the scripting stuff....
        //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))
        {
@@ -333,59 +256,68 @@ void main(int argc, char *argv[])
        }
        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); panpagenum=0; }
-       if(IN_KeyDown(3)){ modexShowPage(mv[1].page); panpagenum=1; }
-       if(IN_KeyDown(4)){ modexShowPage(mv[2].page); panpagenum=2; }
-       if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page); }   //p
+       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(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
+                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[0].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)){if(!panswitch) panswitch++; else panswitch--; }    //f12
-       //TSR
+       if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12
        if(IN_KeyDown(87))      //f11
        {
-               VGAmodeX(0, 0, &gvar);
-               IN_Shutdown();
-               __asm
-               {
-                       mov ah,31h
-                       int 21h
-               }
+               pageflipflop=!pageflipflop;
+               IN_UserInput(1,1);
+//             VGAmodeX(0, 0, &gvar);
+//             IN_Shutdown();
+//             __asm
+//             {
+//                     mov ah,31h
+//                     int 21h
+//             }
        }
-       if(IN_KeyDown(88))      //s
+       if(IN_KeyDown(68))      //f10
        {
-               switch(gvar.kurokku.fpscap)
-               {
-                       case 0:
-                               gvar.kurokku.fpscap=1;
-                       break;
-                       case 1:
-                               gvar.kurokku.fpscap=0;
-                       break;
-               }
-               //IN_Ack();
+               gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
+               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);
+       }
+       if(IN_KeyDown(66))      //f8
+       {
+               modexDrawSprite(mv[0].page, 16, 16, p);
+               modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));
        }
        //TODO fmemtest into page
-       if(IN_KeyDown(4+1))     //4
+       /*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(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!
        }
 
@@ -400,34 +332,40 @@ 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("\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[0].x: %d", player[0].x); printf("                player[0].y: %d\n", player[0].y);
+       printf("\n");
+       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[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", 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", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].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("tile resolution: %dx", gvar.video.page[0].tilesh);      printf("%d\n", gvar.video.page[0].tilesh);
+       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("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);
+       modexprintmeminfo(&gvar.video);
+       //printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("      mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty);
+       printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);
+       printf("pageflipflop=%u\n", pageflipflop);
+       //0000printf("\ngvar.video.tickclk=%f\n", gvar.video.tickclk);
+       //0000printf("gvar.video.clk=%f", gvar.video.clk);
+       printf("\n");
        //printf("map.width=%d  map.height=%d   map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);
 
+       printf("\n");
        switch(detectcpu())
        {
                case 0: cpus = "8086/8088 or 186/88"; break;