]> 4ch.mooo.com Git - 16.git/commitdiff
working on palllist.c and no idea how to preserve bg fixed player[0].enti. wwww also...
authorsparky4 <sparky4@cock.li>
Wed, 1 Feb 2017 21:45:25 +0000 (15:45 -0600)
committersparky4 <sparky4@cock.li>
Wed, 1 Feb 2017 21:45:25 +0000 (15:45 -0600)
src/lib/16_enti.c
src/lib/16_sprit.c
src/lib/16_vl.h
src/lib/scroll16.c

index cb05a46af76f76793ca2c96b8d42cb3794fc8f65..c940800f3092762235ee2e7227f5dd5239772c5e 100755 (executable)
@@ -46,7 +46,7 @@ void EN_initentity(entity_t *enti, video_t *video)
 //     modexClearRegion(&video->page[0], enti->x, enti->y, 16, 16, 2);\r
 //     modexClearRegion(&video->page[2], 0, 0, video->page[2].sw, video->page[2].sh, 45);\r
 //     modexClearRegion(&video->page[3], 0, 0, video->page[3].sw, video->page[3].sh, 47);\r
-\r
+#ifndef OLDBGPRESERVE\r
        video->ofs.pattern_ofs=(uint16_t)video->page[0].data;\r
        video->ofs.offscreen_ofs=(uint16_t)video->page[3].data;\r
        w = (enti->x + 24) & (~3);\r
@@ -59,6 +59,10 @@ void EN_initentity(entity_t *enti, video_t *video)
        for (i=0;i < h;i++,o += video->page[0].stridew,o2 += (w >> 2)) 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
+       w=h=o=i=o2=0;\r
+       modexCopyPageRegion(&video->page[2], &video->page[0], enti->x, enti->y, 0, 0, 24, 32);\r
+#endif\r
 }\r
 \r
 //init player!\r
index 35143db422cd553fddecad51f9ab7c1fe6d365c9..5322746a55bee21389bdc09ea165d6cc820ce723 100755 (executable)
@@ -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
index 3ce8d71afc9ef1b65320a3369e6e6186cedf54df..41e037629bc0b6f99d52da93bd45f9b2b4bbe11b 100755 (executable)
@@ -52,6 +52,8 @@
 #define TILEWHD        TILEWH*2\r
 #define QUADWH                 TILEWH/2\r
 \r
+//#define OLDBGPRESERVE\r
+\r
 /* -========================== Types & Macros ==========================- */\r
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))\r
 #define PLANE(x) (1 << ((x) & 3))\r
index 5a9659c6b726925e3afe3688a26f35c1552412b2..966e86469af7cb66eaa69fe2b5d916d3f4932ee6 100755 (executable)
@@ -705,6 +705,10 @@ void shinku(global_game_variables_t *gv)
        //render!!\r
 //     if(pageflipflop){\r
        if(gv->video.r ){//r=1\r
+#ifndef OLDBGPRESERVE\r
+#else\r
+               //modexCopyPageRegion(&video->page[0], &video->page[1], enti->x, enti->y, 0, 0, 24, 32);\r
+#endif\r
                //vga_setup_wm1_block_copy();\r
                //_fmemcpy((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);\r
                //vga_restore_rm0wm0();\r