16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/HEAP.16W b/HEAP.16W
index aab6eb8e65f9f66b934d0b4ab83c97de20acb8f3..35aa4f0dc4311f43c3295cf33980c5174ab01136 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,41 +1,55 @@
 \r
        == near ==\r
 \r
-  USED block at 12c6:c706 of size 12\r
-  USED block at 12c6:c712 of size 322\r
-  USED block at 12c6:c854 of size 52\r
-  USED block at 12c6:c888 of size 20\r
-  USED block at 12c6:c89c of size 20\r
-  USED block at 12c6:c8b0 of size 20\r
-  USED block at 12c6:c8c4 of size 20\r
-  USED block at 12c6:c8d8 of size 20\r
-  FREE block at 12c6:c8ec of size 14096\r
+  USED block at 1e27:da06 of size 12\r
+  USED block at 1e27:da12 of size 320\r
+  USED block at 1e27:db52 of size 52\r
+  USED block at 1e27:db86 of size 20\r
+  USED block at 1e27:db9a of size 20\r
+  USED block at 1e27:dbae of size 20\r
+  USED block at 1e27:dbc2 of size 20\r
+  USED block at 1e27:dbd6 of size 20\r
+  FREE block at 1e27:dbea of size 9234\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 22c7:0016 of size 136\r
-  FREE block at 22c7:009e of size 48840\r
-  USED block at 22c7:bf66 of size 20\r
-  FREE block at 22c7:bf7a of size 16514\r
-  FREE block at 32c8:0016 of size 65510\r
-  FREE block at 42c9:0016 of size 65510\r
-  FREE block at 52ca:0016 of size 65510\r
-  FREE block at 62cb:0016 of size 65510\r
-  FREE block at 72cc:0016 of size 65510\r
-  FREE block at 82cd:0016 of size 65510\r
-  FREE block at 92ce:0016 of size 49174\r
-OK - end of heap\r
+  USED block at 2e28:0016 of size 65342\r
+  USED block at 2e28:ff54 of size 20\r
+  USED block at 2e28:ff68 of size 136\r
+  FREE block at 2e28:fff0 of size 12\r
+  USED block at 3e29:0016 of size 66\r
+  USED block at 3e29:0058 of size 50\r
+  USED block at 3e29:008a of size 50\r
+  USED block at 3e29:00bc of size 50\r
+  USED block at 3e29:00ee of size 50\r
+  USED block at 3e29:0120 of size 50\r
+  USED block at 3e29:0152 of size 50\r
+  USED block at 3e29:0184 of size 50\r
+  USED block at 3e29:01b6 of size 50\r
+  USED block at 3e29:01e8 of size 50\r
+  USED block at 3e29:021a of size 50\r
+  USED block at 3e29:024c of size 50\r
+  USED block at 3e29:027e of size 50\r
+  FREE block at 3e29:02b0 of size 29552\r
+  USED block at 3e29:7620 of size 1202\r
+  USED block at 3e29:7ad2 of size 1202\r
+  USED block at 3e29:7f84 of size 1202\r
+  USED block at 3e29:8436 of size 22\r
+  FREE block at 3e29:844c of size 8202\r
+  FREE block at 3e29:a456 of size 3148\r
+  FREE block at 3e29:b0a2 of size 0\r
+ERROR - bad node in heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
-Near              14582        486       14096\r
-Far               48992        156       48836\r
+Near              9718         484       9234\r
+Far               45170        4256      40914\r
 ----------------  --------   --------   --------\r
-HC_coreleft = 14094\r
-HC_farcoreleft = 521664\r
-HC_GetNearFreeSize = 14096\r
-HC_GetFarFreeSize = 507588\r
-coreleft = 14094\r
-farcoreleft = 521664\r
+HC_coreleft = 9232\r
+HC_farcoreleft = 396888\r
+HC_GetNearFreeSize = 9234\r
+HC_GetFarFreeSize = 40914\r
+coreleft = 9232\r
+farcoreleft = 396888\r
 stackavail = 23262\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index eae154cb111d33b75a0e6d5a0af86f445a779b93..88de7f7c7b678e57833f2ab3c80bd27af99aded2 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/makefile b/makefile
index 2e6ec7e40f1bee2158084bae620dd574674ab5a4..2fccbe8584918a0946de760feecd6a1ea7fce8fb 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -654,6 +654,7 @@ mx_: .symbolic
 
 !ifdef __LINUX__
 vrs: .symbolic
+vrl: .symbolic
 $(SPRIUTILEXEC):
        @cd $(DOSLIB_VGA:$(to_os_path))
        #@make clean

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index d48a46df0209adb979868a5d469edbf6e374523b..9bbdbb7c2fcc25731fe486f5421879422a4cc46f 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1889,7 +1889,7 @@ void CA_CacheGrChunk (int chunk)
        CAL_ExpandGrChunk (chunk,source);\r
 \r
        if (compressed>BUFFERSIZE)\r
-               MM_FreePtr(&bigbufferseg);\r
+               MM_FreePtr (MEMPTRCONV bigbufferseg);\r
 }\r
 */\r
 \r
@@ -1982,8 +1982,8 @@ void CA_CacheMap (global_game_variables_t *gvar)
                        source = gvar->mm.bufferseg;\r
                else\r
                {\r
-                       MM_GetPtr(&bigbufferseg,compressed, gvar);\r
-                       MM_SetLock (&bigbufferseg,true, gvar);\r
+                       MM_GetPtr(MEMPTRCONV bigbufferseg,compressed, gvar);\r
+                       MM_SetLock (MEMPTRCONV bigbufferseg,true, gvar);\r
                        source = bigbufferseg;\r
                }\r
 \r
@@ -2012,7 +2012,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
 #endif\r
 \r
                if (compressed>BUFFERSIZE)\r
-                       MM_FreePtr(&bigbufferseg, gvar);\r
+                       MM_FreePtr(MEMPTRCONV bigbufferseg, gvar);\r
        }\r
 }\r
 \r

diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c
index 2d747f67f7b51294da9901c880c653516ba73ac5..a2590cfa84637c1a35ec598d709b63290505ae6b 100755 (executable)
--- a/src/lib/16_hc.c
+++ b/src/lib/16_hc.c
@@ -52,22 +52,10 @@ long HC_Newfarcoreleft()
 #endif\r
 \r
 //from: https://stackoverflow.com/questions/14386856/c-check-available-ram\r
-void\r
-#ifdef __BORLANDC__\r
- *\r
-#endif\r
-#ifdef __WATCOMC__\r
- __near*\r
-#endif\r
-HC_LargestFreeBlock(size_t* Size)\r
+void __near* HC_LargestFreeBlock(size_t* Size)\r
 {\r
        size_t s0, s1;\r
-#ifdef __BORLANDC__\r
-       void * p;\r
-#endif\r
-#ifdef __WATCOMC__\r
        void __near* p;\r
-#endif\r
 \r
        s0 = ~(size_t)0 ^ (~(size_t)0 >> 1);\r
        while (s0 && (p = _nmalloc(s0)) == NULL)\r

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index 326be10b214ce0c28a7a03f56c2850c5271d4c6a..82c83c503aaf1eeb1b9d346ec94f74eed256dd7b 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -96,7 +96,7 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 #ifndef VRS_USECAMMPM\r
                vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
 #else\r
-               enti->spri.spritesheet.vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
+               enti->spri.spritesheet.vrl_line_offsets[i] = vrl1_vgax_genlineoffsets((struct vrl1_vgax_header *)curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
 #endif\r
        }\r
 #ifndef VRS_USECAMMPM\r
@@ -294,7 +294,7 @@ void init_anim(struct sprite *spri, int anim_index)
        spri->curr_spri_id = anim_list[0].sprite_id;\r
        spri->delay = anim_list[0].delay;\r
 \r
-       spri->curr_anim_list = anim_list;\r
+       spri->curr_anim_list = (struct vrs_animation_list_entry_t *)anim_list;\r
 }\r
 \r
 int set_anim_by_id(struct sprite *spri, int anim_id)\r

diff --git a/src/lib/16_spri.h b/src/lib/16_spri.h
index 0d23f3c80b3e68dfececb74242ccf6124c08fb09..9426ef2bcc4161a7d0074d27e561e0b4934ac0cf 100755 (executable)
--- a/src/lib/16_spri.h
+++ b/src/lib/16_spri.h
@@ -81,7 +81,7 @@ void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 * int - operation status\r
 * to the requested .vrl blob\r
 */\r
-int get_vrl_by_id(struct vrs_container *vrs_cont, uint16_t id, struct vrl_container * vrl_cont);\r
+int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont);\r
 \r
 void DrawVRL (unsigned int x,unsigned int y,struct vrl1_vgax_header *hdr,vrl1_vgax_offset_t *lineoffs/*array hdr->width long*/,unsigned char *data,unsigned int datasz);\r
 \r

diff --git a/src/lib/16_timer.c b/src/lib/16_timer.c
index d6301c683fc61b3380aa0dda6896476d77b770ea..35ddd0b176f38c597f2a8de3a8a25fde72331a64 100755 (executable)
--- a/src/lib/16_timer.c
+++ b/src/lib/16_timer.c
@@ -29,7 +29,7 @@ clock_t start_timer(global_game_variables_t *gv)
        gv->kurokku.t = clock();\r
        gv->kurokku.tiku = 0; gv->video.sfip = 0;\r
        gv->kurokku.clock_start = *clockw;\r
-       gv->kurokku.clock = clockw;\r
+       gv->kurokku.clock = (word *)clockw;\r
        gv->kurokku.wcpu = WCPU_detectcpu();\r
 \r
        //turn this off if XT\r

diff --git a/src/vrldbg.c b/src/vrldbg.c
index e6a409fc9adf27dad2f6c59151c54d8f1e8cf825..084f53491887389897bd6aacf0ebd49b228d4cc3 100755 (executable)
--- a/src/vrldbg.c
+++ b/src/vrldbg.c
@@ -15,7 +15,7 @@
 #include "src/lib/doslib/hw/vga/vrl.h"\r
 #include "src/lib/doslib/hw/vga/vrs.h"\r
 #include "src/lib/doslib/hw/vga/pcxfmt.h"\r
-#include "src/lib/doslib/hw/vga/comshtps.h"\r
+//#include "src/lib/doslib/hw/vga/comshtps.h"\r
 \r
 #ifndef O_BINARY\r
 #define O_BINARY (0)\r