From: sparky4 <sparky4@cock.li>
Date: Mon, 13 Jun 2016 17:45:44 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b7777dc50153818f0043b22f95d260416ceb0fcb;p=16.git

wwww
---

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 6ffd01dc..5a33b0f9 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -1162,9 +1162,9 @@ void modexprintmeminfo(video_t *v)
 		printf("	[%u]=", i);
 		printf("(%Fp)", (v->page[i].data));
 		printf(" size=%u	", v->page[i].pagesize);
+		printf("w=%lu  h=%lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);
 		printf("sw=%lu  sh=%lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);
-		printf(" width=%lu  height=%lu", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);
-		printf(" pi=%u", v->page[i].pi);
+		printf("pi=%u", v->page[i].pi);
 		printf("\n");
 	}
 }
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index a875ff20..a43591f6 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);
-					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);
+					ScrollRight(pip, player, 2, pn);
+					ScrollRight(pip, player, 3, 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);
-					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);
+					ScrollLeft(pip, player, 2, pn);
+					ScrollLeft(pip, player, 3, 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);
-					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);
+					ScrollDown(pip, player, 2, pn);
+					ScrollDown(pip, player, 3, 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);
-					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);
+					ScrollUp(pip, player, 2, pn);
+					ScrollUp(pip, player, 3, pn);
 					if(!pageflipflop) modexShowPage(pip[1].page);
 					player[pn].q++;
 					pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
diff --git a/src/scroll.c b/src/scroll.c
index e21ea54d..3e7032e5 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -277,7 +277,7 @@ void main(int argc, char *argv[])
 	if(IN_KeyDown(67))	//f9
 	{
 		modexClearRegion(mv[3].page, 0, 0/*128*/, 28, 36, 15);
-		IN_UserInput(1,1);
+		//IN_UserInput(1,1);
 	}
 	//TODO fmemtest into page
 	/*if(IN_KeyDown(4+1))	//4