xcroll fuckings please ignore and go to e9a094cdce9001737f17d3961f49f27272dff4e4

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

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
old mode 100755 (executable)
new mode 100644 (file)
index fa1d96d..056366a
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -39,15 +39,15 @@ 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
                break;\r
                case 0:\r
-                       CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_LoadFile(filename, &gvar->ca.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
        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
@@ -112,15 +112,15 @@ void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        switch(rlsw)\r
        {\r
                case 1:\r
-                       CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
                break;\r
                case 0:\r
-                       CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
                break;\r
        }\r
 \r
        // Insert sanity cheks later\r
-       enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;\r
+       enti->spri.sprite_vrl_cont.buffer = gvar->ca.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