From: sparky4 <sparky4@cock.li>
Date: Sun, 8 May 2016 22:06:46 +0000 (-0500)
Subject: w
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=e02ae4965f0f1925c9f258d14abf9a3a6e938f4d;p=16.git

w
---

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 02313272..f04391a9 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -92,6 +92,9 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 	{
 		case 1:
 			//CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
+			/*for(i=0; i<CRTParmCount; i++) {
+				outpw(CRTC_INDEX, ModeX_320x240regs[i]);
+			}*/
 			/* width and height */
 			gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this
 			gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 8679bf86..45c8b137 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -31,7 +31,7 @@
 #include "src/lib/modex16/16planar.h"
 #include "src/lib/16text.h"
 #include "src/lib/modex16/16render.h"
-// #include "src/lib/modex16/320x240.h"
+#include "src/lib/modex16/320x240.h"
 // #include "src/lib/modex16/320x200.h"
 // #include "src/lib/modex16/256x192.h"
 // #include "src/lib/modex16/192x144_.h"
diff --git a/src/test.c b/src/test.c
index c0f1680f..8c30c94e 100755
--- a/src/test.c
+++ b/src/test.c
@@ -99,7 +99,7 @@ void main(int argc, char *argv[])
 
 	/* fill the page with one color, but with a black border */
 	modexShowPage(&gvar.video.page[1]);
-	//modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 0);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);
 	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);
 	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);
@@ -109,7 +109,7 @@ void main(int argc, char *argv[])
 	/* fade in */
 	modexFadeOn(1, pal2);
 
-	i=0,k=0,j=0,pan.pn=0;
+	i=0,k=0,j=0,pan.pn=1;
 	startclk = *clockw;
 	while(!IN_KeyDown(sc_Escape))
 	{
@@ -149,7 +149,10 @@ 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], 0, gvar.video.page[0].height/2, gvar.video.page[0].width, 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);
@@ -158,7 +161,9 @@ void main(int argc, char *argv[])
 		//}
 		if(IN_KeyDown(2)) pan.pn=0;
 		if(IN_KeyDown(3)) pan.pn=1;
-		//if(IN_KeyDown(6)) modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[0].sw-64, gvar.video.page[0].sh-16, 45);
+		if(IN_KeyDown(25)){
+			modexpdump(&gvar.video.page[pan.pn]);
+		}//p
 		modexShowPage(&gvar.video.page[pan.pn]);
 	}
 
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