modified: pcxtest.exe

	modified:   scroll.exe
	modified:   src/lib/modex16.c
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe

diff --git a/pcxtest.exe b/pcxtest.exe
index 41fd3d952e69cc4c121ab2f7ea191038e0dd41bf..af532db1036dd2792f8dfaa4f60f7432b2ffd463 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 6bca07367e34bfd0da72c8131b024547f38862b5..c529d4f9d9652553140af1005f4973ee56db6a89 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 0137b625e95302afa459d1020a63ca1786ebb5c7..d0707ffd44e40e6a7e8dfab07d9a17b40e19e042 100644 (file)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -288,7 +288,12 @@ modexDrawBmpRegion(page_t *page, int x, int y,
 \r
 void\r
 modexDrawPlanarBuf(page_t *page, int x, int y, planar_buf_t *bmp) {\r
-    /* TODO - adapt from test code */\r
+    /* TODO - adapt from test code */
+       int plane;
+       for(plane=0; plane < 4; plane++)
+       {
+               //fack
+       }\r
 }\r
 \r
 \r

diff --git a/src/scroll.c b/src/scroll.c
index 3d6dcab6c72bd4df0ae49642635af8a0e600a8f0..1f84af1862ddb5fe44514ddcb0f138ebfaffa773 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,6 +1,7 @@
 #include "src\lib\modex16.h"\r
 #include <stdio.h>\r
-#include <stdlib.h>\r
+#include <stdlib.h>
+#include <string.h>\r
 #include "src\lib\dos_kb.h"\r
 #include "16\lib\x\modex.h"\r
 #include "src\lib\wtest\wtest.c"
@@ -156,7 +157,7 @@ void main() {
                XMOVE mm;\r
                mm.length=emmhandle;\r
                mm.sourceH=0;\r
-               mm.sourceOff=(long)(bitmap_t *)p;\r
+               mm.sourceOff=(long)&ptmp;\r
                mm.destH=emmhandle;\r
                mm.destOff=0;\r
                //halp!\r
@@ -217,7 +218,7 @@ void main() {
        npc0.q=1;\r
        npc0.d=0;\r
        modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/\r
-       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, (bitmap_t *)p);\r
+       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);\r
 \r
        modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
        modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
@@ -225,7 +226,8 @@ void main() {
        modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);\r
        modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);\r
 \r
-       modexShowPage(spri->page);\r
+       modexShowPage(spri->page);
+       memcpy ( &mv2, p, (p->pwidth*(p->height))+1 );\r
        while(!keyp(1) && player.hp>0)\r
        {\r
        //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
@@ -356,8 +358,8 @@ void main() {
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
-                               //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
-                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                mapScrollRight(bg, SPEED);\r
                                mapScrollRight(spri, SPEED);\r
                                //mapScrollRight(mask, SPEED);\r
@@ -371,8 +373,8 @@ void main() {
                        {\r
                                INC_PER_FRAME;\r
                                player.x+=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
-                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.tx++; }\r
@@ -380,7 +382,7 @@ void main() {
                else\r
                {\r
                        modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, (bitmap_t *)p);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);\r
                        modexShowPage(spri->page);\r
                        player.d = 0;\r
                }\r
@@ -397,8 +399,8 @@ void main() {
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
-                               //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
-                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                mapScrollLeft(bg, SPEED);\r
                                mapScrollLeft(spri, SPEED);\r
                                //mapScrollLeft(mask, SPEED);\r
@@ -412,8 +414,8 @@ void main() {
                        {\r
                                INC_PER_FRAME;\r
                                player.x-=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
-                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.tx--; }\r
@@ -421,7 +423,7 @@ void main() {
                else\r
                {\r
                        modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, (bitmap_t *)p);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);\r
                        modexShowPage(spri->page);\r
                        player.d = 0;\r
                }\r
@@ -438,8 +440,8 @@ void main() {
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
-                               //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
-                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                mapScrollDown(bg, SPEED);\r
                                mapScrollDown(spri, SPEED);\r
                                //mapScrollDown(mask, SPEED);\r
@@ -453,8 +455,8 @@ void main() {
                        {\r
                                INC_PER_FRAME;\r
                                player.y+=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
-                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                modexShowPage(spri->page);\r
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.ty++; }\r
@@ -462,7 +464,7 @@ void main() {
                else\r
                {\r
                        modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, (bitmap_t *)p);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);\r
                        modexShowPage(spri->page);\r
                        player.d = 0;\r
                }\r
@@ -479,8 +481,8 @@ void main() {
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
                                INC_PER_FRAME;\r
-                               //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
-                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                mapScrollUp(bg, SPEED);\r
                                mapScrollUp(spri, SPEED);\r
                                //mapScrollUp(mask, SPEED);\r
@@ -494,16 +496,16 @@ void main() {
                        {\r
                                INC_PER_FRAME;\r
                                player.y-=SPEED;\r
-                               //animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p);\r
+                               //animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
                                modexShowPage(spri->page);\r
-                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p);\r
+                               animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.ty--; }\r
                }\r
                else\r
                {\r
                        modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
-                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, (bitmap_t *)p);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);\r
                        modexShowPage(spri->page);\r
                        player.d = 0;\r
                }\r

diff --git a/test.exe b/test.exe
index 2c0f7105232945723342088ffc42d31a2e1f3892..c84415ec306caf5978cc2c3ae888a1eedb524951 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 6ac101b66043162a8a003fa61faa3a03376da09d..dad8568a74cad41c8b9df61369840cc764bf241c 100644 (file)
Binary files a/test2.exe and b/test2.exe differ