palllist not being worked on right now... i will work on sprite animation VERY soon

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index db5c3c1d257e7763705b86a7add5b0ccd014ec0f..2ca0a59a55b50cd6086f2a61db446ba5ba0982d7 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -155,7 +155,7 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
 #define VMEMPAGESIZE2  gv->video.page[0].pagesize+gv->video.page[1].pagesize\r
 #define VMEMPAGEDATA2  gv->video.page[2].data\r
        unsigned int i,o,o2; int j;\r
-       int x,rx,ry,w,h;\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
                                                // if the sprite's edge pixels are clear anyway, you can set this to 0.\r
        VGA_RAM_PTR omemptr;\r
@@ -165,6 +165,7 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
 \r
        omemptr = vga_state.vga_graphics_ram; // save original mem ptr\r
        x=spri->x-4;\r
+       y=spri->y;\r
 \r
        // Draw sprite\r
        j = get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);\r
@@ -176,9 +177,9 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
        // render box bounds. y does not need modification, but x and width must be multiple of 4\r
        if (x >= overdraw) rx = (x - overdraw) & (~3);\r
                else rx = -(gv->video.page[0].dx);\r
-       if (spri->y >= overdraw) ry = (spri->y - overdraw);\r
+       if (y >= overdraw) ry = (y - overdraw);\r
                else ry = -(gv->video.page[0].dy);\r
-       h = spri->sprite_vrl_cont->vrl_header->height + overdraw + spri->y - ry;\r
+       h = spri->sprite_vrl_cont->vrl_header->height + overdraw + y - ry;\r
        w = (x + spri->sprite_vrl_cont->vrl_header->width + (overdraw*2) + 3 - rx) & (~3);//round up\r
        if ((rx+w) > gv->video.page[0].width) w = gv->video.page[0].width-rx;\r
        if ((ry+h) > gv->video.page[0].height) h = gv->video.page[0].height-ry;\r
@@ -200,7 +201,7 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
        // then the sprite. note modding ram ptr means we just draw to (x&3,0)\r
        draw_vrl1_vgax_modex(\r
                x-rx,\r
-               spri->y-ry,\r
+               y-ry,\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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 51d8137d1d9e55ca8ef43d1ceeb03bea2cd2ced7..4c72239cdca0efa437ea8d52dab780819fe24a84 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -1195,6 +1195,103 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
        pip->video->r=1;\r
 }\r
 \r
+/*\r
+void animate_spri(struct sprite *spri, global_game_variables_t *gv)\r
+{\r
+#define VMEMPAGESIZE2  gv->video.page[0].pagesize+gv->video.page[1].pagesize\r
+#define VMEMPAGEDATA2  gv->video.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
+                                               // 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
+       y=spri->y;\r
+\r
+       // Draw sprite\r
+       j = get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);\r
+       if(j < 0)\r
+       {\r
+               Quit (gv, "Error retriving required sprite");\r
+       }\r
+\r
+       // render box bounds. y does not need modification, but x and width must be multiple of 4\r
+       if (x >= overdraw) rx = (x - overdraw) & (~3);\r
+               else rx = -(gv->video.page[0].dx);\r
+       if (y >= overdraw) ry = (y - overdraw);\r
+               else ry = -(gv->video.page[0].dy);\r
+       h = spri->sprite_vrl_cont->vrl_header->height + overdraw + y - ry;\r
+       w = (x + spri->sprite_vrl_cont->vrl_header->width + (overdraw*2) + 3 - rx) & (~3);//round up\r
+       if ((rx+w) > gv->video.page[0].width) w = gv->video.page[0].width-rx;\r
+       if ((ry+h) > gv->video.page[0].height) h = gv->video.page[0].height-ry;\r
+\r
+       // block copy pattern to where we will draw the sprite\r
+       vga_setup_wm1_block_copy();\r
+       o2 = VMEMPAGESIZE2;\r
+       o = (0x10000UL - (uint16_t)VMEMPAGEDATA2) + (ry * gv->video.page[0].stridew) + (rx >> 2); // source offscreen\r
+       for (i=0;i < h;i++,o += gv->video.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
+\r
+       // must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally\r
+       vga_restore_rm0wm0();\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 - x) >> 2;//round up\r
+       vga_state.vga_draw_stride = w >> 2;\r
+       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
+       draw_vrl1_vgax_modex(\r
+               x-rx,\r
+               y-ry,\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
+\r
+       // restore ptr\r
+       vga_state.vga_graphics_ram = omemptr;\r
+\r
+       // block copy to visible RAM from offscreen\r
+       vga_setup_wm1_block_copy();\r
+       o = VMEMPAGESIZE2; // source offscreen\r
+       o2 = (ry * gv->video.page[0].stridew) + (rx >> 2); // dest visible (original stride)\r
+       for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += gv->video.page[0].stridew) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
+       // must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally\r
+       vga_restore_rm0wm0();\r
+\r
+       // restore stride\r
+       vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = gv->video.page[0].stridew;\r
+\r
+       // Depending on delay, update indices\r
+       switch(spri->delay){\r
+               // Delay = 0 means that sprite should loop. Nothing to change here\r
+               case 0:\r
+                       break;\r
+\r
+               // Delay = 1 means that on next time unit sprite should be changed\r
+               case 1:\r
+                       spri->curr_anim_spri++;\r
+\r
+                       // If we hit the end of an animation sequence, restart it\r
+                       if(!(spri->curr_spri_id = spri->curr_anim_list[spri->curr_anim_spri].sprite_id)){\r
+                               spri->curr_anim_spri = 0;\r
+                               spri->curr_spri_id = spri->curr_anim_list[spri->curr_anim_spri].sprite_id;\r
+                       }\r
+                       spri->delay = spri->curr_anim_list[spri->curr_anim_spri].delay;\r
+\r
+               // Delay > 1 means that we should not change sprite yet. Decrease delay\r
+               default:\r
+                       spri->delay--;\r
+                       break;\r
+       }\r
+}\r
+*/\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
 {\r
        sword x = player[pn].enti.x;\r
@@ -1246,19 +1343,25 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
                break;\r
        }\r
 \r
-       if(!pageflipflop)\r
-               modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);\r
-       else{\r
+       //if(!pageflipflop)\r
+       //      modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);\r
+       //else{\r
                //copy old bg to page0\r
                //modexCopyPageRegion(pip[3].page, pip[0].page, bx, by, 0, 0,   20, 36);\r
                //update buffer\r
                //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,   x, y,   20, 36);\r
-       }\r
+       //}\r
 //modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);\r
        //modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);\r
        /*modexCopyPageRegion(pip[pip->video->p].page,\r
  pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36);*/\r
 //     else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40);\r
+\r
+//#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire);\r
+//#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
+//#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire);\r
+//#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
+\r
        switch(ls)\r
        {\r
                case 1:\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 697018758d9eaa388ee316e88d6ee4a4171b3280..f514f416fdad892379a01109582ef9446e242051 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -34,6 +34,7 @@
 //#include "src/lib/16_map.h"  //new map stuff\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/16_wcpu.h"\r
+#include "src/lib/16_sprit.h"\r
 \r
 #include <hw/cpu/cpu.h>\r
 #include <hw/dos/dos.h>\r