added resetting palette in cmem part of modexenter

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 8b9aab83be9c2ccb1d922938dfe50657ce47b2a9..dcdcaa1c3bc65b262a78fc6439bcd36eacc7f9ad 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1102,25 +1102,25 @@ dinorm:
 \r
 void CAL_SetupMapFile (global_game_variables_t *gvar)\r
 {\r
-//     int handle;\r
-//     long length;\r
+/*     int handle;\r
+       long length;\r
 \r
 //\r
 // load maphead.ext (offsets and tileinfo for map file)\r
 //\r
-// #ifndef MAPHEADERLINKED\r
-//     if ((handle = open("MAPHEAD."EXT,\r
-//              O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-//             printf("Can't open MAPHEAD."EXT"!");\r
-//     length = filelength(handle);\r
-//     MM_GetPtr (&(memptr)tinf,length);\r
-//     CA_FarRead(handle, tinf, length);\r
-//     close(handle);\r
-// //#else\r
-//\r
-//     tinf = (byte _seg *)FP_SEG(&maphead);\r
-//\r
-// #endif\r
+#ifndef MAPHEADERLINKED\r
+       if ((handle = open("MAPHEAD."EXT,\r
+                O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
+               printf("Can't open MAPHEAD."EXT"!");\r
+       length = filelength(handle);\r
+       MM_GetPtr (&(memptr)tinf,length);\r
+       CA_FarRead(handle, tinf, length);\r
+       close(handle);\r
+//#else\r
+\r
+       tinf = (byte _seg *)FP_SEG(&maphead);\r
+\r
+#endif*/\r
 \r
 //\r
 // open the data file\r
@@ -1856,32 +1856,33 @@ void CA_CacheMap (global_game_variables_t *gvar)
 //\r
 // free up memory from last map\r
 //\r
-       if (gvar->ca.map.mapon>-1 && gvar->ca.map.mapheaderseg[gvar->ca.map.mapon])\r
-               MM_SetPurge (&((memptr)gvar->ca.map.mapheaderseg[(gvar->ca.map.mapon)]), 3, &(gvar->mm));\r
+       if (gvar->ca.camap.mapon>-1 && gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapon])\r
+               MM_SetPurge (((memptr)gvar->ca.camap.mapheaderseg[(gvar->ca.camap.mapon)]), 3, gvar);\r
        for (plane=0;plane<MAPPLANES;plane++)\r
-               if (gvar->ca.map.mapsegs[plane])\r
-                       MM_FreePtr (&(memptr)gvar->ca.map.mapsegs[plane], &(gvar->mm));\r
+               if (gvar->ca.camap.mapsegs[plane])\r
+                       MM_FreePtr ((memptr)gvar->ca.camap.mapsegs[plane], gvar);\r
 \r
-       gvar->ca.map.mapon = gvar->ca.map.mapnum;\r
+       gvar->ca.camap.mapon = gvar->ca.camap.mapnum;\r
 \r
 \r
 //\r
 // load map header\r
 // The header will be cached if it is still around\r
 //\r
-       if (!gvar->ca.map.mapheaderseg[gvar->ca.map.mapnum])\r
-       {\r
-               //pos = ((mapfiletype   _seg *)tinf)->headeroffsets[mapnum];\r
-               pos = ((_seg *)gvar->ca.map.tinf)->headeroffsets[gvar->ca.map.mapnum];\r
-               if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
-                 printf("CA_CacheMap: Tried to load a non existent map!");\r
+//     if (!gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapnum])\r
+//     {\r
+//             //pos = ((mapfiletype   _seg *)tinf)->headeroffsets[mapnum];\r
+//             //pos = ((_seg *)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
+//             pos = ((memptr)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
+//             if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
+//               printf("CA_CacheMap: Tried to load a non existent map!");\r
 \r
-               MM_GetPtr(&(memptr)gvar->ca.mapheaderseg[mapnum],sizeof(maptype));\r
-               lseek(maphandle,pos,SEEK_SET);\r
-               CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
-       }\r
-       else\r
-               MM_SetPurge (&(memptr)mapheaderseg[mapnum], 0, &(gvar->mm));\r
+//             MM_GetPtr(&(memptr)gvar->ca.camapheaderseg[mapnum],sizeof(maptype));\r
+//             lseek(maphandle,pos,SEEK_SET);\r
+//             CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
+//     }\r
+//     else\r
+//             MM_SetPurge (&(memptr)mapheaderseg[mapnum], 0, &(gvar->mm));\r
 \r
 //\r
 // load the planes in\r
@@ -1893,8 +1894,8 @@ void CA_CacheMap (global_game_variables_t *gvar)
 \r
        for (plane = 0; plane<MAPPLANES; plane++)\r
        {\r
-               pos = mapheaderseg[mapnum]->planestart[plane];\r
-               compressed = mapheaderseg[mapnum]->planelength[plane];\r
+               //pos = mapheaderseg[mapnum]->planestart[plane];\r
+               //compressed = mapheaderseg[mapnum]->planelength[plane];\r
 \r
                if (!compressed)\r
                        continue;               // the plane is not used in this game\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index a0b587236b909dcad7b9bd71de40bb3334f6916b..0da3771bd8e48e739b048bf0ca67e9e5c41bdfc3 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -158,16 +158,11 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
                        dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA;       /* used for faster screen clearing */\r
                        vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/);\r
                        for(i = 0;i < 0x4000; i++) ptr[i] = 0x0000; // 0x4000 x dword = 64KB\r
+                       /* fix up the palette and everything */\r
+                       modexPalBlack();        //reset the palette~\r
                }\r
                break;\r
        }\r
-\r
-//     gv->video.page[0].ti.tw = gv->video.page[0].sw/TILEWH;\r
-//     gv->video.page[0].ti.th = gv->video.page[0].sh/TILEWH;\r
-\r
-       //TODO MAKE FLEXIBLE~\r
-//     gv->video.page[0].ti.tilemidposscreenx = gv->video.page[0].ti.tilesw;\r
-//     gv->video.page[0].ti.tilemidposscreeny = (gv->video.page[0].ti.tilesh/2)+1;\r
 }\r
 \r
 void\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 757ace2b7f7887731a0b7aaf00306b6682fe5fac..9fa1754125e085f823438c4ac18378b385a5dd0c 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 757ace2b7f7887731a0b7aaf00306b6682fe5fac
+Subproject commit 9fa1754125e085f823438c4ac18378b385a5dd0c

diff --git a/src/zcroll.c b/src/zcroll.c
index c5688601206d47326c575b63346d159c9df2b020..3723b201a5d642b4a4e1d0ee46d418d587dcb80e 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -103,11 +103,6 @@ void main(int argc, char *argv[])
 \r
        VGAmodeX(1/*bakapee*/, 1, &gvar);\r
 \r
-       /* fix up the palette and everything */\r
-#ifdef FADE\r
-       modexPalBlack();        //reset the palette~\r
-#endif\r
-\r
        /* load color palette */\r
        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
 \r