__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index de168acfd81d73b23a31fd22dc03b7a48f7fdb6a..c20ab03b0341943064dbbe87dd80bec05fd32f08 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -203,9 +203,9 @@ int newloadmap(char *mn, map_t *map) {
        else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
        extract_map(js, tok, tokcount, map);\r
 \r
-       free(js);\r
-       free(tok);\r
-       fclose(fh);\r
+       free(js);       //TODO: USE MM_ CA_ AND PM_\r
+       free(tok);      //TODO: USE MM_ CA_ AND PM_\r
+       fclose(fh);     //TODO: USE MM_ CA_ AND PM_\r
 \r
        return 0;\r
 }\r
@@ -230,7 +230,7 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        file_s = filesize(fh);\r
        CA_LoadFile(mn, &MAPBUFINLM, gvar);\r
        tokcount = jsmn_parse(&p, MAPBUFINLM, file_s, NULL, 0);\r
-       tok = malloc(tokcount*sizeof(jsmntok_t));\r
+       tok = malloc(tokcount*sizeof(jsmntok_t));//TODO: USE MM_ CA_ AND PM_\r
 //     printf("Allocated %d tokens", tokcount);\r
        jsmn_init(&p);\r
        if((status = jsmn_parse(&p, MAPBUFINLM, file_s, tok, tokcount)) < 0)\r
@@ -241,8 +241,8 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
        extract_map(MAPBUFINLM, tok, tokcount, map);\r
 \r
-       free(tok);\r
-       fclose(fh);\r
+       free(tok);      //TODO: USE MM_ CA_ AND PM_\r
+       fclose(fh);     //TODO: USE MM_ CA_ AND PM_\r
 \r
        return 0;\r
 }\r

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index f4c795371490c4eef4fdb2d2b5ecef499575f549..cde64ac644a96ca318e0d296f53ba0017375e31a 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -25,7 +25,7 @@
 char* get_curr_anim_name(struct sprite *spri)\r
 {\r
        // Retrive animation name list\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+       struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
        uint32_t far *anim_names_offsets =      (uint32_t far *)\r
                                                ((byte far *)vrs +\r
                                                 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_NAME_LIST]);\r
@@ -35,7 +35,7 @@ char* get_curr_anim_name(struct sprite *spri)
 \r
 void init_anim(struct sprite *spri, int anim_index)\r
 {\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+       struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
        uint32_t far *anim_lists_offsets =      (uint32_t far *)\r
                                                ((byte far *)vrs +\r
                                                 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_LIST]);\r
@@ -56,7 +56,7 @@ int set_anim_by_id(struct sprite *spri, int anim_id)
 {\r
        int new_anim_index = 0;\r
        int iter_id;\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+       struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
        // Retruve animation ids list\r
         uint16_t far *anim_ids =       (uint16_t far *)\r
                                        ((byte far *)vrs +\r
@@ -80,7 +80,7 @@ void print_anim_ids(struct sprite *spri)
 {\r
        int new_anim_index = 0;\r
        int iter_id;\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+       struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
        // Retruve animation ids list\r
         uint16_t far *anim_ids =       (uint16_t far *)\r
                                        ((byte far *)vrs +\r
@@ -148,7 +148,7 @@ void animate_spri(entity_t *enti, video_t *video)
 \r
 \r
        // Draw sprite\r
-       j = get_vrl_by_id(enti->spri.spritesheet, enti->spri.curr_spri_id, enti->spri.sprite_vrl_cont);\r
+       j = get_vrl_by_id(&enti->spri.spritesheet, enti->spri.curr_spri_id, &enti->spri.sprite_vrl_cont);\r
        if(j < 0)\r
        {\r
                //Quit (gv, "Error retriving required sprite");\r
@@ -162,8 +162,8 @@ void animate_spri(entity_t *enti, video_t *video)
                        else rx = -(video->page[0].dx);\r
                if (y >= enti->overdrawh) ry = (y - enti->overdrawh);\r
                        else ry = -(video->page[0].dy);\r
-               h = enti->spri.sprite_vrl_cont->vrl_header->height + enti->overdrawh + y - ry;\r
-               w = (x + enti->spri.sprite_vrl_cont->vrl_header->width + (enti->overdraww*2) + 3 - rx) & (~3) - enti->overdraww;//round up\r
+               h = enti->spri.sprite_vrl_cont.vrl_header->height + enti->overdrawh + y - ry;\r
+               w = (x + enti->spri.sprite_vrl_cont.vrl_header->width + (enti->overdraww*2) + 3 - rx) & (~3) - enti->overdraww;//round up\r
                if ((rx+w) > video->page[0].width) w = video->page[0].width-rx;\r
                if ((ry+h) > video->page[0].height) h = video->page[0].height-ry;\r
 \r
@@ -190,10 +190,10 @@ void animate_spri(entity_t *enti, video_t *video)
        draw_vrl1_vgax_modex(\r
                x-rx,\r
                y-ry,\r
-               enti->spri.sprite_vrl_cont->vrl_header,\r
-               enti->spri.sprite_vrl_cont->line_offsets,\r
-               enti->spri.sprite_vrl_cont->buffer + sizeof(struct vrl1_vgax_header),\r
-               enti->spri.sprite_vrl_cont->data_size\r
+               enti->spri.sprite_vrl_cont.vrl_header,\r
+               enti->spri.sprite_vrl_cont.line_offsets,\r
+               enti->spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header),\r
+               enti->spri.sprite_vrl_cont.data_size\r
        );\r
 #endif\r
        if(!video->rss)\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index e059fedfd607b8eaf10967ab957712c6692823ec..2d027f613a2f9391aacf554eae5e0c59cf808620 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -66,12 +66,38 @@ typedef struct {
 \r
 //from 16_sprit.h\r
 #ifdef __WATCOMC__\r
+#include <hw/vga/vrl.h>\r
+\r
+typedef struct vrs_container{\r
+       // Size of a .vrs blob in memory\r
+       // minus header\r
+       dword data_size;\r
+       union{\r
+               byte far *buffer;\r
+               struct vrs_header far *vrs_hdr;\r
+       };\r
+       // Array of corresponding vrl line offsets\r
+       vrl1_vgax_offset_t **vrl_line_offsets;\r
+} vrs_container_t;\r
+\r
+typedef struct vrl_container{\r
+       // Size of a .vrl blob in memory\r
+       // minus header\r
+       dword data_size;\r
+       union{\r
+               byte far *buffer;\r
+               struct vrl1_vgax_header far *vrl_header;\r
+       };\r
+       // Pointer to a corresponding vrl line offsets struct\r
+       vrl1_vgax_offset_t *line_offsets;\r
+} vrl_container_t;\r
+\r
 typedef struct sprite\r
 {\r
        // VRS container from which we will extract animation and image data\r
-       struct vrs_container *spritesheet;\r
+       vrs_container_t spritesheet;\r
        // Container for a vrl sprite\r
-       struct vrl_container *sprite_vrl_cont;\r
+       vrl_container_t sprite_vrl_cont;\r
        // Current sprite id\r
        int curr_spri_id;\r
        // Index of a current sprite in an animation sequence\r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index efb62ba8fc4fd122a99683c7836ff00691c62b26..07c3bd5da2424efc53eeb19d89ae9cbc7c110df4 100755 (executable)
--- 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);   }\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
        vrl1_vgax_offset_t **vrl_line_offsets;\r
        uint16_t far *vrl_id_iter;\r
        uint32_t far *vrl_headers_offsets;\r
@@ -46,21 +44,21 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        }\r
 \r
        // Insert sanity cheks later\r
-       vrs.buffer = gvar->ca.spribuff;\r
-       vrs.data_size = size - sizeof(struct vrl1_vgax_header);\r
+       enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
+       enti->spri.spritesheet.data_size = size - 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
+       vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\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
@@ -68,14 +66,12 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
                }\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
                vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\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
+       enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;\r
+       free(vrl_line_offsets);//TODO: USE MM_ CA_ AND PM_\r
 }\r
 \r
 // Seek and return a specified .vrl blob from .vrs blob in far memory\r

diff --git a/src/lib/16_vrs.h b/src/lib/16_vrs.h
index 9a089f471f645c540160885a06eda40fbdae85a2..07e75321f767d7a95795474ee4f1ae6341a2b58d 100755 (executable)
--- a/src/lib/16_vrs.h
+++ b/src/lib/16_vrs.h
@@ -28,7 +28,7 @@
 //#include <hw/dos/dos.h>\r
 #include <hw/vga/vrl.h>\r
 #include "src/lib/16_ca.h"\r
-\r
+/*\r
 struct vrs_container{\r
        // Size of a .vrs lob in memory\r
        // minus header\r
@@ -40,7 +40,7 @@ struct vrs_container{
        // Array of corresponding vrl line offsets\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
 };\r
-\r
+*//*\r
 struct vrl_container{\r
        // Size of a .vrl blob in memory\r
        // minus header\r
@@ -52,7 +52,7 @@ struct vrl_container{
        // Pointer to a corresponding vrl line offsets struct\r
        vrl1_vgax_offset_t *line_offsets;\r
 };\r
-\r
+*/\r
 /* Read .vrs file into memory\r
 * In:\r
 * + char *filename - name of the file to load\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index be058acba0b1bbb3718b9ecf7c0c56f399303a0c..0e73d83b99492fb9eec83d1e8c5d7c8801fa6d82 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -576,8 +576,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                        modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!\r
                break;\r
                default:\r
-                       rx = (((i-1) % ((t->spri->sprite_vrl_cont->vrl_header->width)/t->tileWidth)) * t->tileWidth);\r
-                       ry = (((i-1) / ((t->spri->sprite_vrl_cont->vrl_header->height)/t->tileHeight)) * t->tileHeight);\r
+                       rx = (((i-1) % ((t->spri->sprite_vrl_cont.vrl_header->width)/t->tileWidth)) * t->tileWidth);\r
+                       ry = (((i-1) / ((t->spri->sprite_vrl_cont.vrl_header->height)/t->tileHeight)) * t->tileHeight);\r
 #ifndef TILERENDER\r
                        if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1);\r
 #else\r

diff --git a/src/vrstest.c b/src/vrstest.c
index 9e3a9ae1460e1b694501600c6d89373f048c3e2f..69ee777aa07db73990e8dbf0e454509e8d24dc39 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -154,8 +154,6 @@ void main()
        MM_DumpData(&gvar);\r
        MM_Report_(&gvar);\r
        Shutdown16(&gvar);\r
-       free(enti.spri.sprite_vrl_cont);\r
-       free(enti.spri.spritesheet->vrl_line_offsets);\r
        MM_FreePtr(&bigbuffer, &gvar);\r
        //MM_FreePtr(&((void __based(sega)*)enti.spri.spritesheet->buffer), &mm);\r
        //printf("CPU to VGA: %f\n", t1);\r