====animation mostly converted==== set_anim_by_id(player[pn].ent->spri, player[pn...

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

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index 28808614ff43c12627af6ce7dca49d3cffb5b649..c41994f98abf8b136a07965c9dafb51365e93224 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -52,7 +52,6 @@ void init_anim(struct sprite *spri, int anim_index)
        spri->curr_anim_list = anim_list;\r
 }\r
 \r
-\r
 int set_anim_by_id(struct sprite *spri, int anim_id)\r
 {\r
        int new_anim_index = 0;\r
@@ -97,34 +96,41 @@ void print_anim_ids(struct sprite *spri)
        }\r
 }\r
 \r
-/*\r
-void animate_spri(struct sprite *spri, global_game_variables_t *gv)\r
+void oldanimate_spri(struct sprite *spri, video_t *video)\r
 {\r
        int i;\r
        // Events go here\r
 \r
 \r
+       vga_state.vga_graphics_ram = (VGA_RAM_PTR)video->page[0].data;//vga_state.vga_graphics_ram; // save original mem ptr\r
+\r
+\r
        // Draw sprite\r
        i = get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);\r
        if(i < 0)\r
        {\r
-               Quit (gv, "Error retriving required sprite");\r
+               //Quit (gv, "Error retriving required sprite");\r
+               return;\r
        }\r
 \r
        // replace VGA stride with our own and mem ptr. then sprite rendering at this stage is just (0,0)\r
-       vga_state.vga_draw_stride_limit = (gv->video.page[0].width + 3 - spri->x) >> 2;\r
+       vga_state.vga_draw_stride_limit = (video->page[0].width + 3 - spri->x) >> 2;\r
 \r
+#ifndef SPRITE\r
+       modexClearRegion(&video->page[0], spri->x, spri->y, 16, 32, 1);\r
+#else\r
        draw_vrl1_vgax_modex(\r
-               spri->x-gv->video.page[0].dx,\r
-               spri->y-gv->video.page[0].dy,\r
+               spri->x,//-video->page[0].dx,\r
+               spri->y,//-video->page[0].dy,\r
                spri->sprite_vrl_cont->vrl_header,\r
                spri->sprite_vrl_cont->line_offsets,\r
                spri->sprite_vrl_cont->buffer + sizeof(struct vrl1_vgax_header),\r
                spri->sprite_vrl_cont->data_size\r
        );\r
+#endif\r
 \r
        // restore stride\r
-       vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = gv->video.page[0].stridew;\r
+       vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = video->page[0].stridew;\r
 \r
        // Depending on delay, update indices\r
        switch(spri->delay){\r
@@ -148,8 +154,10 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
                        spri->delay--;\r
                        break;\r
        }\r
+       vga_state.vga_graphics_ram = video->omemptr;\r
 }\r
-*/\r
+\r
+\r
 void animate_spri(struct sprite *spri, video_t *video)\r
 {\r
 #define GVARVIDEO video\r
@@ -157,15 +165,15 @@ void animate_spri(struct sprite *spri, video_t *video)
 #define VMEMPAGEDATA2  GVARVIDEO->page[2].data\r
        unsigned int i,o,o2; int j;\r
        int x,y,rx,ry,w,h;\r
-       int overdraw = 1;       // how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.\r
+       int overdraw = 4;//16;  // how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.\r
                                                // if the sprite's edge pixels are clear anyway, you can set this to 0.\r
        VGA_RAM_PTR omemptr;\r
 \r
        // Events go here\r
 \r
 \r
-       omemptr = vga_state.vga_graphics_ram; // save original mem ptr\r
-       x=spri->x;//-4;\r
+       omemptr = (VGA_RAM_PTR)video->page[0].data;//vga_state.vga_graphics_ram; // save original mem ptr\r
+       x=spri->x;\r
        y=spri->y;\r
 \r
        // Draw sprite\r
@@ -201,6 +209,9 @@ void animate_spri(struct sprite *spri, video_t *video)
        vga_state.vga_graphics_ram = omemptr + VMEMPAGESIZE2;\r
 \r
        // then the sprite. note modding ram ptr means we just draw to (x&3,0)\r
+#ifndef SPRITE\r
+       modexClearRegion(&GVARVIDEO->page[0], x, y, 16, 32, 1);\r
+#else\r
        draw_vrl1_vgax_modex(\r
                x-rx,\r
                y-ry,\r
@@ -209,7 +220,7 @@ void animate_spri(struct sprite *spri, video_t *video)
                spri->sprite_vrl_cont->buffer + sizeof(struct vrl1_vgax_header),\r
                spri->sprite_vrl_cont->data_size\r
        );\r
-\r
+#endif\r
        // restore ptr\r
        vga_state.vga_graphics_ram = omemptr;\r
 \r
@@ -246,4 +257,5 @@ void animate_spri(struct sprite *spri, video_t *video)
                        spri->delay--;\r
                        break;\r
        }\r
+       vga_state.vga_graphics_ram = video->omemptr;\r
 }\r