it is semi working the bg preservation wwww

[16.git] / src / 0.c

diff --git a/src/0.c b/src/0.c
index 3ac991ed292a913f52d36c3639c313813ad976bc..31d1952eb2ff6c24b8eee5e0dc75b76c278e66f9 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -30,10 +30,8 @@ int main(int argc,char **argv)
 \r
        boolean anim=1,noanim=0,zerostoppause=1;\r
 \r
-       gvar.video.panp=0;\r
-\r
        bakapee1=malloc(64);\r
-       bakapee2=malloc(1024);\r
+       bakapee2=malloc(64);\r
 \r
        if (argc < 2) {\r
                //fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
@@ -85,15 +83,15 @@ int main(int argc,char **argv)
 \r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Keyboard1);\r
-       EN_initplayer(&player, 0);\r
+       EN_initplayer(&player, 0, &gvar.video);\r
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
        ZC_MVSetup(&mv, &map, &gvar);\r
-       ZC_ShowMV(&mv, gvar.video.panp, 0);\r
+       ZC_ShowMV(&mv, gvar.video.sp, 0);\r
 \r
 //     VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);\r
-       VL_PatternDraw(&gvar.video, 0/*gvar.video.panp*/, 0, 1);\r
+       VL_PatternDraw(&gvar.video, 0/*gvar.video.sp*/, 0, 1);\r
        TESTBG34\r
        DRAWCORNERBOXES\r
 \r
@@ -134,7 +132,7 @@ int main(int argc,char **argv)
                        if(IN_KeyDown(sc_R)){\r
                                gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;\r
                                mv[0].tx = mv[0].ty = mv[1].tx = mv[1].ty = INITTNUM;\r
-\r
+                               VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);\r
                                player[0].enti.q = 1; player[0].enti.d = 2;\r
                                x=y=0;\r
                                xdir=ydir=1;\r
@@ -155,8 +153,8 @@ int main(int argc,char **argv)
 \r
                                /* block copy pattern to where we will draw the sprite */\r
                                vga_setup_wm1_block_copy();\r
-                               o2 = gvar.video.page[0].pagesize;\r
-                               o = (0x10000UL - (uint16_t)gvar.video.page[1].data) + (ry * gvar.video.page[0].stridew) + (rx >> 2); // source offscreen\r
+                               o2 = gvar.video.page[0].pagesize+gvar.video.page[1].pagesize;\r
+                               o = ((uint16_t)gvar.video.page[2].data) + (ry * gvar.video.page[0].stridew) + (rx >> 2); // source offscreen            0x10000UL -\r
                                for (i=0;i < h;i++,o += gvar.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
@@ -164,7 +162,7 @@ int main(int argc,char **argv)
                                /* 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 = (gvar.video.page[0].width + 3/*round up*/ - x) >> 2;\r
                                vga_state.vga_draw_stride = w >> 2;\r
-                               vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize;\r
+                               vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize + gvar.video.page[1].pagesize;\r
 \r
                                /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */\r
 draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
@@ -175,7 +173,7 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 \r
                                /* block copy to visible RAM from offscreen */\r
                                vga_setup_wm1_block_copy();\r
-                               o = gvar.video.page[0].pagesize; // source offscreen\r
+                               o = gvar.video.page[0].pagesize+gvar.video.page[1].pagesize; // source offscreen\r
                                o2 = (ry * gvar.video.page[0].stridew) + (rx >> 2); // dest visible (original stride)\r
                                for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += gvar.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