[16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index 9474db20876271468f601c0a6a5e6928625b4d8b..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
@@ -103,8 +103,8 @@ void animate_spri(entity_t *enti, video_t *video)
        int x,y,rx,ry,w,h;\r
        VGA_RAM_PTR omemptr = (VGA_RAM_PTR)video->page[0].data;// save original mem ptr\r
 \r
-       x=enti->spri->x;\r
-       y=enti->spri->y;\r
+       x=enti->spri.x;\r
+       y=enti->spri.y;\r
        VL_Initofs(video);\r
 \r
        // Depending on delay, update indices\r
@@ -119,7 +119,7 @@ void animate_spri(entity_t *enti, video_t *video)
        vga_wm1_mem_block_copy(copy_ofs,        display_ofs,    vga_state.vga_stride * vga_state.vga_height);\r
        vga_restore_rm0wm0();*/\r
 \r
-       switch(enti->spri->delay)\r
+       switch(enti->spri.delay)\r
        {\r
                // Delay = 0 means that sprite should loop. Nothing to change here\r
                case 0:\r
@@ -128,18 +128,18 @@ void animate_spri(entity_t *enti, video_t *video)
                // Delay = 1 means that on next time unit sprite should be changed\r
                case 1:\r
                        INC_PER_FRAME\r
-                       enti->spri->curr_anim_spri++;\r
+                       enti->spri.curr_anim_spri++;\r
 \r
                        // If we hit the end of an animation sequence, restart it\r
-                       if(!(   enti->spri->curr_spri_id = enti->spri->curr_anim_list[enti->spri->curr_anim_spri].sprite_id)){\r
-                               enti->spri->curr_anim_spri = 0;\r
-                               enti->spri->curr_spri_id = enti->spri->curr_anim_list[enti->spri->curr_anim_spri].sprite_id;\r
+                       if(!(   enti->spri.curr_spri_id = enti->spri.curr_anim_list[enti->spri.curr_anim_spri].sprite_id)){\r
+                               enti->spri.curr_anim_spri = 0;\r
+                               enti->spri.curr_spri_id = enti->spri.curr_anim_list[enti->spri.curr_anim_spri].sprite_id;\r
                        }\r
-                       enti->spri->delay = enti->spri->curr_anim_list[enti->spri->curr_anim_spri].delay;\r
+                       enti->spri.delay = enti->spri.curr_anim_list[enti->spri.curr_anim_spri].delay;\r
 \r
                // Delay > 1 means that we should not change sprite yet. Decrease delay\r
                default:\r
-                       enti->spri->delay--;\r
+                       enti->spri.delay--;\r
                break;\r
        }\r
 \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
@@ -215,4 +215,5 @@ void animate_spri(entity_t *enti, video_t *video)
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = video->page[0].stridew;\r
 \r
        vga_state.vga_graphics_ram = video->omemptr;\r
+       video->dorender=1;\r
 }\r