serial debug output added. they are added as _DEBUG_INIT and _DEBUG functions.

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index f371f87d1d3ddd494ddf23f4829ec404218788a7..b108a20d6fd7901e052f454e6b70f3fc4a4082ef 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -33,7 +33,7 @@ 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; //i forgot ww
 static planar_buf_t huge *pp;
@@ -85,6 +85,13 @@ 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
+
        pan.pn=1;
        //player[0].data = &pp;
 
@@ -162,7 +169,7 @@ void main(int argc, char *argv[])
 
        /* setup camera and screen~ */
        modexHiganbanaPageSetup(&gvar.video);
-       for(i=0;i<gvar.video.num_of_pages-2;i++)
+       for(i=0;i<gvar.video.num_of_pages;i++)
        {
                mv[i].page = &gvar.video.page[i];
                mv[i].map = &map;
@@ -172,7 +179,7 @@ void main(int argc, char *argv[])
        /* 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);
+       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
@@ -227,11 +234,10 @@ 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); 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();
        }       //p
@@ -313,21 +319,10 @@ void main(int argc, char *argv[])
        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("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; i<gvar.video.num_of_pages;i++)
-       {
-               printf("        [%u]=", i);
-               printf("(%Fp)\n", (gvar.video.page[i].data));
-       }
-       printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("        mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty); printf("panswitch=%u\n", panswitch);
+       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\n", gvar.video.p);
        //printf("player[1].q: %d", player[1].q);       printf("        player[1].d: %d\n", player[1].d);
        printf("\n");
-//     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", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);
 
        printf("\n");