wwww

diff --git a/16.exe b/16.exe
index c3d8e5e..95def1e 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/_scroll.exe b/_scroll.exe
deleted file mode 100755 (executable)
index 4052f6d..0000000
Binary files a/_scroll.exe and /dev/null differ

diff --git a/bakapi.exe b/bakapi.exe
index 1a507b4..4287ce8 100755 (executable)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/bcexmm.exe b/bcexmm.exe
deleted file mode 100755 (executable)
index 04bf447..0000000
Binary files a/bcexmm.exe and /dev/null differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 2b7249f..55a7fee 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index 7a35aaf..f9f137f 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 4843f2a..170579f 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 256aed6..1cb340c 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index caf53e6..ee9f5ae 100755 (executable)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 5f6fc22..3e3ac1d 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/mem.exe b/mem.exe
deleted file mode 100755 (executable)
index c9238f7..0000000
Binary files a/mem.exe and /dev/null differ

diff --git a/memstat.exe b/memstat.exe
deleted file mode 100755 (executable)
index 637241d..0000000
Binary files a/memstat.exe and /dev/null differ

diff --git a/midi.exe b/midi.exe
deleted file mode 100755 (executable)
index cb05f67..0000000
Binary files a/midi.exe and /dev/null differ

diff --git a/palettec.exe b/palettec.exe
index c380c0d..c1d025e 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/palettel.exe b/palettel.exe
index 6ec2033..3e4befc 100755 (executable)
Binary files a/palettel.exe and b/palettel.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 243a291..c1a36c1 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index e9ce5a4..3547f4a 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
index e0a26c6..d61bbdd 100755 (executable)
Binary files a/planrpcx.exe and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
index 81475de..93eb500 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/16.c b/src/16.c
index c9cd55d..c4367aa 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
        modexPalBlack();        //so player will not see loadings~\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick);\r
-       //modexprint(&screen, 32, 32, 1, 2, 0, "a");\r
+       //modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);\r
        while(ENGI_EXIT != engi_stat)\r
        {\r
                IN_ReadControl(0,&player);\r

diff --git a/src/fontgfx.c b/src/fontgfx.c
index db5bfa9..edea863 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -81,10 +81,10 @@ 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);\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);\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

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 9b500b9..040db6f 100755 (executable)
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -232,7 +232,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");
+                       modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi", 1);
                break;
                case 9:
                        if(pee->coor <= HGQ)

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 5248a6b..8637d71 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -952,13 +952,14 @@ void modexhlin(page_t *page, word xl, word xh, word y, word color)
        //modexputPixel(page, x+xl, y, color);\r
 }\r
 \r
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)\r
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q)\r
 {\r
-       word i, s, o, w, j, xp;\r
+       word i, s, o, w, j, k, xp;\r
        byte l[1024];\r
        word addr = (word) l;\r
        word chw=0;\r
        byte c;\r
+       byte z[10];\r
        //byte near *bakapee;\r
 \r
        switch(t)\r
@@ -1021,14 +1022,32 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
                        *bakapee=(l[i] & j ? col:bgcol);\r
                        _fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);*/\r
                        j=1<<8;\r
+                       k=0;\r
                        xp=0;\r
+                       //every "pixel" row\r
                        while(j)\r
                        {\r
+                               if(q)\r
+                               //_fmemcpy(page->data + (((page->width/4) * (y)) + ((x) / 4)), l[i] & j ? col:bgcol, 8);\r
                                modexputPixel(page, x+xp+chw, y+i, l[i] & j ? col:bgcol);\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
+                                       z[k]=l[i] & j ? '*':' ';\r
                                xp++;\r
                                j>>=1;\r
+                               k++;\r
+                       }\r
+                       if(!q)\r
+                       {\r
+                               for(k=0;k<10;k++)\r
+                               {\r
+                                       printf("%c", z[k]);\r
+                               }\r
+                               printf("\n");\r
                        }\r
                }\r
+               if(!q) getch();\r
                chw += xp;\r
        }\r
        //_nfree(bakapee);\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 81f24be..5a2655d 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -119,7 +119,7 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, wor
 void modexputPixel(page_t *page, int x, int y, byte color);
 byte modexgetPixel(page_t *page, int x, int y);
 void modexhlin(page_t *page, word xl, word xh, word y, word color);
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
 void pdump(page_t *pee);
 void cls(page_t *page, byte color, byte *Where);

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 4d94e86..ec8c7d4 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -598,7 +598,7 @@ 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));
-               modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee);
+               modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1);
                //(gv->clock_start)=*(gv->clock);
                gv->kurokku.tiku=0;
        }

diff --git a/src/planrpcx.c b/src/planrpcx.c
index bf67142..408b089 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -36,11 +36,14 @@ word px,py;
 sword baka;\r
 char *bakapeee;\r
 \r
+\r
 void main(int argc, char *argv[])\r
 {\r
 \r
-       //byte l[1024];\r
-       word j,chw,xp,col,bgcol;\r
+       byte l[1024];\r
+       static byte e;\r
+       static word chx, chy, colpee;\r
+       byte pee[2];\r
 \r
 //w=0;\r
 //printf("%u ", w++);\r
@@ -60,6 +63,7 @@ baka = 1;
 //fprintf(stderr, "^^;", w++);\r
 //getch();\r
 \r
+       textInit();\r
        VGAmodeX(baka, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
@@ -119,28 +123,26 @@ getch();
                        printf("\n");\r
                }\r
        }\r
-       col=0x0d, bgcol=0;\r
-       /*\r
-       for(i=0; i<8; i++)\r
+\r
+       chx=0;\r
+       chy=0;\r
+       colpee=32;\r
+       for(e=0x00; e<=0xFE; e++)\r
        {\r
-               //modexSelectPlane(PLANE(x));\r
-               //j=1<<8;\r
-               //*bakapee=(l[i] & j ? col:bgcol);\r
-               //_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);\r
-               j=4<<8;\r
-               fprintf(stderr, "j<<=%u\n", j);\r
-               xp=0;\r
-               while(j)\r
+               if(chx+8>(gvar.video.page[0].width/2))\r
                {\r
-                       //modexputPixel(page, x+xp+chw, y+i, l[i] & j ? col:bgcol);\r
-                       //fprintf(stderr, "%u", l[i] & j ? col:bgcol);\r
-                       xp++;\r
-                       j>>=4;\r
-                       fprintf(stderr, "       j>>=%u\n", j);\r
+                       chx=0;\r
+                       chy+=8;\r
+                       sprintf(pee,"%u", colpee);\r
+                       modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 0);\r
+                       //getch();\r
                }\r
-               //fprintf(stderr, "\n");\r
-       }*/\r
-       chw += xp;\r
+               modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 0);\r
+               chx+=9;\r
+               colpee++;\r
+               if(colpee>=32+24) colpee=32;\r
+       }\r
+\r
        fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n");\r
        fprintf(stderr,"version %s\n", VERSION);\r
        fprintf(stderr,"%d\n", sizeof(p.plane));\r

diff --git a/test.exe b/test.exe
index d171a7c..fc06f0f 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index db19c6b..dd5521c 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tesuto.exe b/tesuto.exe
index e475c0f..6dbf027 100755 (executable)
Binary files a/tesuto.exe and b/tesuto.exe differ

diff --git a/vgmtest.exe b/vgmtest.exe
index 335f966..343c65b 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ

diff --git a/zroll.exe b/zroll.exe
deleted file mode 100755 (executable)
index 7de0e45..0000000
Binary files a/zroll.exe and /dev/null differ