wwww

diff --git a/pcx2vrl b/pcx2vrl
index 3d9ac6e6d0e4fe19bb8f1962de5fd02253dea7be..bd947e55158b82b4f9d900234745aca806cde60e 100755 (executable)
Binary files a/pcx2vrl and b/pcx2vrl differ

diff --git a/pcxsscut b/pcxsscut
index d743ac3b8ac58a73b3cb2380e2367aee9b167169..1deec74dc0487422bfdb03acb381df671e83a049 100755 (executable)
Binary files a/pcxsscut and b/pcxsscut differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 5318f4e6f502d0bb1b3a5fbb4296507b9f550ea8..fe997dd741b8a7853c29465064de95b1fc396230 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -187,6 +187,7 @@ modexDefaultPage(page_t *p)
        page.tilesh=page.height/TILEWH;\r
        page.tilemidposscreenx = page.tw/2;\r
        page.tilemidposscreeny = (page.th/2)+1;\r
+       page.stridew=page.width/4;\r
        page.pagesize = (sdiword)(page.width/4)*page.height;\r
        page.id = 0;\r
 \r
@@ -212,6 +213,7 @@ modexNextPage(page_t *p) {
        result.tilesw = p->tilesw;\r
        result.tilesh = p->tilesh;\r
        result.id = p->id+1;\r
+       result.stridew=p->stridew;\r
        result.pagesize = p->pagesize;\r
 \r
        return result;\r
@@ -235,6 +237,7 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
        result.tilesw=result.width/TILEWH;\r
        result.tilesh=result.height/TILEWH;\r
        result.id = p->id+1;\r
+       result.stridew=result.width/4;\r
        result.pagesize = (sdiword)(result.width/4)*result.height;\r
 \r
        return result;\r
@@ -315,8 +318,8 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
     word pageOff = (word) page->data;\r
     word xoff=x/4;       /* xoffset that begins each row */\r
     word scanCount=w/4;  /* number of iterations per row (excluding right clip)*/\r
-    word poffset = pageOff + y*(page->width/4) + xoff; /* starting offset */\r
-    word nextRow = page->width/4-scanCount-1;  /* loc of next row */\r
+    word poffset = pageOff + y*(page->stridew) + xoff; /* starting offset */\r
+    word nextRow = page->stridew-scanCount-1;  /* loc of next row */\r
     byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */\r
     byte rclip[] = {0x00, 0x01, 0x03, 0x07};\r
     byte left = lclip[x&0x03];\r
@@ -392,11 +395,11 @@ modexCopyPageRegion(page_t *dest, page_t *src,
                    word dx, word dy,\r
                    word width, word height)\r
 {\r
-    word doffset = (word)dest->data + dy*(dest->width/4) + dx/4;\r
-    word soffset = (word)src->data + sy*(src->width/4) + sx/4;\r
+    word doffset = (word)dest->data + dy*(dest->stridew) + dx/4;\r
+    word soffset = (word)src->data + sy*(src->stridew) + sx/4;\r
     word scans   = vga_state.vga_stride;\r
-    word nextSrcRow = src->width/4 - scans - 1;\r
-    word nextDestRow = dest->width/4 - scans - 1;\r
+    word nextSrcRow = src->stridew - scans - 1;\r
+    word nextDestRow = dest->stridew - scans - 1;\r
     byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */\r
     byte rclip[] = {0x0f, 0x01, 0x03, 0x07};\r
     byte left = lclip[sx&0x03];\r

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index d6f972b144451d05abc843b050258a0ef22f5919..dff4e2cc95002f81c6dcc10249a928e3520a2833 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -82,6 +82,7 @@ typedef struct {
        sword tilemidposscreeny;        /* middle tile position */\r
        sword tileplayerposscreenx;     /* player position on screen */\r
        sword tileplayerposscreeny;     /* player position on screen */\r
+       word stridew;                   /*width/4*/\r
        sdiword pagesize;                       /* page size */\r
 } page_t;\r
 \r

diff --git a/vrl2vrs b/vrl2vrs
index acdd4bda2f0dd8772cdce97a19b6c906e4e09f8e..b67956b7baa37941b88ad79da1a2ff49c0c435a0 100755 (executable)
Binary files a/vrl2vrs and b/vrl2vrs differ

diff --git a/vrsdump b/vrsdump
index 8ba0497deb819d75caeef21a3a0d4086b394845b..dbaba30e42b8639969d3bdd4433243eb338adcbe 100755 (executable)
Binary files a/vrsdump and b/vrsdump differ