repo sync ^^

diff --git a/src/.scroll.c.kate-swp b/src/.scroll.c.kate-swp
deleted file mode 100755 (executable)
index d25cd71..0000000
Binary files a/src/.scroll.c.kate-swp and /dev/null differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 19cf024eca53170cd294e63bc6fe8f1a12409544..e135d534469c642ace75cdef4a71a3dcdfc1c993 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -240,9 +240,10 @@ void modexHiganbanaPageSetup(video_t *video)
        (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++;\r
        video->page[0].width += (TILEWH*2); video->page[0].height += (TILEWH*2);\r
        (video->page[1]) = modexNextPage(&(video->page[0]));    video->num_of_pages++;\r
+       (video->page[2]) = modexNextPage(&(video->page[1]));    video->num_of_pages++;\r
+       //(352*176)+1024 is the remaining amount of memory left wwww\r
        modexCalcVmemRemain(video);\r
-       (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].sw, video->page[0].sh);  //(352*176)+1024 is the remaining amount of memory left wwww\r
-       video->num_of_pages++;\r
+       (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 92); video->num_of_pages++;\r
        modexCalcVmemRemain(video);\r
        //gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192);      //(352*176)+1024 is the remaining amount of memory left wwww\r
 }\r

diff --git a/src/scroll.c b/src/scroll.c
index f58490f9988ad3ee79f46638329c8b2227ff18f5..81f7da051df07a8d6b5062d1c3e59f3a42cef351 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -337,6 +337,7 @@ void main(int argc, char *argv[])
        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(5)){ modexShowPage(&(gvar.video.page[3])); panpagenum=3; }
        if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page); }   //p
 #ifdef MODEX
 #ifdef FADE
@@ -421,6 +422,7 @@ void main(int argc, char *argv[])
        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("video memory remaining: %d\n", gvar.video.vmem_remain);
 //     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");
@@ -428,6 +430,7 @@ void main(int argc, char *argv[])
 //     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");
        switch(detectcpu())
        {
                case 0: cpus = "8086/8088 or 186/88"; break;