X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_vrs.c;h=07c3bd5da2424efc53eeb19d89ae9cbc7c110df4;hb=0902e0e217ef1eb91af959aa8ab47f355f6678e9;hp=0b3fc8f5bf78b6c487a8c67dc3f8895f8a8c7060;hpb=53acdb7d0d8aebdc481eb91bd9369f3b49f8218d;p=16.git

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