====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 e32e9f96764c9f524d52740e66da1ca708631ea5..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
@@ -117,6 +116,9 @@ void oldanimate_spri(struct sprite *spri, video_t *video)
        // 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 = (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,//-video->page[0].dx,\r
                spri->y,//-video->page[0].dy,\r
@@ -125,6 +127,7 @@ void oldanimate_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
+#endif\r
 \r
        // restore stride\r
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = video->page[0].stridew;\r
@@ -151,6 +154,7 @@ void oldanimate_spri(struct sprite *spri, video_t *video)
                        spri->delay--;\r
                        break;\r
        }\r
+       vga_state.vga_graphics_ram = video->omemptr;\r
 }\r
 \r
 \r
@@ -161,7 +165,7 @@ 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 = 0;//16;  // 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
@@ -253,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