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

diff --git a/makefile b/makefile
index 6d6b065a78d66cdb8bc87066bba533510798f7f6..253037a7a14f93363768b346f4fc28c2e03355ef 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -537,8 +537,8 @@ wwwdo: .symbolic
        @wmake -s -h wwwext
 
 wwwext: .symbolic
-       @wmake -s -h wwwext1
        @wmake -s -h wwwext2
+       @wmake -s -h wwwext1
 
 wwwext1: .symbolic
        ####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 88ab4cdeb4c10985d37c5af1609bcffc9799e211..30d0cfa4350433978fbc4ee365695ff66d3089e5 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -501,9 +501,8 @@ typedef struct
 \r
 typedef struct mmblockstruct\r
 {\r
-       //word  start,length;\r
+       //word  start,length,           blob;   //for data larger than 64k\r
        word    start;  dword length;\r
-       //word  blob;   //for data larger than 64k\r
        unsigned        attributes;\r
        memptr          *useptr;        // pointer to the segment start\r
        struct mmblockstruct far *next;\r
@@ -771,7 +770,7 @@ typedef struct      //TODO: USE THIS!!!!
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r
-       memptr  spribuff;       //temp\r
+       memptr  spribuff[64];   //temp\r
 } ca_t;\r
 \r
 //==========================================================================\r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index e2fb8626913d54314191746a7f590524b9f7cd4e..de17fa971e8ea19a5a3248bccbe948e8883f357b 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -33,24 +33,24 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        uint16_t far *vrl_id_iter;\r
        uint32_t far *vrl_headers_offsets;\r
        struct vrl1_vgax_header far *curr_vrl;\r
-       uint32_t vrl_size;\r
+       uint16_t vrl_size;\r
        int num_of_vrl,i;\r
 \r
        switch(rlsw)\r
        {\r
                case 1:\r
-                       CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
-//TODO ++++                    CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+//TODO ++++                    CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
+                       CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
                break;\r
                case 0:\r
-                       CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
-//TODO ++++                    CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+//TODO ++++                    CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
+                       CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
                break;\r
        }\r
 \r
        // Insert sanity cheks later\r
-       enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
-//TODO ++++    enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;        //TODO: merge these 2 vars into 1\r
+//TODO ++++    enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
+       enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;        //TODO: merge these 2 vars into 1\r
        enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
        num_of_vrl = 0;\r
        vrl_id_iter = (uint16_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
@@ -68,8 +68,12 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 #ifdef __DEBUG_MM__\r
                        dbg_debugmm=0;\r
 #endif\r
-                       MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
-                       enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs;\r
+//                     MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+//                     enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs;\r
+                       MM_GetPtr(gvar->ca.spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+                       enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)(gvar->ca.spribuff);\r
+//                     MM_GetPtr(spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+//                     enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)spribuff;\r
                break;\r
        }\r
 #endif\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 75ab683247b5e6bea1014871737225c3a36c86d3..b7cbedd253331c62aa1088cc4ca66b410c88f847 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 75ab683247b5e6bea1014871737225c3a36c86d3
+Subproject commit b7cbedd253331c62aa1088cc4ca66b410c88f847

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 8bcc3e8d112d87babd8f55996cef9c5c274d744b..20836e3da5cdaa3ade4b483a08b99b15f4428110 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -42,7 +42,8 @@
 #define SPRITE\r
 //#define TILERENDER\r
 \r
-//0000#define SHOWFPS\r
+//0000\r
+#define SHOWFPS\r
 //#define OLDWALKSHOWPAGESTUFF\r
 \r
 \r