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 fa1d96de3c48dbfcd5fd9f336ba984c7a640f93e..e2fb8626913d54314191746a7f590524b9f7cd4e 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -39,15 +39,18 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        switch(rlsw)\r
        {\r
                case 1:\r
-                       CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\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, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\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 = enti->spri.spritesheet.spribuff;        //TODO: merge these 2 vars into 1\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