i did a butt load of tweaking to the paltest code and i did verious fixes here and...

diff --git a/src/.xcroll.c.kate-swp b/src/.xcroll.c.kate-swp
deleted file mode 100755 (executable)
index 9b3a8b2..0000000
Binary files a/src/.xcroll.c.kate-swp and /dev/null differ

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 30231f474987cc73ea633ac74f269886bbc82072..6ac00f2865da989cdee8b5d4a2b856399193c63d 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -209,7 +209,7 @@ void modexLoadPalFile(char *filename, byte *palette);
 void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar);\r
 void VL_LoadPalFileCore(byte *palette, global_game_variables_t *gvar);\r
 void VL_SetCorePal(global_game_variables_t *gvar);\r
-//void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, global_game_variables_t *gvar);\r
+void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, word palsize, global_game_variables_t *gvar);\r
 void VL_UpdatePaletteWrite(byte *palette, word o, word palsize, global_game_variables_t *gvar);\r
 void VL_PaletteSync(global_game_variables_t *gvar);\r
 void modexSavePalFile(char *filename, byte *palette);\r

diff --git a/src/lib/16_vlpal.c b/src/lib/16_vlpal.c
index 032f2b7a947c7b875ae0a9daba44d01353bd73e2..57a97f0a70e35071cd170571e381bed3d8cea0a0 100755 (executable)
--- a/src/lib/16_vlpal.c
+++ b/src/lib/16_vlpal.c
@@ -189,7 +189,7 @@ aqpee:
                while(aq<=aa)\r
                {\r
 #ifdef BEVERBOSEPALCHECK\r
-                       printf("a[%02d]=(%d)\n", aq, a[aq]);//\r
+//                     printf("a[%02d]=(%d)\n", aq, a[aq]);//0000\r
 #endif\r
                        if(a[aq]==-1) aq++;\r
                        else { aqoffset++; break; }\r

diff --git a/src/lib/16_vlpld.h b/src/lib/16_vlpld.h
index 5ade2e9011d4c877789bbb3477166f79c6fb9943..db51f5e90f990e639e92048800f99d40990a6799 100755 (executable)
--- a/src/lib/16_vlpld.h
+++ b/src/lib/16_vlpld.h
@@ -2,8 +2,10 @@
 #define __16_VLPALD_H__\r
 \r
 #define BEVERBOSEPALCHECK\r
+//#define BEVERBOSECOLORCHECK\r
+//#define DONOTPALCHECK\r
 \r
-#ifdef BEVERBOSEPALCHECK\r
+#ifdef BEVERBOSECOLORCHECK\r
 #define CHKCOLDBGOUT1 \\r
                printf("q: %02d\n", (*q));\\r
                printf("chkcolor start~\n");\\r
@@ -44,6 +46,17 @@
                printf("2                                  (*i): %d\n", (*i)/3); \\r
                printf("2 offset of color in palette    (*q): %d\n", (*q)/3); \\r
                printf("chkcolor end~\n");\r
+#else\r
+#define        CHKCOLDBGOUT1\r
+#define        CHKCOLDBGOUT2\r
+#define        CHKCOLDBGOUT3\r
+#define        CHKCOLDBGOUT4\r
+#define        CHKCOLDBGOUT5\r
+#define        CHKCOLDBGOUT6\r
+#define        CHKCOLDBGOUT7\r
+#define        CHKCOLDBGOUT8\r
+#define        CHKCOLDBGOUT9\r
+#define        CHKCOLDBGOUT10\r
 #endif\r
 //======//\r
 \r

diff --git a/src/lib/doslib b/src/lib/doslib
index 9f68b899de82e9ed49cf03bd617820f98db034c3..2b7b2ed6b38382723b80be134cb5d22284de2eb4 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 9f68b899de82e9ed49cf03bd617820f98db034c3
+Subproject commit 2b7b2ed6b38382723b80be134cb5d22284de2eb4

diff --git a/src/palllist.c b/src/palllist.c
index 023593b0e2d1e54fcfb1908c4913919a83bf93cf..77f0abdc02ac4674a8ec649417863ac2bacd7509 100755 (executable)
--- a/src/palllist.c
+++ b/src/palllist.c
@@ -165,19 +165,18 @@ void main()
         Created linked list will be 11->11->11->13->13->20 */\r
        pushll(&head, 20);\r
        pushll(&head, 13);\r
-       pushll(&head, 13);  \r
+       pushll(&head, 13);\r
+       pushll(&head, 11);\r
        pushll(&head, 11);\r
        pushll(&head, 11);\r
-       pushll(&head, 11); \r
- \r
+\r
        printf("\n Linked list before duplicate removal  ");\r
-       printList(head); \r
- \r
+       printList(head);\r
+\r
        /* Remove duplicates from linked list */\r
-       removeDuplicates(head); \r
- \r
-       printf("\n Linked list after duplicate removal ");               \r
-       printList(head);                        \r
-       \r
+       removeDuplicates(head);\r
+\r
+       printf("\n Linked list after duplicate removal ");\r
+       printList(head);\r
 }\r
 #endif\r

diff --git a/src/paltest.c b/src/paltest.c
index 21f6a8119da8a3897189bb04a96f82a1ef178356..b353468ebc6ec5795ed389cb5c39f2b30beae511 100755 (executable)
--- a/src/paltest.c
+++ b/src/paltest.c
@@ -29,7 +29,7 @@
 #define LGQ 32\r
 #define HGQ 55\r
 \r
-static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
+static word far* clockw= (word far*) 0x046C; // 18.2hz clock //\r
 \r
 void drawboxesmodex(page_t *pg)\r
 {\r
@@ -47,102 +47,63 @@ void copyboxesmodex(page_t *page, boolean pn)
 void main(int argc, char *argv[])\r
 {\r
        static word paloffset=0;\r
-       global_game_variables_t gvar;\r
-\r
-//     map_view_t mv[4];\r
-       map_t map;\r
+       static global_game_variables_t gvar;\r
 \r
        int i, j;\r
        word startclk, endclk;\r
        word k;\r
 \r
+#ifndef DONOTPALCHECK\r
        imgtestpal_t bmp1, bmp2;\r
-\r
-\r
        bmp1.width=bmp2.width=  40;\r
        bmp1.width=bmp2.height= 30;\r
+#endif\r
 \r
        //====word colo=LGQ;\r
 \r
-       // DOSLIB: check our environment\r
-       /*probe_dos();\r
-\r
-       // DOSLIB: what CPU are we using?\r
-       // NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.\r
-       //      So this code by itself shouldn't care too much what CPU it's running on. Except that other\r
-       //      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for\r
-       //      the CPU to carry out tasks. --J.C.\r
-       cpu_probe();\r
-\r
-       // DOSLIB: check for VGA\r
-       if (!probe_vga()) {\r
-               printf("VGA probe failed\n");\r
-               return;\r
-       }\r
-       // hardware must be VGA or higher!\r
-       if (!(vga_state.vga_flags & VGA_IS_VGA)) {\r
-               printf("This program requires VGA or higher graphics hardware\n");\r
-               return;\r
-       }\r
-\r
-       if (_DEBUG_INIT() == 0) {\r
-#ifdef DEBUGSERIAL\r
-               printf("WARNING: Failed to initialize DEBUG output\n");\r
-#endif\r
-       }\r
-       _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
-       _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);*/\r
        Startup16(&gvar);\r
 \r
-       /* save the palette */\r
+       // save the palette //\r
        //====modexPalSave(pal);\r
        //====modexFadeOff(1, pal);\r
        //====modexPalBlack();\r
 \r
-       //IN_Startup();\r
        IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
        EN_initPlayer(&gvar.player[0], &gvar.video);\r
 \r
-       VGAmodeX(1, 1, &gvar);\r
-       modexPalBlack();\r
+       VL_Startup(&gvar);//VGAmodeX(1, 1, &gvar);\r
+       modexPalBlack(); VL_PaletteSync(&gvar);\r
 \r
-       /* load our palette */\r
+       // load our palette //\r
        VL_LoadPalFile("data/16.pal", &gvar.video.palette, &gvar);\r
+#ifndef DONOTPALCHECK\r
        bmp1.offset=(paloffset/3);\r
-       VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);\r
+//     VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);\r
 \r
        //VL_LoadPalFilewithoffset("data/default.pal", &palette, paloffset);\r
        modexLoadPalFile("data/16t.pal", &gvar.video.dpal);\r
+       //VLL_LoadPalFilewithoffset("data/16t.pal", &gvar.video.palette, paloffset, 8, &gvar);\r
        bmp2.offset=(paloffset/3);\r
-       VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);\r
+//     VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);\r
        //====modexLoadPalFile("data/default.pal", &pal2);\r
+#endif\r
+       VL_PaletteSync(&gvar);\r
 \r
-       /* overscan show */\r
+       // overscan show //\r
        //modexPalOverscan(44+1);\r
 \r
-       /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
+       // set up the page, but with 16 pixels on all borders in offscreen mem //\r
        modexHiganbanaPageSetup(&gvar);\r
-       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
-\r
-       /* fill the page with one color, but with a black border */\r
-       /*modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 15);\r
-       modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);\r
-       modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);\r
-       modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);\r
-       modexShowPage(&gvar.video.page[1]);\r
-       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);\r
-       modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);\r
-       modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);\r
-       modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);\r
-       modexShowPage(&gvar.video.page[0]);*/\r
+       ZC_MVSetup(&gvar.mv, &gvar.map, &gvar);\r
 \r
+       // fill the page with one color, but with a black border //\r
        drawboxesmodex(&gvar.video.page[0]);\r
        copyboxesmodex(&gvar.video.page, 1);\r
        modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 4);\r
        modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 6);\r
 \r
 \r
-       /* fade in */\r
+       // fade in //\r
        //====modexFadeOn(1, pal2);\r
 \r
        i=0,k=0,j=0;\r
@@ -160,7 +121,8 @@ void main(int argc, char *argv[])
                TAIL_PANKEYFUN;\r
                if(gvar.in.inst->Keyboard[12]) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);\r
                if(gvar.in.inst->Keyboard[13]) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);\r
-/*====         if(gvar.in.inst->Keyboard[7)){\r
+#if 0\r
+//====         if(gvar.in.inst->Keyboard[7)){\r
                        for(i=0;i<3;i++)\r
                        {\r
                                pal2[i] = rand()%64;\r
@@ -169,7 +131,8 @@ void main(int argc, char *argv[])
                                if(colo>HGQ) colo=LGQ;\r
                        }\r
 //                     if(i>PAL_SIZE) i=0;\r
-               }//9*/\r
+               }//9\r
+#endif\r
                if(gvar.in.inst->Keyboard[25]){ modexpdump(gvar.video.sp, &gvar); IN_UserInput(1, &gvar); }//p\r
                if(gvar.in.inst->Keyboard[sc_I]){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//i\r
                if(gvar.in.inst->Keyboard[sc_O]){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1, &gvar); }//o\r
@@ -179,19 +142,17 @@ void main(int argc, char *argv[])
 \r
        endclk = *clockw;\r
 \r
-       /* fade back to text mode */\r
+       // fade back to text mode //\r
        //====modexFadeOff(1, pal2);\r
        //====modexPalBlack();\r
-       VGAmodeX(0, 1, &gvar);\r
-       Shutdown16(&gvar);\r
-       printf("Project 16 vidtest.exe. This is just a test file!\n");\r
+       Shutdown16(&gvar);//VGAmodeX(0, 1, &gvar);\r
+       printf("Project 16 paltest.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        VL_PrintmodexmemInfo(&gvar.video);\r
        printf("tx=%d   ", gvar.mv[gvar.video.sp].tx); printf("ty=%d    ", gvar.mv[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);\r
        printf("\n====\n");\r
        printf("0       paloffset=      %d\n", paloffset/3);\r
        printf("====\n\n");\r
-       //IN_Shutdown();\r
        //====modexPalBlack();\r
        //====modexFadeOn(1, pal);\r
 }\r

diff --git a/src/ps.c b/src/ps.c
index 645006fcd3687b3e18db68252af25d4b7f0a6911..64da4428825808da94da8511eede49f107a2a16f 100755 (executable)
--- a/src/ps.c
+++ b/src/ps.c
@@ -15,6 +15,11 @@ void main()
        PRINT_OPAQUE_STRUCT(&gvar.mm);\r
        printf("mmi:\n");\r
        PRINT_OPAQUE_STRUCT(&gvar.mmi);\r
+       printf("sizeof gvar.video=%d\n", sizeof(gvar.video));\r
+       printf("sizeof gvar.ca=%d\n", sizeof(gvar.ca));\r
+       printf("sizeof gvar.pm=%d\n", sizeof(gvar.pm));\r
+       printf("sizeof gvar.mm=%d\n", sizeof(gvar.mm));\r
+       printf("sizeof gvar.mmi=%d\n", sizeof(gvar.mmi));\r
        printf("sizeof gvar=%d\n", sizeof(gvar));\r
 //     handle\r
 //     kurokku\r

diff --git a/src/vidtest.c b/src/vidtest.c
index d6db28ccfbd34fcceba8170ff54219ab2e3fbdf9..9d1966fbf56853c20c66c2aafb2cc99c78393b64 100755 (executable)
--- a/src/vidtest.c
+++ b/src/vidtest.c
@@ -29,7 +29,7 @@
 #define LGQ 32\r
 #define HGQ 55\r
 \r
-static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
+static word far* clockw= (word far*) 0x046C; // 18.2hz clock //\r
 \r
 void drawboxesmodex(page_t *pg)\r
 {\r
@@ -47,44 +47,44 @@ void copyboxesmodex(page_t *page, boolean pn)
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       map_t map;\r
 \r
        int i, j;\r
        word startclk, endclk;\r
        word k;\r
 \r
+       //====word colo=LGQ;\r
+\r
        Startup16(&gvar);\r
 \r
-       /* save the palette */\r
+       // save the palette //\r
        //====modexPalSave(pal);\r
        //====modexFadeOff(1, pal);\r
        //====modexPalBlack();\r
 \r
-       //IN_Startup();\r
        IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
        EN_initPlayer(&gvar.player[0], &gvar.video);\r
 \r
-       VGAmodeX(1, 1, &gvar);\r
+       VL_Startup(&gvar);//VGAmodeX(1, 1, &gvar);\r
        modexPalBlack();\r
 \r
-       /* load our palette */\r
+       // load our palette //\r
        VL_LoadPalFile("data/16.pal", &gvar.video.palette, &gvar);\r
 \r
-       /* overscan show */\r
+       // overscan show //\r
        //modexPalOverscan(44+1);\r
 \r
-       /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
+       // set up the page, but with 16 pixels on all borders in offscreen mem //\r
        modexHiganbanaPageSetup(&gvar);\r
-       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
+       ZC_MVSetup(&gvar.mv, &gvar.map, &gvar);\r
 \r
-       /* fill the page with one color, but with a black border */\r
+       // fill the page with one color, but with a black border //\r
        drawboxesmodex(&gvar.video.page[0]);\r
        copyboxesmodex(&gvar.video.page, 1);\r
        modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 4);\r
        modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 6);\r
 \r
 \r
-       /* fade in */\r
+       // fade in //\r
        //====modexFadeOn(1, pal2);\r
 \r
        i=0,k=0,j=0;\r
@@ -112,16 +112,14 @@ void main(int argc, char *argv[])
 \r
        endclk = *clockw;\r
 \r
-       /* fade back to text mode */\r
+       // fade back to text mode //\r
        //====modexFadeOff(1, pal2);\r
        //====modexPalBlack();\r
-       VGAmodeX(0, 1, &gvar);\r
-       Shutdown16(&gvar);\r
+       Shutdown16(&gvar);//VGAmodeX(0, 1, &gvar);\r
        printf("Project 16 vidtest.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        VL_PrintmodexmemInfo(&gvar.video);\r
        printf("tx=%d   ", gvar.mv[gvar.video.sp].tx); printf("ty=%d    ", gvar.mv[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);\r
-       //IN_Shutdown();\r
        //====modexPalBlack();\r
        //====modexFadeOn(1, pal);\r
 }\r

diff --git a/src/xcroll.c b/src/xcroll.c
index a73430af638dd49c16bd0104b838c3cdb9e31b90..3126f7da4651f0d0dcdcf48c725c78d99ed67a02 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,19 +22,15 @@
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-//#include "src/lib/16_dbg.h"\r
+#include "src/lib/16_dbg.h"\r
 \r
 //#define FADE\r
 \r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
-#define XC_CTRLTYPE ctrl_Keyboard\r
-//Mouse\r
+#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard\r
 #ifdef __DEBUG__\r
 #define SCROLLEXEDEBUG\r
-boolean\r
-       dbg_nointest=0,\r
-       dbg_joymousedelta=0;\r
 #endif\r
 \r
 //static map_t map;\r
@@ -83,6 +79,10 @@ void main(int argc, char *argv[])
        char bakapee[64] = FILENAME_1;\r
        char bakapeep[64] = FILENAME_1P;\r
 //     char bakapee3[64] = FILENAME_3;\r
+#ifdef __DEBUG__\r
+       dbg_nointest=0;\r
+       dbg_joymousedelta=0;\r
+#endif\r
 \r
        Startup16(&gvar);\r
 \r