joncampbell123 i tried ww

diff --git a/src/fontgfx.c b/src/fontgfx.c
index d0c2e1bcc0eadaa471de9437d611fe57b78add0e..50427a3ad8af9075a7b5924beb3e27b221f8b34d 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -96,7 +96,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
@@ -115,11 +114,11 @@ 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
+               modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e);\r
                chx+=9;\r
                colpee++;\r
                if(colpee>=32+24) colpee=32;\r

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index f0b798ce1c3b1de2dfb524c1c72fbf1d5412bd66..b50c16e184212eb97efeae0c543f9a673abac50d 100755 (executable)
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -239,7 +239,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
                break;
                case 8:
                        colorz(page, pee);
-                       modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi", (page[0].width/4) * pee->yy + (pee->xx / 4) + ((word)page[0].data), 1);
+                       modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi");
                break;
                case 9:
                        if(pee->coor <= HGQ)

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 247a24d34f1500392357014bd26fb34d4a9a25e5..4e7004e11279d509de1b58c97c818c66d0c1287b 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -873,10 +873,11 @@ byte modexgetPixel(page_t *page, int x, int y)
 \r
 }\r
 \r
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, word addrq, boolean q)\r
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)\r
 {\r
        word s, o, w;\r
        word addr = (word) romFontsData.l;\r
+       word addrq = (page->width/4) * y + (x / 4) + ((word)page->data);\r
        byte c;\r
 \r
        s=romFonts[t].seg;\r
@@ -913,7 +914,7 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
                JNZ L1\r
        }\r
 //TODO: OPTIMIZE THIS!!!!\r
-               modexDrawCharPBuf(page, x, y, t, col, bgcol, addrq, q);\r
+               modexDrawCharPBuf(page, x, y, t, col, bgcol, addrq);\r
 \r
                //if(!q) getch();\r
        }\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index b334e7fe86ad6bd21e490103a1bb2a163b1cd045..c1c45252a336de6ef0d286a25f07963c2e78e151 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -172,7 +172,7 @@ static inline byte modexreadPixel(page_t *page, int x, int y, word addr)
        outpw(GC_INDEX+1, x & 3);
        return vga_state.vga_graphics_ram[addr];
 }
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, word addrq, boolean q);
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
 void modexpdump(page_t *pee);
 void modexcls(page_t *page, byte color, byte *Where);

diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c
index ad88168ff235f820025c64d4ed74218e12396bc6..fe78022d9fec20d6872d03377ab91358cd269ea2 100755 (executable)
--- a/src/lib/modex16/16render.c
+++ b/src/lib/modex16/16render.c
@@ -435,7 +435,7 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
     }\r
 }\r
 \r
-void modexDrawCharPBuf(page_t *page, int x, int y, word t, word col, word bgcol, word addr, boolean q)\r
+void modexDrawCharPBuf(page_t *page, int x, int y, word t, word col, word bgcol, word addr)\r
 {\r
        word i, j, k;\r
        for(i=0; i<romFonts[t].charSize; i++)\r
@@ -445,24 +445,24 @@ void modexDrawCharPBuf(page_t *page, int x, int y, word t, word col, word bgcol,
                //every "pixel" row\r
                while(j)\r
                {\r
-                       if(q)\r
+//                     if(q)\r
                        //_fmemcpy(page->data + (((page->width/4) * (y+i)) + ((x+romFontsData.chw+k) / 4)), romFontsData.l[i] & j ? col:bgcol, 2);\r
                        modexwritepixel(page, x+k+romFontsData.chw, y+i, addr, romFontsData.l[i] & j ? col:bgcol);\r
-                       else\r
+//                     else\r
                                //printf("l[i]=%c j=%02u l[i] & j=%02u %c\n", l[i] , j, l[i] & j, l[i] & j ? '*':' ');\r
                                //printf("%c", l[i] & j ? '*':' ');\r
-                               romFontsData.z[k]=romFontsData.l[i] & j ? '*':' ';\r
+//                             romFontsData.z[k]=romFontsData.l[i] & j ? '*':' ';\r
                        j>>=1;\r
                        k++;\r
                }\r
-               if(!q)\r
-               {\r
-                       for(k=0;k<9;k++)\r
-                       {\r
-                               printf("%c", romFontsData.z[k]);\r
-                       }\r
-                       printf("\n");\r
-               }\r
+//             if(!q)\r
+//             {\r
+//                     for(k=0;k<9;k++)\r
+//                     {\r
+//                             printf("%c", romFontsData.z[k]);\r
+//                     }\r
+//                     printf("\n");\r
+//             }\r
        }\r
        romFontsData.chw += k;\r
 }\r

diff --git a/src/lib/modex16/16render.h b/src/lib/modex16/16render.h
index 7edb44229791408aa854cff405910f43faff037f..abf8f1f585099b23dc9ed699f21a47f84d642b49 100755 (executable)
--- a/src/lib/modex16/16render.h
+++ b/src/lib/modex16/16render.h
@@ -36,6 +36,6 @@ void modexDrawBmpPBuf(page_t *page, int x, int y, planar_buf_t *bmp); /*pbuf ver
 void modexDrawBmpPBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *bmp);\r
 void modexDrawSpritePBuf(page_t *page, int x, int y, planar_buf_t *bmp);\r
 void modexDrawSpritePBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *bmp);\r
-void modexDrawCharPBuf(page_t *page, int x, int y, word t, word col, word bgcol, word addr, boolean q);\r
+void modexDrawCharPBuf(page_t *page, int x, int y, word t, word col, word bgcol, word addr);\r
 \r
 #endif\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 69ec872019731d132630dfa6ffd67b8c2443956b..e77faf1bc1572d4cbe12bf56d17a2bb87863f0af 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -599,11 +599,8 @@ void shinku(map_view_t *pip, global_game_variables_t *gv)
                word bgcol = 0;
                word type = 1;
                //t=(((*(gv->clock))-gv->clock_start) /18.2);
-               //sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-               vga_moveto(x,y);
-               vga_sync_bios_cursor();
-               printf("%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-               //modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1);
+               sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
+               modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee);
                //(gv->clock_start)=*(gv->clock);
                gv->kurokku.tiku=0;
        }