working on palllist.c and no idea how to preserve bg fixed player[0].enti. wwww also...

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

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index 35143db422cd553fddecad51f9ab7c1fe6d365c9..5322746a55bee21389bdc09ea165d6cc820ce723 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -101,8 +101,9 @@ void animate_spri(entity_t *enti, video_t *video)
 #define INC_PER_FRAME if(enti->q&1) enti->persist_aniframe++; if(enti->persist_aniframe>4) enti->persist_aniframe = 1;\r
        unsigned int i,o,o2; int j;\r
        int x,y,rx,ry,w,h;\r
-\r
+#ifndef OLDBGPRESERVE\r
        VGA_RAM_PTR omemptr = (VGA_RAM_PTR)video->page[0].data;// save original mem ptr\r
+#endif\r
        x=enti->spri->x;\r
        y=enti->spri->y;\r
        VL_Initofs(video);\r
@@ -157,6 +158,7 @@ void animate_spri(entity_t *enti, video_t *video)
 \r
        // render box bounds. y does not need modification, but x and width must be multiple of 4\r
        if(!video->rss){\r
+#ifndef OLDBGPRESERVE\r
        if (x >= enti->overdraww) rx = (x - enti->overdraww) & (~3);\r
                else rx = -(video->page[0].dx);\r
        if (y >= enti->overdrawh) ry = (y - enti->overdrawh);\r
@@ -178,6 +180,10 @@ void animate_spri(entity_t *enti, 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 = w >> 2;\r
        vga_state.vga_graphics_ram = omemptr + video->ofs.offscreen_ofs;\r
+#else\r
+       w=h=i=o=o2=0;\r
+       modexCopyPageRegion(&video->page[2], &video->page[0], enti->x, enti->y, 0, 0, 24, 32);\r
+#endif\r
        }else{ rx=ry=w=h=0; vga_state.vga_graphics_ram = (VGA_RAM_PTR)video->page[0].data; }\r
        vga_state.vga_draw_stride_limit = (video->page[0].width + 3 - x) >> 2;//round up\r
 \r
@@ -195,6 +201,7 @@ void animate_spri(entity_t *enti, video_t *video)
        );\r
 #endif\r
        if(!video->rss){\r
+#ifndef OLDBGPRESERVE\r
        // restore ptr\r
        vga_state.vga_graphics_ram = omemptr;\r
 \r
@@ -205,6 +212,9 @@ void animate_spri(entity_t *enti, video_t *video)
        for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += 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
+#else\r
+       //modexCopyPageRegion(&video->page[0], &video->page[2], 0, 0, enti->x, enti->y, 24, 32);\r
+#endif\r
        }\r
        // restore stride\r
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = video->page[0].stridew;\r