X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_vrs.c;fp=src%2Flib%2F16_vrs.c;h=b2a5dc8e0a76510db258d8733044eaafa1633d8b;hb=4f20e64bb53ad587bdcc68b0600ea3c7db221133;hp=f2c1c846538ad929f0e9c62ac24a13abab0c8ccf;hpb=47c09acbb1eb6319d7327313668c4f0ec268f31b;p=16.git diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c index f2c1c846..b2a5dc8e 100755 --- a/src/lib/16_vrs.c +++ b/src/lib/16_vrs.c @@ -26,7 +26,7 @@ void VRS_LoadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar) { //memptr big buffer; - static struct vrs_container vrsss; //vrs spritesheet + static struct vrs_container vrs; //vrs spritesheet vrl1_vgax_offset_t **vrl_line_offsets; uint16_t far *vrl_id_iter; uint32_t far *vrl_headers_offsets; @@ -46,10 +46,10 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia } // Insert sanity cheks later - vrsss.buffer = gvar->ca.spribuff; - vrsss.data_size = size - sizeof(struct vrl1_vgax_header); + vrs.buffer = gvar->ca.spribuff; + vrs.data_size = size - sizeof(struct vrl1_vgax_header); num_of_vrl = 0; - vrl_id_iter = (uint16_t far *)(vrsss.buffer + vrsss.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]); + vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]); while(vrl_id_iter[num_of_vrl]){ num_of_vrl++; } @@ -58,10 +58,10 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl); //++++ MM_GetPtr((memptr)(vrl_line_offsets), sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar); - vrl_headers_offsets = (uint32_t far *)(vrsss.buffer + vrsss.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]); + vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]); // Calculate line offsets for each vrl for(i = 0; i < num_of_vrl; i++){ - curr_vrl = (struct vrl1_vgax_header far *)(vrsss.buffer + vrl_headers_offsets[i]); + curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]); // Calc. vrl size as (next_offset - curr_offset) if (i != num_of_vrl - 1){ @@ -69,14 +69,14 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia } // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset) else{ - vrl_size = vrsss.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header); + vrl_size = vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header); } vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size); } - vrsss.vrl_line_offsets = vrl_line_offsets; + vrs.vrl_line_offsets = vrl_line_offsets; free(vrl_line_offsets); - enti->spri.spritesheet = &vrsss; + enti->spri.spritesheet = &vrs; enti->spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container)); //++++ MM_GetPtr((memptr)(enti->spri.sprite_vrl_cont), sizeof(struct vrl_container), gvar); }