xcrollbroke

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

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index 75908ace9267d61e923e9d6e1883d5f4e6f633ac..874a58b1f8b8b053324715710e72582177f126b2 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -25,8 +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
-       //memptr        big buffer;\r
-       static struct vrs_container vrs;\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
        uint16_t far *vrl_id_iter;\r
        uint32_t far *vrl_headers_offsets;\r
@@ -46,21 +44,21 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        }\r
 \r
        // Insert sanity cheks later\r
-       vrs.buffer = gvar->ca.spribuff;\r
-       vrs.data_size = size - sizeof(struct vrl1_vgax_header);\r
+       enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
+       enti->spri.spritesheet.data_size = size - sizeof(struct vrl1_vgax_header);\r
        num_of_vrl = 0;\r
-       vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\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
        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);\r
+       vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\r
 \r
-       vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+       vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
        // Calculate line offsets for each vrl\r
        for(i = 0; i < num_of_vrl; i++){\r
-               curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]);\r
+               curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.spritesheet.buffer + vrl_headers_offsets[i]);\r
 \r
                // Calc. vrl size as (next_offset - curr_offset)\r
                if (i != num_of_vrl - 1){\r
@@ -68,73 +66,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
-                       vrl_size = vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\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
                }\r
                vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
        }\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));\r
-}\r
-\r
-// Read .vrs file into far memory\r
-int read_vrs(global_game_variables_t *gvar, char *filename, struct vrs_container *vrs_cont){\r
-       int fd;\r
-       dword size;\r
-       byte far *buffer;\r
-       vrl1_vgax_offset_t **vrl_line_offsets;\r
-       uint32_t far *vrl_headers_offsets;\r
-       uint16_t far *vrl_id_iter;\r
-       uint32_t vrl_size;\r
-       int num_of_vrl=0, i;\r
-       struct vrl1_vgax_header far *curr_vrl;\r
-       int success=1;\r
-\r
-       // Open filename, get size of file,\r
-       // populate the vrs_container if all tests pass\r
-       fd = open(filename, O_RDONLY|O_BINARY);\r
-       // Insert sanity cheks later\r
-       size = lseek(fd, 0, SEEK_END);\r
-       buffer = malloc(size);\r
-       lseek(fd, 0, SEEK_SET);\r
-       read(fd, buffer, size);\r
-       close(fd);\r
-       if(!success)\r
-       {\r
-               fprintf(stderr, "Unable to load file");\r
-               exit(3);\r
-       }\r
-       vrs_cont->data_size = size - sizeof(struct vrs_header);\r
-       vrs_cont->buffer = buffer;\r
-\r
-       // Calculate vrl offsets\r
-\r
-       // Count sprites\r
-       vrl_id_iter = (uint16_t far *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
-       while(vrl_id_iter[num_of_vrl]){\r
-               num_of_vrl++;\r
-       }\r
-       // Allocate memory for vrl line offsets table\r
-       vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);\r
-\r
-       vrl_headers_offsets = (uint32_t far *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
-       // Calculate line offsets for each vrl\r
-       for(i = 0; i < num_of_vrl; i++){\r
-               curr_vrl = (struct vrl1_vgax_header far *)(buffer + vrl_headers_offsets[i]);\r
-\r
-               // Calc. vrl size as (next_offset - curr_offset)\r
-               if (i != num_of_vrl - 1){\r
-                       vrl_size = vrl_headers_offsets[i+1] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
-               }\r
-               // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)\r
-               else{\r
-                       vrl_size = vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
-               }\r
-               vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
-       }\r
-       vrs_cont->vrl_line_offsets = vrl_line_offsets;\r
-       return 0;\r
+       enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;\r
 }\r
 \r
 // Seek and return a specified .vrl blob from .vrs blob in far memory\r