From: sparky4 <sparky4@cock.li>
Date: Wed, 15 Jun 2016 16:53:03 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=55e875eda3dad57b8f89335c115e20d45a4b62d1;p=16.git

wwww
---

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 5a33b0f9..f3a7c776 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -251,7 +251,7 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 	result.id = p->id+1;
 	result.stridew=result.width/4;
 	result.pagesize = (word)(result.width/4)*result.height;
-	if(result.id==2)		result.pi=p->width*p->pi;
+	if(result.id==2)		result.pi=p->width;//*p->pi;
 	else if(result.id==3)	result.pi=p->pi;
 
 	return result;
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index a43591f6..248a1a09 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -44,10 +44,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					animatePlayer(pip, player, pn, 1);
-					mapScrollRight(pip, player, !(pip[0].video->p), pn);
-					mapScrollRight(pip, player, (pip[0].video->p), pn);
-					ScrollRight(pip, player, 2, pn);
 					ScrollRight(pip, player, 3, pn);
+					ScrollRight(pip, player, 2, pn);
+					mapScrollRight(pip, player, (pip[0].video->p), pn);
+					mapScrollRight(pip, player, !(pip[0].video->p), pn);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].q++;
 					pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
@@ -88,10 +88,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					animatePlayer(pip, player, pn, 1);
-					mapScrollLeft(pip, player, !(pip[0].video->p), pn);
-					mapScrollLeft(pip, player, (pip[0].video->p), pn);
-					ScrollLeft(pip, player, 2, pn);
 					ScrollLeft(pip, player, 3, pn);
+					ScrollLeft(pip, player, 2, pn);
+					mapScrollLeft(pip, player, (pip[0].video->p), pn);
+					mapScrollLeft(pip, player, !(pip[0].video->p), pn);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].q++;
 					pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
@@ -132,10 +132,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					animatePlayer(pip, player, pn, 1);
-					mapScrollDown(pip, player, !(pip[0].video->p), pn);
-					mapScrollDown(pip, player, (pip[0].video->p), pn);
-					ScrollDown(pip, player, 2, pn);
 					ScrollDown(pip, player, 3, pn);
+					ScrollDown(pip, player, 2, pn);
+					mapScrollDown(pip, player, (pip[0].video->p), pn);
+					mapScrollDown(pip, player, !(pip[0].video->p), pn);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].q++;
 					pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
@@ -176,10 +176,10 @@ void walk(map_view_t *pip, player_t *player, word pn)
 				{
 					INC_PER_FRAME;
 					animatePlayer(pip, player, pn, 1);
-					mapScrollUp(pip, player, !(pip[0].video->p), pn);
-					mapScrollUp(pip, player, (pip[0].video->p), pn);
-					ScrollUp(pip, player, 2, pn);
 					ScrollUp(pip, player, 3, pn);
+					ScrollUp(pip, player, 2, pn);
+					mapScrollUp(pip, player, (pip[0].video->p), pn);
+					mapScrollUp(pip, player, !(pip[0].video->p), pn);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].q++;
 					pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;