From: sparky4 <sparky4@4ch.maidlab.jp>
Date: Mon, 7 Jul 2014 20:30:11 +0000 (-0500)
Subject: 	modified:   16/modex16/PCXTEST.C
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=ee22cf0835a099173528ca22a820e355ae7c6cc4;p=16.git

	modified:   16/modex16/PCXTEST.C
	modified:   16/modex16/PCXTEST.EXE
	modified:   16/modex16/PCXTEST.OBJ
	new file:   16/modex16/ed2.pcx
	new file:   16/modex16/koishi.pcx
	new file:   16/modex16/koishi^^.pcx
---

diff --git a/16/modex16/PCXTEST.C b/16/modex16/PCXTEST.C
index 63ce473f..364aa046 100644
--- a/16/modex16/PCXTEST.C
+++ b/16/modex16/PCXTEST.C
@@ -2,31 +2,37 @@
 #include "modex16.h"
 
 void main() {
-    bitmap_t bmp;
+    bitmap_t bmp;
+	bitmap_t bmp2;
+	bitmap_t bmp3;
     int index;
 	int ch=0x0;
 
-    bmp = modexLoadPcx("ed.pcx");
+    bmp = modexLoadPcx("ed.pcx");
+    bmp2 = modexLoadPcx("ed2.pcx");
+    bmp3 = modexLoadPcx("koishi^^.pcx");
     modexEnter();
 
     /* fix up the palette and everything */
-    modexPalUpdate(bmp.palette);
+    //modexPalUpdate(bmp.palette);
+    modexPalUpdate(bmp2.palette);
 
     /* don't show the drawing page */
     modexShowPage(VGA + PAGE_SIZE);
 
     /* clear and draw one sprite and one bitmap */
-    modexClearRegion(VGA, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);
-    modexDrawBmp(VGA, 20, 20, &bmp, 1);
-    modexDrawBmp(VGA, 100, 20, &bmp, 0);
+    modexClearRegion(VGA, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0);
+   	modexDrawBmp(VGA, 20, 20, &bmp2, 0);
+    modexDrawBmp(VGA, 180, 20, &bmp, 1);
+    modexDrawBmp(VGA, 170, 100, &bmp3, 0);
     modexShowPage(VGA);
 //    for(index = 0; index<500; index++) {
-while(!kbhit()){ // conditions of screen saver
-	modexWaitBorder();
-			ch=getch();
-			if(ch==0x71)break; // 'q'
-			if(ch==0x1b)break; // 'ESC'
-    }
+	while(!kbhit()){ // conditions of screen saver
+		modexWaitBorder();
+				ch=getch();
+				if(ch==0x71)break; // 'q'
+				if(ch==0x1b)break; // 'ESC'
+	    }
     modexLeave();
 
     return;
diff --git a/16/modex16/PCXTEST.EXE b/16/modex16/PCXTEST.EXE
index 58dc4d3f..8fa4aa0a 100644
Binary files a/16/modex16/PCXTEST.EXE and b/16/modex16/PCXTEST.EXE differ
diff --git a/16/modex16/PCXTEST.OBJ b/16/modex16/PCXTEST.OBJ
index c57a8e2a..2f421a2a 100644
Binary files a/16/modex16/PCXTEST.OBJ and b/16/modex16/PCXTEST.OBJ differ
diff --git a/16/modex16/ed2.pcx b/16/modex16/ed2.pcx
new file mode 100644
index 00000000..b35305e3
Binary files /dev/null and b/16/modex16/ed2.pcx differ
diff --git a/16/modex16/koishi.pcx b/16/modex16/koishi.pcx
new file mode 100644
index 00000000..76d05160
Binary files /dev/null and b/16/modex16/koishi.pcx differ
diff --git a/16/modex16/koishi^^.pcx b/16/modex16/koishi^^.pcx
new file mode 100644
index 00000000..a43dd15f
Binary files /dev/null and b/16/modex16/koishi^^.pcx differ