/* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
*\r
* This file is part of Project 16.\r
*\r
*/\r
#include "src/lib/16_vrs.h"\r
\r
+#define VRS_USECAMMPM\r
+\r
void VRS_ReadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRS(filename, enti, 1, gvar); }\r
void VRS_LoadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRS(filename, enti, 0, gvar); }\r
void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)\r
{\r
- //memptr big buffer;\r
- static struct vrs_container vrs;\r
+#ifndef VRS_USECAMMPM\r
vrl1_vgax_offset_t **vrl_line_offsets;\r
+#endif\r
uint16_t far *vrl_id_iter;\r
uint32_t far *vrl_headers_offsets;\r
struct vrl1_vgax_header far *curr_vrl;\r
- uint32_t vrl_size;\r
+ uint16_t vrl_size;\r
int num_of_vrl,i;\r
- int size=0;\r
\r
switch(rlsw)\r
{\r
case 1:\r
- CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
+//TODO ++++ CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
+ CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
break;\r
case 0:\r
- CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
+//TODO ++++ CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
+ CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
break;\r
}\r
\r
// Insert sanity cheks later\r
- vrs.buffer = gvar->ca.spribuff;\r
- vrs.data_size = size - sizeof(struct vrl1_vgax_header);\r
+//TODO ++++ enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
+ enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff; //TODO: merge these 2 vars into 1\r
+ enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
num_of_vrl = 0;\r
- vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
+ vrl_id_iter = (uint16_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
while(vrl_id_iter[num_of_vrl]){\r
num_of_vrl++;\r
}\r
\r
// Allocate memory for vrl line offsets table\r
- vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);\r
+#ifndef VRS_USECAMMPM\r
+ vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\r
+#else\r
+ switch(rlsw)\r
+ {\r
+ case 0:\r
+#ifdef __DEBUG_MM__\r
+ dbg_debugmm=0;\r
+#endif\r
+// MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+// enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs;\r
+ MM_GetPtr(gvar->ca.spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+ enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)(gvar->ca.spribuff);\r
+// MM_GetPtr(spribuff, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+// enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)spribuff;\r
+ break;\r
+ }\r
+#endif\r
\r
- vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+ vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
// Calculate line offsets for each vrl\r
for(i = 0; i < num_of_vrl; i++){\r
- curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]);\r
+ curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.spritesheet.buffer + vrl_headers_offsets[i]);\r
\r
// Calc. vrl size as (next_offset - curr_offset)\r
if (i != num_of_vrl - 1){\r
}\r
// If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)\r
else{\r
- vrl_size = vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
+ vrl_size = enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
}\r
+#ifndef VRS_USECAMMPM\r
vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
+#else\r
+ enti->spri.spritesheet.vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
+#endif\r
}\r
- vrs.vrl_line_offsets = vrl_line_offsets;\r
-\r
- enti->spri->spritesheet = &vrs;\r
- enti->spri->sprite_vrl_cont = malloc(sizeof(struct vrl_container));\r
+#ifndef VRS_USECAMMPM\r
+ enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;\r
+#endif\r
+// printf("VRS_OpenVRS\n");\r
+// printf(" vrl_size=%lu\n\n",vrl_size);\r
}\r
\r
-// Read .vrs file into far memory\r
-int read_vrs(global_game_variables_t *gvar, char *filename, struct vrs_container *vrs_cont){\r
- int fd;\r
- dword size;\r
- byte far *buffer;\r
- vrl1_vgax_offset_t **vrl_line_offsets;\r
- uint32_t far *vrl_headers_offsets;\r
- uint16_t far *vrl_id_iter;\r
- uint32_t vrl_size;\r
- int num_of_vrl=0, i;\r
+#if 0\r
+//\r
+void VRS_ReadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRL(filename, enti, 1, gvar); }\r
+void VRS_LoadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRL(filename, enti, 0, gvar); }\r
+void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)\r
+{\r
+#ifndef VRL_USECAMMPM\r
+ vrl1_vgax_offset_t *line_offsets;\r
+#endif\r
+// uint32_t far *vrl_headers_offsets;\r
struct vrl1_vgax_header far *curr_vrl;\r
- int success=1;\r
\r
- // Open filename, get size of file,\r
- // populate the vrs_container if all tests pass\r
- fd = open(filename, O_RDONLY|O_BINARY);\r
- // Insert sanity cheks later\r
- size = lseek(fd, 0, SEEK_END);\r
- buffer = malloc(size);\r
- lseek(fd, 0, SEEK_SET);\r
- read(fd, buffer, size);\r
- close(fd);\r
- if(!success)\r
+ switch(rlsw)\r
{\r
- fprintf(stderr, "Unable to load file");\r
- exit(3);\r
+ case 1:\r
+ CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+ break;\r
+ case 0:\r
+ CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+ break;\r
}\r
- vrs_cont->data_size = size - sizeof(struct vrs_header);\r
- vrs_cont->buffer = buffer;\r
\r
- // Calculate vrl offsets\r
+ // Insert sanity cheks later\r
+ enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;\r
+ enti->spri.sprite_vrl_cont.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
\r
- // Count sprites\r
- vrl_id_iter = (uint16_t far *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
- while(vrl_id_iter[num_of_vrl]){\r
- num_of_vrl++;\r
- }\r
// Allocate memory for vrl line offsets table\r
- vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);\r
-\r
- vrl_headers_offsets = (uint32_t far *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+#ifndef VRL_USECAMMPM\r
+ line_offsets = malloc(sizeof(vrl1_vgax_offset_t *));//TODO: USE MM_ CA_ AND PM_\r
+#else\r
+ MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *), gvar);\r
+ enti->spri.sprite_vrl_cont.line_offsets = (vrl1_vgax_offset_t *)gvar->ca.grsegs[0];\r
+#endif\r
+\r
+ //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]);\r
// Calculate line offsets for each vrl\r
- for(i = 0; i < num_of_vrl; i++){\r
- curr_vrl = (struct vrl1_vgax_header far *)(buffer + vrl_headers_offsets[i]);\r
-\r
- // Calc. vrl size as (next_offset - curr_offset)\r
- if (i != num_of_vrl - 1){\r
- vrl_size = vrl_headers_offsets[i+1] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
- }\r
- // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)\r
- else{\r
- vrl_size = vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
- }\r
- vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
- }\r
- vrs_cont->vrl_line_offsets = vrl_line_offsets;\r
- return 0;\r
+ curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer);// + vrl_headers_offsets);\r
+\r
+#ifndef VRL_USECAMMPM\r
+ line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));\r
+#else\r
+ 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));\r
+#endif\r
+\r
+#ifndef VRL_USECAMMPM\r
+ enti->spri.sprite_vrl_cont.line_offsets = line_offsets;\r
+#endif\r
+ printf("VRS_OpenVRL\n");\r
+ printf(" vrl_size=%lu\n\n",sizeof(enti->spri.spritesheet.buffer));\r
}\r
+//\r
+#endif\r
\r
// Seek and return a specified .vrl blob from .vrs blob in far memory\r
int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){\r
projects / 16.git / blobdiff