From: sparky4 <sparky4@4ch.maidlab.jp>
Date: Tue, 8 Jul 2014 20:40:09 +0000 (-0500)
Subject: 	new file:   16/modex16/ED.JPG
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=6d2deab47a9764ceb4790e2c97492c74e2d13c5c;p=16.git

	new file:   16/modex16/ED.JPG
	new file:   16/modex16/EDw.PCX
	new file:   16/modex16/KOISHI^^.PNG
	modified:   16/modex16/MODEX16.OBJ
	modified:   16/modex16/PCXTEST.C
	modified:   16/modex16/PCXTEST.EXE
	modified:   16/modex16/PCXTEST.OBJ
	modified:   16/modex16/TEST.OBJ
	modified:   16/modex16/koishi^^.pcx
---

diff --git a/16/modex16/ED.JPG b/16/modex16/ED.JPG
new file mode 100644
index 00000000..e8d95cc8
Binary files /dev/null and b/16/modex16/ED.JPG differ
diff --git a/16/modex16/EDw.PCX b/16/modex16/EDw.PCX
new file mode 100644
index 00000000..2427b5da
Binary files /dev/null and b/16/modex16/EDw.PCX differ
diff --git a/16/modex16/KOISHI^^.PNG b/16/modex16/KOISHI^^.PNG
new file mode 100644
index 00000000..d05e871b
Binary files /dev/null and b/16/modex16/KOISHI^^.PNG differ
diff --git a/16/modex16/MODEX16.OBJ b/16/modex16/MODEX16.OBJ
index a8b6c13f..2088a282 100644
Binary files a/16/modex16/MODEX16.OBJ and b/16/modex16/MODEX16.OBJ differ
diff --git a/16/modex16/PCXTEST.C b/16/modex16/PCXTEST.C
index 364aa046..683ccf8e 100644
--- a/16/modex16/PCXTEST.C
+++ b/16/modex16/PCXTEST.C
@@ -2,20 +2,21 @@
 #include "modex16.h"
 
 void main() {
-    bitmap_t bmp;
-	bitmap_t bmp2;
-	bitmap_t bmp3;
+    bitmap_t bmp;
+	bitmap_t bmp2;
+	bitmap_t bmp3;
+	bitmap_t bmp4;
     int index;
 	int ch=0x0;
 
-    bmp = modexLoadPcx("ed.pcx");
-    bmp2 = modexLoadPcx("ed2.pcx");
-    bmp3 = modexLoadPcx("koishi^^.pcx");
+    //bmp = modexLoadPcx("ed.pcx");
+    //bmp2 = modexLoadPcx("ed2.pcx");
+    bmp4 = modexLoadPcx("koishi^^.pcx");
     modexEnter();
 
     /* fix up the palette and everything */
-    //modexPalUpdate(bmp.palette);
-    modexPalUpdate(bmp2.palette);
+    //modexPalUpdate(bmp2.palette);
+    modexPalUpdate(bmp4.palette);
 
     /* don't show the drawing page */
     modexShowPage(VGA + PAGE_SIZE);
@@ -24,15 +25,19 @@ void main() {
     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);
+    modexDrawBmp(VGA, 0, 0, &bmp3, 1);
+    //modexDrawBmp(VGA, 170, 100, &bmp3, 0);
+	modexDrawBmp(VGA, 100, 100, &bmp4, 1);
+    //modexDrawBmp(VGA, 0, 0, &bmp, 2);
     modexShowPage(VGA);
 //    for(index = 0; index<500; index++) {
-	while(!kbhit()){ // conditions of screen saver
+	while(1/*!kbhit()*/){ // conditions of screen saver
 		modexWaitBorder();
 				ch=getch();
 				if(ch==0x71)break; // 'q'
 				if(ch==0x1b)break; // 'ESC'
 	    }
+	    free();
     modexLeave();
 
     return;
diff --git a/16/modex16/PCXTEST.EXE b/16/modex16/PCXTEST.EXE
index 8fa4aa0a..59be48b2 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 2f421a2a..0f23263e 100644
Binary files a/16/modex16/PCXTEST.OBJ and b/16/modex16/PCXTEST.OBJ differ
diff --git a/16/modex16/TEST.OBJ b/16/modex16/TEST.OBJ
index 788b5c6e..b123261f 100644
Binary files a/16/modex16/TEST.OBJ and b/16/modex16/TEST.OBJ differ
diff --git a/16/modex16/koishi^^.pcx b/16/modex16/koishi^^.pcx
index a43dd15f..0dbbc0da 100644
Binary files a/16/modex16/koishi^^.pcx and b/16/modex16/koishi^^.pcx differ