remove glitches

	modified:   scroll.exe
	modified:   src/scroll.c

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

diff --git a/src/scroll.c b/src/scroll.c
index 1f84af1862ddb5fe44514ddcb0f138ebfaffa773..d45d784b8dc7c8e98cab5ee457e54383b557ee8b 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,10 +1,10 @@
 #include "src\lib\modex16.h"\r
 #include <stdio.h>\r
-#include <stdlib.h>
+#include <stdlib.h>\r
 #include <string.h>\r
 #include "src\lib\dos_kb.h"\r
 #include "16\lib\x\modex.h"\r
-#include "src\lib\wtest\wtest.c"
+#include "src\lib\wtest\wtest.c"\r
 #include "src\lib\planar.c"\r
 #include "src\lib\ems.c"\r
 \r
@@ -60,7 +60,7 @@ void mapScrollDown(map_view_t *mv, byte offset);
 void mapGoTo(map_view_t *mv, int tx, int ty);\r
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);\r
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);\r
 void qclean();\r
 void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);\r
 \r
@@ -75,12 +75,12 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 #define TRIGGX 10\r
 #define TRIGGY 9\r
 \r
-void main() {
+void main() {\r
        long emmhandle;\r
        long emsavail;\r
        char teststr[80];\r
        int i;\r
-       bitmap_t ptmp;//, npctmp; // player sprite
+       bitmap_t ptmp;//, npctmp; // player sprite\r
        planar_buf_t *p;\r
        const char *cpus;\r
        static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
@@ -92,7 +92,7 @@ void main() {
        byte *ptr;\r
        actor_t player;\r
        //actor_t npc0;\r
-
+\r
 //     atexit(qclean());\r
        /*if(!emmtest())\r
        {\r
@@ -112,13 +112,13 @@ void main() {
                printf("Expanded memory manager error\n");\r
                exit(0);\r
        }\r
-       printf("There are %ld pages available\n",emsavail);
-
+       printf("There are %ld pages available\n",emsavail);\r
+\r
        if((emmhandle = emmalloc(emsavail)) < 0)\r
        {\r
                printf("Insufficient pages available\n");\r
                exit(0);\r
-       }*/
+       }*/\r
 \r
        /* create the map */\r
        map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
@@ -133,9 +133,9 @@ void main() {
        /* data */\r
        ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
-
+\r
        /* create the planar buffer */\r
-       p = planar_buf_from_bitmap(&ptmp);
+       p = planar_buf_from_bitmap(&ptmp);\r
 \r
        /*if(isEMS())\r
        {\r
@@ -226,8 +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);
-       memcpy ( &mv2, p, (p->pwidth*(p->height))+1 );\r
+       modexShowPage(spri->page);\r
+       //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
@@ -805,13 +805,13 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
        }\r
        i += mv->map->width;\r
        }\r
-}
-
-void qclean()
-{
+}\r
+\r
+void qclean()\r
+{\r
        modexLeave();\r
-       setkb(0);
-}
+       setkb(0);\r
+}\r
 \r
 void\r
 animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp)\r