====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 6c6cde553f127c2888493d0aef74ae1c10c68f05..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
@@ -155,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
@@ -165,14 +165,13 @@ 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
        // Events go here\r
 \r
 \r
-       //omemptr = vga_state.vga_graphics_ram; // save original mem ptr\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
@@ -223,7 +222,6 @@ void animate_spri(struct sprite *spri, video_t *video)
        );\r
 #endif\r
        // restore ptr\r
-       //vga_state.vga_graphics_ram = video->omemptr;\r
        vga_state.vga_graphics_ram = omemptr;\r
 \r
        // block copy to visible RAM from offscreen\r
@@ -235,7 +233,6 @@ void animate_spri(struct sprite *spri, video_t *video)
        vga_restore_rm0wm0();\r
 \r
        // restore stride\r
-       //vga_state.vga_draw_stride_limit=      video->vga_draw_stride_limit; vga_state.vga_draw_stride=                video->vga_draw_stride;\r
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = GVARVIDEO->page[0].stridew;\r
 \r
        // Depending on delay, update indices\r
@@ -260,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