p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

diff --git a/makefile b/makefile
index f8c1871ecdd71ebe3a8529514130be110a32cf5a..50c4ffcb35bf939cde4b643fbf9baaed8ff5baf3 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -117,7 +117,7 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k24576#32768
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576
 Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
 O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536

diff --git a/src/bakapi.c b/src/bakapi.c
index b03f294a754e5b7e4e5e8fdaa665bdd4ca2e0eed..034649c4939c5aead0b9516a726d4457297f20c4 100755 (executable)
--- a/src/bakapi.c
+++ b/src/bakapi.c
@@ -150,12 +150,12 @@ main(int argc, char *argvar[])
                        ding(&gvar.video.page[1], &bakapee, 2);\r
                }\r
 #ifdef BAKAFIZZUNSIGNED\r
-               if(!baka_FizzleFade (gvar.video.ofs.bufferofs, gvar.video.ofs.displayofs, vga_state.vga_width, vga_state.vga_height, 70, true, &gvar))\r
+               baka_FizzleFade (gvar.video.ofs.bufferofs, gvar.video.ofs.displayofs, vga_state.vga_width, vga_state.vga_height, 70, true, &gvar);\r
 #else\r
-               if(!baka_FizzleFade (&gvar.video.page[1], &gvar.video.page[0], vga_state.vga_width, vga_state.vga_height, 70, true, &gvar))\r
+               baka_FizzleFade (&gvar.video.page[1], &gvar.video.page[0], vga_state.vga_width, vga_state.vga_height, 70, true, &gvar);\r
 #endif\r
                //ding(&gvar.video.page[showpage], &bakapee, 9);\r
-               modexprint(&gvar.video.page[0], gvar.video.page[0].sw/2, gvar.video.page[0].sh/2, 1, 0, 47, 0, 1, "bakapi ok");\r
+//             modexprint(&gvar.video.page[0], gvar.video.page[0].sw/2, gvar.video.page[0].sh/2, 1, 0, 47, 0, 1, "bakapi ok");\r
        }\r
        while(!kbhit()){}\r
 \r

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 0b5a4ab8fb3c8f0c634637eff754909060fff690..9fb1730b07e5b4ef5a927f9b6e813064f9cc3c1c 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -44,7 +44,12 @@
 //#define EXMMVERBOSE__\r
 //     #define PRINTBBDUMP\r
 #define BUFFDUMP\r
+#ifdef __BORLANDC__\r
 #define NOVID\r
+#endif\r
+#ifdef __WATCOMC__\r
+#define NOVID\r
+#endif\r
 \r
 \r
 #define KEYP IN_Shutdown(&gvar); printf("\n\npress any key to continue!\n"); getch(); IN_Startup(&gvar);\r
@@ -63,7 +68,7 @@
 #endif\r
 \r
 ////////////////////////////////////////////////////////////////////////////\r
-//#ifdef __BORLANDC__\r
+#ifdef NOVID\r
 //void VL_Startup (global_game_variables_t *gvar){}\r
 void VL_Shutdown (global_game_variables_t *gvar){}\r
 void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)\r
@@ -82,7 +87,7 @@ void  TL_VidInit(global_game_variables_t *gvar)
 {\r
        gvar->video.old_mode = 3;\r
 }\r
-//#endif\r
+#endif\r
 \r
 //printf("*    %Fp\t", *BBUF);\r
 //printf("*         %04x\t", *BBUF);\r
@@ -185,9 +190,7 @@ main(int argc, char *argv[])
                                                                #ifndef NOVID\r
        Startup16(&gvar);\r
        // save the palette\r
-                                                               #ifdef __WATCOMC__\r
        modexPalSave(&gvar.video.dpal); modexFadeOff(4, &gvar.video.dpal); //modexPalBlack();\r
-                                                               #endif\r
                                                                #else //NOVID\r
        //printf("main()=%Fp    start MM\n", *argv[0]);\r
        MM_Startup(&gvar);\r
@@ -271,12 +274,12 @@ PRINTBB; KEYP
                IN_ClearKey(scan);\r
                switch (scan)\r
                {\r
-//                     case sc_Space:\r
-//                             MM_ShowMemory(&gvar);\r
-//                     break;\r
+                       case sc_Space:\r
+                               MM_ShowMemory(&gvar);\r
+                       break;\r
 //#ifdef __WATCOMC__\r
                        case sc_O:\r
-                               modexPalUpdate0(&gvar.video.palette); modexpdump(&gvar.video.page);\r
+                               VL_modexPalScramble(&gvar.video.palette); modexpdump(&gvar.video.page);\r
                        break;\r
                        case sc_P:\r
                                modexpdump(&gvar.video.page[0]);\r

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 867b2099ac7d48182594ff896703dced290149fe..1b3020790c144614ee94eff1eaf0b450f0a1cddf 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -375,6 +375,17 @@ boolean CA_ReadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)
                return false;\r
 \r
        size = filelength(handle);\r
+#ifdef __DEBUG_CA__\r
+       if(dbg_debugca>0){\r
+               printf("===============================================================================\n");\r
+               printf("                CA_ReadFile\n");\r
+               printf("===============================================================================\n");\r
+               //%04x\r
+               printf("        ptr=%Fp\n", ptr);\r
+               printf("        *ptr=%Fp\n", *ptr);\r
+               printf("        &ptr=%Fp\n", &ptr);\r
+       }\r
+#endif\r
        if(!CA_FarRead(handle,*ptr,size, gvar))\r
        {\r
                close(handle);\r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index bd762016703d70179be9fd93338d0d0198f64d36..7c6cf37fa79193910e184b4a54c4aa60d3e1ca24 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -27,7 +27,7 @@
 \r
 //===========================================================================\r
 \r
-//#define NOMAPS\r
+#define NOMAPS\r
 #define NOGRAPHICS\r
 #define NOAUDIO\r
 \r

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index ede5c359cede94c1f74d7eacdfee64483387cebf..e545bdcdd3eb0879458d817704dd7c938a3db0a5 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -10,7 +10,7 @@
 #define __DEBUG_InputMgr__\r
 #define __DEBUG_MAP__\r
 //#define __DEBUG_2__\r
-//#define __DEBUG_CA__\r
+#define __DEBUG_CA__\r
 //#define __DEBUG_PM__\r
 //#define __DEBUG_MM__\r
 //#define __DEBUG_RF__\r

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 2026ed126c119e130d0ec17773ce06cb8d96a09f..39eb569e66d2fab90566e464d83275ba03d1232b 100755 (executable)
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -136,6 +136,7 @@ noxor:
                                continue;\r
                        //drawofs = source+(gvar->video.ofs.ylookup[y]) + (x>>2);\r
                        drawofs = source+(y*gvar->video.page[0].stridew) + (x>>2);\r
+/*\r
 sprintf(global_temp_status_text, "draw - %Fp", drawofs);\r
 modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;\r
 sprintf(global_temp_status_text, "pdet - %Fp", pagedelta);\r
@@ -144,6 +145,7 @@ sprintf(global_temp_status_text, "srce - %Fp", source);
 modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;\r
 sprintf(global_temp_status_text, "dest - %Fp", dest);\r
 modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q=16;\r
+*/\r
 \r
                        //\r
                        // copy one pixel\r