From: sparky4 <sparky4@cock.li>
Date: Fri, 24 Jul 2015 23:18:05 +0000 (-0500)
Subject: there that should fix wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=dcaa6318b23355249759a0b4c95c3ebfefda671c;p=16.git

there that should fix wwww
	modified:   16.exe
	modified:   16.hed
	modified:   bakapi.exe
	modified:   fontgfx.exe
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/modex16.c
	modified:   test.exe
	modified:   test2.exe
---

diff --git a/16.exe b/16.exe
index 1d6be61b..9a8dee24 100644
Binary files a/16.exe and b/16.exe differ
diff --git a/16.hed b/16.hed
index f138c24b..3d5d9947 100644
Binary files a/16.hed and b/16.hed differ
diff --git a/bakapi.exe b/bakapi.exe
index 4feb2416..ce446b39 100644
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 633fbcac..364eb370 100644
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/maptest.exe b/maptest.exe
index bd0d2852..331c7147 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index 7cf347c9..8d7c203a 100644
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 34901601..95d0fbb9 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 49eb80da..cb599321 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index a0ffccb4..e5550b4c 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -44,17 +44,17 @@ void VGAmodeX(sword vq)
 	{ // deinit the video
 		// change to the video mode we were in before we switched to mode 13h
 		modexLeave();
-		//in.h.ah = 0x00;
-		//in.h.al = old_mode;
-		//int86(0x10, &in, &out);
+		in.h.ah = 0x00;
+		in.h.al = old_mode;
+		int86(0x10, &in, &out);
 
 	}
 	else if(vq==1)
 	{ // init the video
 		// get old video mode
-		//in.h.ah = 0xf;
-		//int86(0x10, &in, &out);
-		//old_mode = out.h.al;
+		in.h.ah = 0xf;
+		int86(0x10, &in, &out);
+		old_mode = out.h.al;
 		// enter mode
 		modexEnter();
 	}
@@ -984,7 +984,7 @@ void modexputPixel(page_t *page, int x, int y, byte color)
 	   offset = (width * y + x) / 4, and write the given
 	   color to the plane we selected above.  Heed the active
 	   page start selection. */
-	VGA[(unsigned)((SCREEN_WIDTH/4) * y) + (x / 4) + pageOff] = color;
+	VGA[(unsigned)((page->width/4) * y) + (x / 4) + pageOff] = color;
 
 }
 
@@ -995,7 +995,7 @@ byte modexgetPixel(page_t *page, int x, int y)
 	outpw(GC_INDEX, 0x04);
 	outpw(GC_INDEX+1, x & 3);
 
-	return VGA[(unsigned)((SCREEN_WIDTH/4) * y) + (x / 4) + pageOff];
+	return VGA[(unsigned)((page->width/4) * y) + (x / 4) + pageOff];
 
 }
 
diff --git a/test.exe b/test.exe
index 030e3f27..03c18ca0 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index af316409..0680286f 100644
Binary files a/test2.exe and b/test2.exe differ