From 34d55bd3f03eabdfc0e13c00b85e2091a211488a Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 18 Apr 2016 12:18:04 -0500 Subject: [PATCH] 16.c needs to probe DOS and VGA before using modex library. -repo sync- --- src/fontgfx.c | 8 +++----- src/lib/scroll16.c | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fontgfx.c b/src/fontgfx.c index 50427a3a..0c300aa3 100755 --- a/src/fontgfx.c +++ b/src/fontgfx.c @@ -34,7 +34,6 @@ global_game_variables_t gvar; void main(int argc, char near *argv[]) { - struct vga_mode_params cm; //JMOJI static byte e; //word ri; @@ -96,7 +95,6 @@ IIIIIII BBBBBBBBB MMMM M MMMM\n\ gvar.video.page[0].width += (16*2); gvar.video.page[0].height += (16*2); modexShowPage(&gvar.video.page[0]); - vga_read_crtc_mode(&cm); // NTS: We're in Mode-X now. printf() is useless. Do not use printf(). Or INT 10h text printing. Or DOS console output. //modexprint(16, 16, 1, 15, "wwww"); //getch(); @@ -119,11 +117,13 @@ IIIIIII BBBBBBBBB MMMM M MMMM\n\ } sprintf(pee, "%zc", e); modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e); - chx+=9; + chx+=8; colpee++; if(colpee>=32+24) colpee=32; } getch(); + modexprint(&gvar.video.page[0], 0, 0, 1, 0, colpee, &rose); + getch(); //modexprint(100, 100, 1, 47, 0, "wwww"); // modexprint(0, 0, 1, 0, colpee, &rose); //++++ modexprint(&gvar.video.page[0], 0, 0, 0, 0, colpee, &ibmlogo); @@ -136,6 +136,4 @@ IIIIIII BBBBBBBBB MMMM M MMMM\n\ printf("\n%s\n", rose); //printf("\nh=%d\n", '8'); // printf("\n%c\n", e); - printf("cm.offset=%d\n", cm.offset); - printf("vga_state.vga_stride=%d\n", vga_state.vga_stride); } diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index e9a9fc15..88f5c9bc 100755 --- 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; } -- 2.39.5