fix updated code to copy the char, not NUL char (doh!)

fix modex VGA init to set .width and .height page members.
shinku()'s fps indicator works now!

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 20c468e2372a2750bd37b33a977ce93b26eecd9c..5db7bf481849910a90551b4725f801c7600daa38 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -95,6 +95,9 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
                        /* width and height */\r
                        gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this\r
                        gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this\r
+                       /* virtual width and height. match screen, at first */\r
+                       gv->video.page[0].height = gv->video.page[0].sh;\r
+                       gv->video.page[0].width = gv->video.page[0].sw;\r
 \r
                        // mode X BYTE mode\r
                        cm.word_mode = 0;\r
@@ -907,7 +910,7 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
        // load the character into romFontsData.l\r
        // no need for inline assembly!\r
        // NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C.\r
-               _fmemcpy(romFontsData.l,MK_FP(s,o)/*ROM font location*/,w/*char size*/);\r
+               _fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/);\r
                modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr);\r
                x_draw += 8; /* track X for edge of screen */\r
                addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index ac3bf7abd0398e699bdd1e8d65996e910e38691a..24837c4b2f80d4cf3a2f05c58c36385252384186 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -594,14 +594,15 @@ void shinku(global_game_variables_t *gv)
        {
                word x = (16);
                word y = (16);
-               word col = 1;
+               word col = 7;
                word bgcol = 0;
-               word type = 1;
+               word type = 0;
+
                //t=(((*(gv->clock))-gv->clock_start) /18.2);
                sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-               printf("%s\n", gv->pee);
+//             printf("%s\n", gv->pee);
                //FIXME PLEASE!!
-               modexprint(&(gv->video.page[0]), 200, 200, type, col, bgcol, gv->pee);
+               modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
 //++++ modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
                //(gv->clock_start)=*(gv->clock);
                gv->kurokku.tiku=0;