wwww

diff --git a/16.exe b/16.exe
index c3d8e5ee302a833d036cc2773db2d4d8b30b5f48..95def1e1acd60f6260e9ff12212fb68205271a92 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 1a507b42663f068037691d16a9c9c83c6989b909..4287ce85629f6292dd7bc0989ef11b920d2605a4 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 2b7249fcc19b09997f4aa73010a516d5bb2a9b04..55a7fee6c17150c3bdac56b6c32a7b67a53605a2 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

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

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

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

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

diff --git a/maptest.exe b/maptest.exe
index 5f6fc22f5c2265cf13596b5af109c007804d0796..3e3ac1dc05557d003abbabdecb2ac4d0a63fece3 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 c380c0df40ff7964f30c03df0050ca4869223b29..c1d025e00ba361c7715df0e78d843f71fc65d812 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

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

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

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

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

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

diff --git a/src/16.c b/src/16.c
index c9cd55d50093386cec31ab277ae6312ec10fba52..c4367aa9380c1cee29763ce0a4fff3479dee35d5 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 db5bfa9f8580a984e55333fcc4ea35ea4b7e73ef..edea863ec77f8c54eed20f743fefad490cb73638 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 9b500b913ed4fbb087a97ad49342397e1a34be9f..040db6f9f9782c91c350df182eef02affaf7ddb1 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 5248a6b3b25d29c574072a3975ca75b061deeb70..8637d7111e4636f4c39a290bff2bd6838eda7b27 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 81f24beaf5ec59d2c9b33896b41781952a62d5a1..5a2655d69446258d01719a1694a4decdd981bec5 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 4d94e86c48bbc84ed807dc8905b4109188a5bc9a..ec8c7d41a136d0a89bc38383df72e56566ed0067 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 bf671423e19769622ad5b4115aed120c2866f35b..408b089aad56b58e11bc1a3839636dbff271b2dd 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 d171a7c4ae2d215a0a1bb68511c532c9c1b6250b..fc06f0f3e74387e33733604c8b720f63e7789978 100755 (executable)
Binary files a/test.exe and b/test.exe differ

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

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

diff --git a/vgmtest.exe b/vgmtest.exe
index 335f9668ec33c995d80a8da007ef1d0e9a24dd3f..343c65b48106ed881b90aa23af79646d9ee310c0 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