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

[16.git] / src / lib / 16_vrs.c

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index 0edcf627dc6fa83505673ff14c96c1a33994d966..e2fb8626913d54314191746a7f590524b9f7cd4e 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -40,14 +40,17 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        {\r
                case 1:\r
                        CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
+//TODO ++++                    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
                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
        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
@@ -59,8 +62,16 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 #ifndef VRS_USECAMMPM\r
        vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\r
 #else\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
+       switch(rlsw)\r
+       {\r
+               case 0:\r
+#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
+               break;\r
+       }\r
 #endif\r
 \r
        vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
@@ -104,15 +115,15 @@ void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        switch(rlsw)\r
        {\r
                case 1:\r
-                       CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
+                       CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
                break;\r
                case 0:\r
-                       CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
+                       CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
                break;\r
        }\r
 \r
        // Insert sanity cheks later\r
-       enti->spri.sprite_vrl_cont.buffer = gvar->ca.spribuff;\r
+       enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;\r
        enti->spri.sprite_vrl_cont.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
 \r
        // Allocate memory for vrl line offsets table\r