From: sparky4 <sparky4@cock.li>
Date: Mon, 4 Apr 2016 19:11:14 +0000 (-0500)
Subject: wwww updated sheet ww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=c91b34cede872764dc0e899b5d2662a2e6622169;p=16.git

wwww updated sheet ww
---

diff --git a/src/palettec.c b/src/palettec.c
index f1057dc0..a1e387dc 100755
--- a/src/palettec.c
+++ b/src/palettec.c
@@ -34,13 +34,13 @@ main(int argc, char *argv[])
 	if(argv[1]) bakapee = argv[1];
 	else bakapee = "data/default.pal";
 
-	VGAmodeX(1, &gvar);
+	VGAmodeX(1, 1, &gvar);
 
 	pal = modexNewPal();
 	modexPalSave(pal);
 
 	modexSavePalFile(bakapee, pal);
 
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
 
 }
diff --git a/src/palettel.c b/src/palettel.c
index a40bd3fd..d07452b6 100755
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -38,7 +38,7 @@ main(int argc, char *argv[])
 	if(argv[1]) bakapee = argv[1];
 	else bakapee = "data/default.pal";
 //	modexPalSave(pal);
-	VGAmodeX(1, &gvar);
+	VGAmodeX(1, 1, &gvar);
 	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
 	modexPalBlack();
 
@@ -47,7 +47,7 @@ main(int argc, char *argv[])
 	modexFadeOn(1, pal);
 	pdump(&gvar.video.page[0]);
 	getch();
-	modexLeave();//VGAmodeX(0, &gvar);
+	VGAmodeX(0, 0, &gvar);
 	modexPalUpdate1(pal);
 	/*for(i=0;i<768;i++)
 	{
diff --git a/src/pcxtest.c b/src/pcxtest.c
index 0392b5cb..c05cff5f 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -42,7 +42,7 @@ void main() {
 	bmp = bitmapLoadPcx("data/koishi^^.pcx");
 //	bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
 	p = planar_buf_from_bitmap(&bmp);
-	VGAmodeX(1, &gvar);
+	VGAmodeX(1, 1, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	/* fix up the palette and everything */
@@ -89,7 +89,7 @@ void main() {
 	{
 		//DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
 	}
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
 	/*printf("\nmain=%Fp\n\n", &i);
 	printf("bmp.data=%Fp\n", bmp.data);
 	printf("*bmp.data=%Fp\n", *(bmp.data));
diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index 3b83c53d..059b448a 100755
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -67,7 +67,7 @@ void main() {
 	bmp = bitmapLoadPcx("data/koishi^^.pcx");
 //	bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
 	p = planar_buf_from_bitmap(&bmp);
-	VGAmodeX(1, &gvar);
+	VGAmodeX(1, 1, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 	gvar.video.page[0].sw+=32;
 	gvar.video.page[0].sh+=32;
@@ -121,7 +121,7 @@ void main() {
 	{
 		//DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
 	}
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
 	/*printf("\nmain=%Fp\n\n", &i);
 	printf("bmp.data=%Fp\n", bmp.data);
 	printf("*bmp.data=%Fp\n", *(bmp.data));
diff --git a/src/planrpcx.c b/src/planrpcx.c
index 9ed1096d..06b1f29c 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -64,7 +64,7 @@ baka = 1;
 //getch();
 
 	textInit();
-	VGAmodeX(baka, &gvar);
+	VGAmodeX(baka, 1, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	//fix up the palette and everything
@@ -110,7 +110,7 @@ getch();
 	while(!kbhit())
 	{
 	}
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
 
 	//print out the contents of each plane
 	for(plane=0; plane < 4; plane++) {
diff --git a/src/scroll.c b/src/scroll.c
index 7d68b45d..5b480cf8 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -118,7 +118,7 @@ void main(int argc, char *argv[])
 #endif
 
 	textInit();
-	VGAmodeX(bakapee, &gvar);
+	VGAmodeX(bakapee, 1, &gvar);
 //	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
@@ -368,7 +368,7 @@ void main(int argc, char *argv[])
 	//TSR
 	if(IN_KeyDown(87))	//f11
 	{
-		VGAmodeX(0, &gvar);
+		VGAmodeX(0, 0, &gvar);
 		IN_Shutdown();
 		__asm
 		{
@@ -411,7 +411,7 @@ void main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
 #endif
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
 #endif
 	IN_Shutdown();
 	printf("Project 16 scroll.exe. This is just a test file!\n");
diff --git a/src/test.c b/src/test.c
index df0af615..b80291fc 100755
--- a/src/test.c
+++ b/src/test.c
@@ -48,7 +48,7 @@ void main(int argc, char *argv[])
 	modexFadeOff(1, pal);
 	modexPalBlack();
 
-	VGAmodeX(bakapee, &gvar);
+	VGAmodeX(bakapee, 1, &gvar);
 	modexPalBlack();
 
 	IN_Startup();
@@ -112,7 +112,7 @@ void main(int argc, char *argv[])
 	/* fade back to text mode */
 	modexFadeOff(1, pal2);
 	modexPalBlack();
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
 	IN_Shutdown();
 	printf("Project 16 test.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);