dang it./wbuild.sh vga_state.vga_graphics_ram = video->omemptr; causes it to not...

diff --git a/qdl.sh b/qdl.sh
new file mode 100755 (executable)
index 0000000..ac14d9e
--- /dev/null
+++ b/qdl.sh
@@ -0,0 +1 @@
+grep -iR "$1" src/lib/doslib/*

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index 53cfc6912db8f211018553f3a0b433adc366c593..6c6cde553f127c2888493d0aef74ae1c10c68f05 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -172,6 +172,7 @@ void animate_spri(struct sprite *spri, video_t *video)
        // 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
@@ -222,6 +223,7 @@ 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
@@ -233,6 +235,7 @@ 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

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 5936022d63140f2aed5b159d062c67857689d4b3..cc96f290adbdec6f509d07fb29554c522725dc0f 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -260,6 +260,11 @@ typedef struct
        page_t page[MAXPAGE];   //can be used as a pointer to root page[0]\r
        word vmem_remain;       //remaining video memory\r
        byte num_of_pages;      //number of actual pages\r
+       //doslib origi vars\r
+       byte far * omemptr;\r
+       byte vga_draw_stride;\r
+       byte vga_draw_stride_limit;             // further X clipping\r
+//\r
 boolean __near p;                      //render page number //BLEH\r
        boolean __near r;                       //page flip if true\r
        word pr[MAXPAGE][4];    //render sections of pages (this is supposed to be set up to draw sections of the screen if updated)\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 07eb939ffa5ebc7d2aa2523c00605c842104ff3b..1c9f94d50b68cb211ae2723226c4dfe1d808ef6d 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -292,6 +292,10 @@ void modexHiganbanaPageSetup(video_t *video)
        modexCalcVmemRemain(video);\r
        video->p=0;\r
        video->r=1;\r
+       //doslib origi var\r
+       video->omemptr=                 vga_state.vga_graphics_ram;\r
+       video->vga_draw_stride= vga_state.vga_draw_stride;\r
+       video->vga_draw_stride_limit=   vga_state.vga_draw_stride_limit;\r
 \r
        //setup the buffersize\r
        video->page[0].dx=video->page[0].dy=\r

diff --git a/src/lib/doslib b/src/lib/doslib
index b9ab630a721c6f7503b9b76f981ef89046219a6a..8d600cad129e0cc05c1474a492b7fd7acb6b2f0a 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit b9ab630a721c6f7503b9b76f981ef89046219a6a
+Subproject commit 8d600cad129e0cc05c1474a492b7fd7acb6b2f0a

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 9b07cb2768492a0f93fd174c4dd68231ce2be92d..07ee27141aeb5e36067516dcb79a61fcc49d973d 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -1260,8 +1260,8 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
 //#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
 #ifndef SPRITO\r
-#define DRAWFRAME if (i == -1) return; oldanimate_spri(player[pn].ent->spri, pip->video)\r
-//#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)\r
+//#define DRAWFRAME if (i == -1) return; oldanimate_spri(player[pn].ent->spri, pip->video)\r
+#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)\r
 #define NFRAME1 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
 #define NFRAME2 i = set_anim_by_id(player[pn].ent->spri, 1+dire);      DRAWFRAME;\r
 #define NFRAME3 i = set_anim_by_id(player[pn].ent->spri, dire);        DRAWFRAME;\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 13809cd8395d1120cb308680c0277b9660fc5d3c..fe3fe4eb19613a6dec24d98a96f145726dbeb899 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -41,12 +41,10 @@
 #include <hw/vga/vga.h>\r
 #include <hw/vga/vrl.h>\r
 \r
-//#define SPRITE\r
-#define SPRITO\r
+#define SPRITE\r
+//#define SPRITO\r
 //#define TILERENDER\r
 \r
-//extern void modexDrawSpriteRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);\r
-\r
 //modexDrawSpritePBufRegion\r
 //modexDrawBmpPBufRegion\r
 //#define PBUFSFUN             modexDrawSpriteRegion\r