Merge branch 'master' of github.com:sparky4/16

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 2abb13ffe93dfa88a15c9b88a486a67c169c7177..1fb477df64548eb74d6e8a57a94a4cd0faba7425 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -61,8 +61,8 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 ,'___...---~~~\n\\r
 ";\r
 //     static byte *rosa;\r
-       static word chx, chy, colpee;\r
-       textInit();\r
+       static word chx;//, chy, colpee;\r
+//     textInit();\r
        VGAmodeX(1, 1, &gvar);\r
        /* setup camera and screen~ */\r
        gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);\r
@@ -72,22 +72,27 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
        //modexprint(16, 16, 1, 15, "wwww");\r
        //getch();\r
        chx=0;\r
-       chy=0;\r
-       colpee=32;\r
+//     chy=0;\r
+//     colpee=32;\r
+       /* position the cursor to home */\r
+       vga_moveto(0,0);\r
+       vga_sync_bios_cursor();\r
        for(e=0x00; e<=0xFE; e++)\r
        {\r
                if(chx+8>(gvar.video.page[0].width/2))\r
                {\r
                        chx=0;\r
-                       chy+=8;\r
-                       sprintf(pee,"%u", colpee);\r
-                       modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 1);\r
+                       printf("\n");\r
+//                     chy+=8;\r
+//                     sprintf(pee,"%u", colpee);\r
+//                     modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 1);\r
                        //getch();\r
                }\r
-               modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 1);\r
+               printf("%c", e);\r
+//             modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 1);\r
                chx+=9;\r
-               colpee++;\r
-               if(colpee>=32+24) colpee=32;\r
+//             colpee++;\r
+//             if(colpee>=32+24) colpee=32;\r
        }\r
        //modexprint(100, 100, 1, 47, 0, "wwww");\r
        getch();\r

diff --git a/src/lib/bakapee.h b/src/lib/bakapee.h
index e06c0b8f51378b9b33dcf2a16dfc0ece7fa66bfa..a6076dafcef6069112d47e48a849ad57bc0b7de4 100755 (executable)
--- a/src/lib/bakapee.h
+++ b/src/lib/bakapee.h
@@ -28,6 +28,7 @@
 #include <hw/cpu/cpu.h>\r
 #include <hw/dos/dos.h>\r
 #include <hw/vga/vga.h>\r
+\r
 //#include "src/lib/modex/modex.h"\r
 //#include "16/x/modex.h"\r
 \r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index e71079a25598948ca52dacf7b94c0519289db4e6..69ec872019731d132630dfa6ffd67b8c2443956b 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -600,6 +600,8 @@ void shinku(map_view_t *pip, global_game_variables_t *gv)
                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);
                //(gv->clock_start)=*(gv->clock);

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index d55d395af2e1ef3e75acbae495d98b1a307a093f..77065af9f8ac4512bc2cd0f2f3ccb855611461c7 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -33,6 +33,12 @@
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
+#include <hw/cpu/cpu.h>
+#include <hw/dos/dos.h>
+#include <hw/vga/vga.h>
+#include <hw/vga/vrl.h>
+#include <hw/vga/vgatty.h>
+
 //#define SPRITE
 //#define TILERENDER
 

diff --git a/src/scroll.c b/src/scroll.c
index e2ca23c25fa44faa19f92a1b6f5b6d04c3b7186d..b1b9d5ae9875e0aaccf3893c59b583d4abaf9a01 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -134,7 +134,7 @@ void main(int argc, char *argv[])
        modexFadeOff(4, dpal);
 #endif
 
-       textInit();
+       //textInit();
        VGAmodeX(bakapee, 1, &gvar);
 //     printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE