From: sparky4 <sparky4@cock.li>
Date: Mon, 9 May 2016 15:43:41 +0000 (-0500)
Subject: pages made ^^
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=3b6e695f446e1499272e873d20ace03b23e2f0e9;p=16.git

pages made ^^
---

diff --git a/pcx2vrl b/pcx2vrl
index 3d9ac6e6..bd947e55 100755
Binary files a/pcx2vrl and b/pcx2vrl differ
diff --git a/pcxsscut b/pcxsscut
index d743ac3b..1deec74d 100755
Binary files a/pcxsscut and b/pcxsscut differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 81b8616f..602e07e2 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -261,9 +261,10 @@ void modexHiganbanaPageSetup(video_t *video)
 	video->num_of_pages=0;
 	(video->page[0]) = modexDefaultPage(&(video->page[0]));	video->num_of_pages++;	//video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);
 	(video->page[1]) = modexNextPage(&(video->page[0]));	video->num_of_pages++;
-	(video->page[2]) = modexNextPage(&(video->page[1]));	video->num_of_pages++;
-//	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].width/8, video->page[0].height/8);	video->num_of_pages++;
-	//(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH);	video->num_of_pages++;
+	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), TILEWH*4, TILEWH*4);		video->num_of_pages++;
+	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 208);	video->num_of_pages++;
+// 	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, 172);	video->num_of_pages++;
+// 	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), 72, 128);		video->num_of_pages++;
 	modexCalcVmemRemain(video);
 	video->p=0;
 }
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index dbf6666c..c863c866 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -726,7 +726,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 	//setkb(0);
 }*/
 
-unsigned char shinku_fps_indicator_page = 0;
+unsigned char shinku_fps_indicator_page = 2;
 boolean pageflipflop=0;
 //gv->video.p
 
diff --git a/src/test.c b/src/test.c
index 7e03e266..7e554384 100755
--- a/src/test.c
+++ b/src/test.c
@@ -107,6 +107,8 @@ void main(int argc, char *argv[])
 	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, gvar.video.page[0].height);
+	modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47);
+	modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);
 
 	/* fade in */
 	modexFadeOn(1, pal2);
@@ -151,18 +153,20 @@ void main(int argc, char *argv[])
 			baka:
 			i++;
 			modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width-32, 16, 45);*/
-			if(IN_KeyDown(6))
-			{
-				modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);
-			}
-			if(IN_KeyDown(4+1)){
-				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
-				modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
-				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
-			}
+// 			if(IN_KeyDown(6))
+// 			{
+// 				modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);
+// 			}
+// 			if(IN_KeyDown(4+1)){
+// 				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
+// 				modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
+// 				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
+// 			}
 		//}
-		if(IN_KeyDown(2)) pan.pn=0;
-		if(IN_KeyDown(3)) pan.pn=1;
+		if(IN_KeyDown(1+1)) pan.pn=0;
+		if(IN_KeyDown(2+1)) pan.pn=1;
+		if(IN_KeyDown(3+1)) pan.pn=2;
+		if(IN_KeyDown(4+1)) pan.pn=3;
 		if(IN_KeyDown(25)){
 			modexpdump(&gvar.video.page[pan.pn]);
 		}//p
diff --git a/vrl2vrs b/vrl2vrs
index acdd4bda..b67956b7 100755
Binary files a/vrl2vrs and b/vrl2vrs differ
diff --git a/vrsdump b/vrsdump
index 8ba0497d..dbaba30e 100755
Binary files a/vrsdump and b/vrsdump differ