X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_vrs.c;h=e2fb8626913d54314191746a7f590524b9f7cd4e;hb=a91efe059497d5861aa214c0f5f523ebb9f21e29;hp=834754dddc2928f7b548465ebee63f6fed20ea13;hpb=0e305ed530c51bad26fa3048c8e1c138d547d946;p=16.git

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index 834754dd..e2fb8626 100755
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -35,21 +35,23 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 	struct vrl1_vgax_header far *curr_vrl;
 	uint32_t vrl_size;
 	int num_of_vrl,i;
-	int size=0;
 
 	switch(rlsw)
 	{
 		case 1:
 			CA_ReadFile(filename, &gvar->ca.spribuff, gvar);
+//TODO ++++			CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
 		break;
 		case 0:
 			CA_LoadFile(filename, &gvar->ca.spribuff, gvar);
+//TODO ++++			CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
 		break;
 	}
 
 	// Insert sanity cheks later
 	enti->spri.spritesheet.buffer = gvar->ca.spribuff;
-	enti->spri.spritesheet.data_size = size - sizeof(struct vrl1_vgax_header);
+//TODO ++++	enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;	//TODO: merge these 2 vars into 1
+	enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - 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]){
@@ -60,8 +62,16 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 #ifndef VRS_USECAMMPM
 	vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_
 #else
-	MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);
-	enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs[0];
+	switch(rlsw)
+	{
+		case 0:
+#ifdef __DEBUG_MM__
+			dbg_debugmm=0;
+#endif
+			MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);
+			enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs;
+		break;
+	}
 #endif
 
 	vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
@@ -86,77 +96,62 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 #ifndef VRS_USECAMMPM
 	enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;
 #endif
+//	printf("VRS_OpenVRS\n");
+//	printf("	vrl_size=%lu\n\n",vrl_size);
 }
 
+#if 0
+//
 void VRS_ReadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){	VRS_OpenVRL(filename, enti, 1, gvar);	}
 void VRS_LoadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){	VRS_OpenVRL(filename, enti, 0, gvar);	}
 void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)
 {
-	vrl1_vgax_offset_t *vrl_line_offsets;
-//	struct vrl1_vgax_header *vrl_header;
-//	uint16_t far *vrl_id_iter;
+#ifndef VRL_USECAMMPM
+	vrl1_vgax_offset_t *line_offsets;
+#endif
 //	uint32_t far *vrl_headers_offsets;
-//	struct vrl1_vgax_header far *curr_vrl;
-	uint32_t vrl_size;
-//	int num_of_vrl,i;
-	int size=0;
+	struct vrl1_vgax_header far *curr_vrl;
 
 	switch(rlsw)
 	{
 		case 1:
-			CA_ReadFile(filename, &gvar->ca.spribuff, gvar);
+			CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);
 		break;
 		case 0:
-			CA_LoadFile(filename, &gvar->ca.spribuff, gvar);
+			CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);
 		break;
 	}
 
 	// Insert sanity cheks later
-	enti->spri.sprite_vrl_cont.buffer = gvar->ca.spribuff;
-	enti->spri.sprite_vrl_cont.data_size = size - sizeof(struct vrl1_vgax_header);
-
-	vrl_size = enti->spri.sprite_vrl_cont.buffer - enti->spri.sprite_vrl_cont.buffer - sizeof(struct vrl1_vgax_header);
-//	vrl_header = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.buffer);
-#if 0
-	num_of_vrl = 0;
-	while(vrl_id_iter[num_of_vrl]){
-		num_of_vrl++;
-	}
+	enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;
+	enti->spri.sprite_vrl_cont.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);
 
 	// Allocate memory for vrl line offsets table
-//#ifndef VRS_USECAMMPM
-	vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_
-//#else
-	MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);
-	enti->spri.sprite_vrl_cont.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs[0];
-//#endif
+#ifndef VRL_USECAMMPM
+	line_offsets = malloc(sizeof(vrl1_vgax_offset_t *));//TODO: USE MM_ CA_ AND PM_
+#else
+	MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *), gvar);
+	enti->spri.sprite_vrl_cont.line_offsets = (vrl1_vgax_offset_t *)gvar->ca.grsegs[0];
+#endif
 
-	vrl_headers_offsets = (uint32_t far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
+	//vrl_headers_offsets = (uint32_t far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRL_HEADER_OFFSET_VRL_LIST]);
 	// Calculate line offsets for each vrl
-	for(i = 0; i < num_of_vrl; i++){
-		curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer + vrl_headers_offsets[i]);
+		curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer);// + vrl_headers_offsets);
 
-		// 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 = enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);
-		}
-#ifndef VRS_USECAMMPM
-		vrl_line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);
+#ifndef VRL_USECAMMPM
+		line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));
 #else
-		enti->spri.sprite_vrl_cont.vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);
-#endif
-	}
+		enti->spri.sprite_vrl_cont.line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));
 #endif
 
-		vrl_line_offsets = vrl1_vgax_genlineoffsets(enti->spri.sprite_vrl_cont.vrl_header,	(byte *)enti->spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header),	vrl_size);
-#ifndef VRS_USECAMMPM
-	enti->spri.sprite_vrl_cont.vrl_line_offsets = vrl_line_offsets;
+#ifndef VRL_USECAMMPM
+	enti->spri.sprite_vrl_cont.line_offsets = line_offsets;
 #endif
+	printf("VRS_OpenVRL\n");
+	printf("	vrl_size=%lu\n\n",sizeof(enti->spri.spritesheet.buffer));
 }
+//
+#endif
 
 // Seek and return a specified .vrl blob from .vrs blob in far memory
 int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){