From: sparky4 Date: Mon, 9 May 2016 06:09:15 +0000 (-0500) Subject: fixed the issue with sw ==0 ^^ X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=751c4f3ec8c17fd957a9be148272149e7eed5a35;p=16.git fixed the issue with sw ==0 ^^ --- diff --git a/pcx2vrl b/pcx2vrl index 06179c75..3d9ac6e6 100755 Binary files a/pcx2vrl and b/pcx2vrl differ diff --git a/pcxsscut b/pcxsscut index 2ce56d28..d743ac3b 100755 Binary files a/pcxsscut and b/pcxsscut differ diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 2d4c0024..5318f4e6 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -203,6 +203,8 @@ modexNextPage(page_t *p) { result.data = p->data + (p->pagesize); result.dx = 0; result.dy = 0; + result.sw = p->sw; + result.sh = p->sh; result.width = p->width; result.height = p->height; result.tw = p->tw; @@ -224,6 +226,8 @@ modexNextPageFlexibleSize(page_t *p, word x, word y) result.data = p->data + (p->pagesize); /* compute the offset */ result.dx = 0; result.dy = 0; + result.sw = x; + result.sh = y; result.width = x; result.height = y; result.tw = result.sw/TILEWH; diff --git a/src/test.c b/src/test.c index ab283fa6..9f5762de 100755 --- a/src/test.c +++ b/src/test.c @@ -104,7 +104,7 @@ void main(int argc, char *argv[]) modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42); modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128); modexShowPage(&gvar.video.page[0]); - modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width+32, gvar.video.page[0].height); + modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height); /* fade in */ modexFadeOn(1, pal2); diff --git a/vrl2vrs b/vrl2vrs index cee2d1d5..acdd4bda 100755 Binary files a/vrl2vrs and b/vrl2vrs differ diff --git a/vrsdump b/vrsdump index a75a903a..8ba0497d 100755 Binary files a/vrsdump and b/vrsdump differ