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

[16.git] / src / lib / 16_spri.c

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index 063c2cd1f83f3ae42108c42b0ab3b1d46d69f7b1..cde64ac644a96ca318e0d296f53ba0017375e31a 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -25,11 +25,7 @@
 char* get_curr_anim_name(struct sprite *spri)\r
 {\r
        // Retrive animation name list\r
-#ifndef VRSVRLNONPTR\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
-#else\r
        struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
-#endif\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
@@ -39,11 +35,7 @@ char* get_curr_anim_name(struct sprite *spri)
 \r
 void init_anim(struct sprite *spri, int anim_index)\r
 {\r
-#ifndef VRSVRLNONPTR\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
-#else\r
        struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
-#endif\r
        uint32_t far *anim_lists_offsets =      (uint32_t far *)\r
                                                ((byte far *)vrs +\r
                                                 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_LIST]);\r
@@ -64,11 +56,7 @@ int set_anim_by_id(struct sprite *spri, int anim_id)
 {\r
        int new_anim_index = 0;\r
        int iter_id;\r
-#ifndef VRSVRLNONPTR\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
-#else\r
        struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
-#endif\r
        // Retruve animation ids list\r
         uint16_t far *anim_ids =       (uint16_t far *)\r
                                        ((byte far *)vrs +\r
@@ -92,11 +80,7 @@ void print_anim_ids(struct sprite *spri)
 {\r
        int new_anim_index = 0;\r
        int iter_id;\r
-#ifndef VRSVRLNONPTR\r
-       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
-#else\r
        struct vrs_header far *vrs = spri->spritesheet.vrs_hdr;\r
-#endif\r
        // Retruve animation ids list\r
         uint16_t far *anim_ids =       (uint16_t far *)\r
                                        ((byte far *)vrs +\r
@@ -164,11 +148,7 @@ void animate_spri(entity_t *enti, video_t *video)
 \r
 \r
        // Draw sprite\r
-#ifndef VRSVRLNONPTR\r
-       j = get_vrl_by_id(enti->spri.spritesheet, enti->spri.curr_spri_id, enti->spri.sprite_vrl_cont);\r
-#else\r
        j = get_vrl_by_id(&enti->spri.spritesheet, enti->spri.curr_spri_id, &enti->spri.sprite_vrl_cont);\r
-#endif\r
        if(j < 0)\r
        {\r
                //Quit (gv, "Error retriving required sprite");\r
@@ -182,13 +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
-#ifndef VRSVRLNONPTR\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
-#else\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
-#endif\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
@@ -215,17 +190,10 @@ void animate_spri(entity_t *enti, video_t *video)
        draw_vrl1_vgax_modex(\r
                x-rx,\r
                y-ry,\r
-#ifndef VRSVRLNONPTR\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
-#else\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
-#endif\r
        );\r
 #endif\r
        if(!video->rss)\r