__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

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

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index 4b2243b1f6996013a6e24a48fe8c802ba60a67fc..1c317bba5be30ecdc9b2e30a531fe1f0fd637afe 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -25,9 +25,6 @@ void VRS_ReadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){
 void VRS_LoadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){       VRS_OpenVRS(filename, enti, 0, gvar);   }\r
 void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)\r
 {\r
-#ifndef VRSVRLNONPTR\r
-       static struct vrs_container vrs;\r
-#endif\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
        uint16_t far *vrl_id_iter;\r
        uint32_t far *vrl_headers_offsets;\r
@@ -47,37 +44,20 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        }\r
 \r
        // Insert sanity cheks later\r
-#ifndef VRSVRLNONPTR\r
-       vrs.buffer = gvar->ca.spribuff;\r
-       vrs.data_size = size - sizeof(struct vrl1_vgax_header);\r
-#else\r
        enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
        enti->spri.spritesheet.data_size = size - sizeof(struct vrl1_vgax_header);\r
-#endif\r
        num_of_vrl = 0;\r
-#ifndef VRSVRLNONPTR\r
-       vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
-#else\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
-#endif\r
        while(vrl_id_iter[num_of_vrl]){\r
                num_of_vrl++;\r
        }\r
 \r
        // Allocate memory for vrl line offsets table\r
        vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\r
-#ifndef VRSVRLNONPTR\r
-       vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
-#else\r
        vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
-#endif\r
        // Calculate line offsets for each vrl\r
        for(i = 0; i < num_of_vrl; i++){\r
-#ifndef VRSVRLNONPTR\r
-               curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]);\r
-#else\r
                curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.spritesheet.buffer + vrl_headers_offsets[i]);\r
-#endif\r
 \r
                // Calc. vrl size as (next_offset - curr_offset)\r
                if (i != num_of_vrl - 1){\r
@@ -85,22 +65,11 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
                }\r
                // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)\r
                else{\r
-#ifndef VRSVRLNONPTR\r
-                       vrl_size = vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
-#else\r
                        vrl_size = enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
-#endif\r
                }\r
                vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
        }\r
-#ifndef VRSVRLNONPTR\r
-       vrs.vrl_line_offsets = vrl_line_offsets;\r
-\r
-       enti->spri.spritesheet = &vrs;\r
-       enti->spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));//TODO: USE MM_ CA_ AND PM_\r
-#else\r
        enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;\r
-#endif\r
 }\r
 \r
 // Seek and return a specified .vrl blob from .vrs blob in far memory\r