16.c needs to probe DOS and VGA before using modex library. -repo sync-

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 50427a3ad8af9075a7b5924beb3e27b221f8b34d..0c300aa3efd77c06bbc9adc6428212e808e903ac 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -34,7 +34,6 @@ global_game_variables_t gvar;
 \r
 void main(int argc, char near *argv[])\r
 {\r
-       struct vga_mode_params cm;\r
        //JMOJI\r
        static byte e;\r
        //word ri;\r
@@ -96,7 +95,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
        gvar.video.page[0].width += (16*2);\r
        gvar.video.page[0].height += (16*2);\r
        modexShowPage(&gvar.video.page[0]);\r
-       vga_read_crtc_mode(&cm);\r
        // NTS: We're in Mode-X now. printf() is useless. Do not use printf(). Or INT 10h text printing. Or DOS console output.\r
        //modexprint(16, 16, 1, 15, "wwww");\r
        //getch();\r
@@ -119,11 +117,13 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
                }\r
                sprintf(pee, "%zc", e);\r
                modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e);\r
-               chx+=9;\r
+               chx+=8;\r
                colpee++;\r
                if(colpee>=32+24) colpee=32;\r
        }\r
        getch();\r
+       modexprint(&gvar.video.page[0], 0, 0, 1, 0, colpee, &rose);\r
+       getch();\r
        //modexprint(100, 100, 1, 47, 0, "wwww");\r
 //     modexprint(0, 0, 1, 0, colpee, &rose);\r
 //++++ modexprint(&gvar.video.page[0], 0, 0, 0, 0, colpee, &ibmlogo);\r
@@ -136,6 +136,4 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
        printf("\n%s\n", rose);\r
        //printf("\nh=%d\n", '8');\r
 //     printf("\n%c\n", e);\r
-       printf("cm.offset=%d\n", cm.offset);\r
-       printf("vga_state.vga_stride=%d\n", vga_state.vga_stride);\r
 }\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index e9a9fc1536f0476ae5ba04ea98fd78b47db60745..88f5c9bcd8efe0cd5d1488a3680cb07b8e1bce2b 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -601,7 +601,8 @@ void shinku(map_view_t *pip, global_game_variables_t *gv)
                //t=(((*(gv->clock))-gv->clock_start) /18.2);
                sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
                printf("%s", gv->pee);
-               //modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee);
+               //FIXME PLEASE!!
+               //:modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee);
                //(gv->clock_start)=*(gv->clock);
                gv->kurokku.tiku=0;
        }