wwww

diff --git a/makefile b/makefile
index 0dcb26d6fc2a5bfe4939efaba17cad9726fc6eac..3ad4caaab53299cbab42ec4e677fd8b067cf8749 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -158,8 +158,6 @@ TESTEXEC = &
     0.exe &
     test.exe &
     test0.exe &
-    pcxtest.exe &
-    pcxtest2.exe &
     palettec.exe &
     maptest.exe &
     fmemtest.exe &
@@ -176,6 +174,8 @@ EXEC = &
     16.exe &
     bakapi.exe &
     $(TESTEXEC)
+    #pcxtest.exe &
+    #pcxtest2.exe &
 
 all: $(EXEC) joytest.exe
 

diff --git a/pcxtest.exe b/pcxtest.exe
new file mode 100755 (executable)
index 0000000..9f5b821
Binary files /dev/null and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
new file mode 100755 (executable)
index 0000000..ef3287a
Binary files /dev/null and b/pcxtest2.exe differ

diff --git a/src/zcroll.c b/src/zcroll.c
index 02d0e47f1d34dbd29a92e052fb9d1a2330204543..12680234717ff018c78c5b5a6492f27c778847be 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -24,9 +24,6 @@
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
 \r
-//#define FADE\r
-#define MODEX  //this is for mode x initiating\r
-\r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 //bitmap_t *p;\r
 global_game_variables_t gvar;\r
@@ -73,7 +70,6 @@ void main(int argc, char *argv[])
        fprintf(stderr, "yay map loaded~~\n");\r
 \r
        /* draw the tiles */\r
-#ifdef MODEX\r
        ptr = map.data;\r
        //mappalptr = map.tiles->btdata->palette;\r
 \r
@@ -87,26 +83,20 @@ void main(int argc, char *argv[])
        pp = planar_buf_from_bitmap(&p);\r
        printf("done!\n");*/\r
 \r
-#endif\r
        /*      input!  */\r
        IN_Default(0,&player,ctrl_Joystick);\r
        //IN_Default(1,&player,ctrl_Joystick);\r
 \r
        /* save the palette */\r
-#ifdef MODEX\r
-#ifdef FADE\r
        dpal = modexNewPal();\r
        modexPalSave(dpal);\r
        modexFadeOff(4, dpal);\r
-#endif\r
 \r
        textInit();\r
        VGAmodeX(bakapee, 1, &gvar);\r
 //     printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);\r
-#ifdef FADE\r
        modexPalBlack();        //reset the palette~\r
-#endif\r
-#endif\r
+\r
 //     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());\r
 //++++ player[0].data.offset=(paloffset/3);\r
 //++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);\r
@@ -119,14 +109,11 @@ void main(int argc, char *argv[])
 //     printf("\n====\n");\r
 //     printf("0       paloffset=      %d\n", paloffset/3);\r
 //     printf("====\n\n");\r
-#ifdef MODEX\r
-#ifdef FADE\r
+\r
        gpal = modexNewPal();\r
        modexPalSave(gpal);\r
        modexSavePalFile("data/g.pal", gpal);\r
        modexPalBlack();        //so player will not see loadings~\r
-#endif\r
-#endif\r
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
@@ -177,11 +164,7 @@ void main(int argc, char *argv[])
 //     }\r
        modexClearRegion(mv[3].page, 0, 128, 24, 36, 15);\r
 \r
-#ifdef MODEX\r
-#ifdef FADE\r
        modexFadeOn(4, gpal);\r
-#endif\r
-#endif\r
        while(!IN_KeyDown(sc_Escape) && player[0].hp>0)\r
        {\r
                shinku(&gvar);\r
@@ -218,19 +201,14 @@ void main(int argc, char *argv[])
        if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);\r
                 IN_UserInput(1,1);\r
        }       //p\r
-#ifdef MODEX\r
-#ifdef FADE\r
        if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }\r
        if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &paloffset, 0, 0);\r
-       printf("1paloffset      =       %d\n", paloffset/3);\r
-        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
        printf("2paloffset      =       %d\n", paloffset/3);\r
         modexpdump(mv[0].page); modexpdump(mv[1].page);\r
                IN_UserInput(1,1);\r
        }\r
-#endif\r
-#endif\r
+\r
        //pan switch\r
        if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12\r
        if(IN_KeyDown(87))      //f11\r
@@ -279,14 +257,10 @@ void main(int argc, char *argv[])
 \r
        /* fade back to text mode */\r
        /* but 1st lets save the game palette~ */\r
-#ifdef MODEX\r
-#ifdef FADE\r
        modexPalSave(gpal);\r
        modexSavePalFile("data/g.pal", gpal);\r
        modexFadeOff(4, gpal);\r
-#endif\r
        VGAmodeX(0, 1, &gvar);\r
-#endif\r
        Shutdown16(&gvar);\r
        printf("\nProject 16 scroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
@@ -302,11 +276,6 @@ void main(int argc, char *argv[])
        printf("        hp: %d", (player[0].hp));       printf("        q: %d", player[0].q);   printf("        player.info.dir: %d", player[0].info.dir);      printf("        player.d: %d ", player[0].d);\r
                printf("        pdir=%d\n", player[0].pdir);\r
        printf("        tile data value at player trigger position: %d\n\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);\r
-//     printf("palette offset: %d\n", paloffset/3);\r
-//++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize());\r
-//++++ printf("Total free: %zu\n", GetFreeSize());\r
-//not used now printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
-//not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
        printf("Virtual Screen: %dx", gvar.video.page[0].width);        printf("%d      ", gvar.video.page[0].height);\r
        printf("Screen: %dx", gvar.video.page[0].sw);   printf("%d\n", gvar.video.page[0].sh);\r
        printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw);      printf("%d      ", gvar.video.page[0].tilesh);\r
@@ -330,9 +299,5 @@ void main(int argc, char *argv[])
                default: cpus = "internal error"; break;\r
        }\r
        printf("detected CPU type: %s\n", cpus);\r
-#ifdef MODEX\r
-#ifdef FADE\r
        modexFadeOn(4, dpal);\r
-#endif\r
-#endif\r
 }\r