X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_vrs.c;h=874a58b1f8b8b053324715710e72582177f126b2;hb=86619c6a50b07c52481161da4b549ffb5e403e66;hp=f77119af4af5291b5067ed81d4ee0dd987f8dd02;hpb=63fe6f02c681d5afb8c32f6eadaacfc5f67d27cc;p=16.git

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index f77119af..874a58b1 100755
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -21,50 +21,44 @@
  */
 #include "src/lib/16_vrs.h"
 
-// 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;
+void VRS_ReadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){	VRS_OpenVRS(filename, enti, 1, 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)
+{
 	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;
+	uint32_t far *vrl_headers_offsets;
 	struct vrl1_vgax_header far *curr_vrl;
-	int success=1;
+	uint32_t vrl_size;
+	int num_of_vrl,i;
+	int size=0;
 
-	// 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)
+	switch(rlsw)
 	{
-		fprintf(stderr, "Unable to load file");
-		exit(3);
+		case 1:
+			CA_ReadFile(filename, &gvar->ca.spribuff, gvar);
+		break;
+		case 0:
+			CA_LoadFile(filename, &gvar->ca.spribuff, gvar);
+		break;
 	}
-	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]);
+	// Insert sanity cheks later
+	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 *)(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 *)(buffer + vrs_cont->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 *)(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){
@@ -72,12 +66,11 @@ int read_vrs(global_game_variables_t *gvar, char *filename, struct vrs_container
 		}
 		// 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_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_cont->vrl_line_offsets = vrl_line_offsets;
-	return 0;
+	enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;
 }
 
 // Seek and return a specified .vrl blob from .vrs blob in far memory