X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_vrs.c;h=056366afd27a848d6f4a3bda074defbbc6a2f6ab;hb=f7eca98a1d4192cacd2cd3201a1e4eccbdc98b4d;hp=fa1d96de3c48dbfcd5fd9f336ba984c7a640f93e;hpb=e9a094cdce9001737f17d3961f49f27272dff4e4;p=16.git

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
old mode 100755
new mode 100644
index fa1d96de..056366af
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -39,15 +39,15 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 	switch(rlsw)
 	{
 		case 1:
-			CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
+			CA_ReadFile(filename, &gvar->ca.spribuff, gvar);
 		break;
 		case 0:
-			CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
+			CA_LoadFile(filename, &gvar->ca.spribuff, gvar);
 		break;
 	}
 
 	// Insert sanity cheks later
-	enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;	//TODO: merge these 2 vars into 1
+	enti->spri.spritesheet.buffer = gvar->ca.spribuff;
 	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]);
@@ -112,15 +112,15 @@ void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 	switch(rlsw)
 	{
 		case 1:
-			CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);
+			CA_ReadFile(filename, &gvar->ca.spribuff, gvar);
 		break;
 		case 0:
-			CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);
+			CA_LoadFile(filename, &gvar->ca.spribuff, gvar);
 		break;
 	}
 
 	// Insert sanity cheks later
-	enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;
+	enti->spri.sprite_vrl_cont.buffer = gvar->ca.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