remove wraparound check in modex print, add addr adjust for newline.

[16.git] / src / fontgfx.c

diff --git a/src/fontgfx.c b/src/fontgfx.c
index d0c2e1bcc0eadaa471de9437d611fe57b78add0e..954416d58b68437ff650431200b2f6f850298d61 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,8 +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
-       addr = (gvar.video.page[0].width/4) * chy + (chx / 4) + ((word)gvar.video.page[0].data); /* at start of function */\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
@@ -115,16 +112,18 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
                        chx=0;\r
                        chy+=8;\r
                        sprintf(pee,"%u", colpee);\r
-                       modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, addr, 1);\r
+                       modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee);\r
                        //getch();\r
                }\r
                sprintf(pee, "%zc", e);\r
-               modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, addr, 1);\r
-               chx+=9;\r
+               modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e);\r
+               chx+=8;\r
                colpee++;\r
                if(colpee>=32+24) colpee=32;\r
        }\r
        getch();\r
+       modexprint(&gvar.video.page[0], gvar.video.page[0].width - (8*16)/*HACK: The rose ASCII is too wide for 320x240 so offset it to make sure the petals are visible*/, 8, 1, 32, 0, &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
@@ -137,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