From: sparky4 <sparky4@4ch.maidlab.jp>
Date: Wed, 9 Jul 2014 19:40:20 +0000 (-0500)
Subject: 	modified:   16/modex16/MAKEFILE
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=4da5d740a876c603807f464dc26d3cff57477441;p=16.git

	modified:   16/modex16/MAKEFILE
	modified:   16/modex16/MODEX16.OBJ
	modified:   16/modex16/PCXTEST.C
	modified:   16/modex16/PCXTEST.EXE
	modified:   16/modex16/PCXTEST.OBJ
	modified:   16/modex16/TEST.EXE
	modified:   16/modex16/TEST.OBJ
	new file:   16/modex16/chikyuu.pcx
	new file:   16/modex16/flower.pcx
---

diff --git a/16/modex16/MAKEFILE b/16/modex16/MAKEFILE
index b073c98f..abb9c11e 100644
--- a/16/modex16/MAKEFILE
+++ b/16/modex16/MAKEFILE
@@ -1,4 +1,4 @@
-FLAGS=-0 -d2 
+FLAGS=-0 -d2 -mh 
 all: test.exe pcxtest.exe
 
 test.exe: test.obj modex16.obj
diff --git a/16/modex16/MODEX16.OBJ b/16/modex16/MODEX16.OBJ
index cc02f780..fdffbd6d 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 0d72f30e..784a3caf 100644
--- a/16/modex16/PCXTEST.C
+++ b/16/modex16/PCXTEST.C
@@ -3,41 +3,46 @@
 
 void main() {
     bitmap_t bmp;
-	bitmap_t bmp2;
-	bitmap_t bmp3;
-	bitmap_t bmp4;
-    int index;
-	int ch=0x0;
+	//bitmap_t bmp2;
+	bitmap_t bmp3;
+	//bitmap_t bmp4;
+//	int index;
+	//int ch=0x0;
 
     //bmp = modexLoadPcx("ed.pcx");
-    //bmp2 = modexLoadPcx("ed2.pcx");
-    bmp4 = modexLoadPcx("koishi^^.pcx");
-    modexEnter();
+//	bmp = modexLoadPcx("koishi^^.pcx");
+	bmp = modexLoadPcx("chikyuu.pcx");
+	bmp3 = modexLoadPcx("flower.pcx");
+    /*bmp2 = modexLoadPcx("ed2.pcx");
+    bmp3 = modexLoadPcx("flower.pcx");
+    bmp4 = modexLoadPcx("koishi^^.pcx");*/
+	modexEnter();
 
     /* fix up the palette and everything */
-    //modexPalUpdate(bmp2.palette);
-    modexPalUpdate(bmp4.palette);
+	modexPalUpdate(bmp3.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, 0);
-   	modexDrawBmp(VGA, 20, 20, &bmp2, 0);
-    modexDrawBmp(VGA, 180, 20, &bmp, 1);
-    modexDrawBmp(VGA, 0, 0, &bmp3, 1);
-    //modexDrawBmp(VGA, 170, 100, &bmp3, 0);
-	modexDrawBmp(VGA, 100, 100, &bmp4, 1);
-    //modexDrawBmp(VGA, 0, 0, &bmp, 2);
+   	/*modexDrawBmp(VGA, 20, 20, &bmp2, 0);
+    modexDrawBmp(VGA, 180, 20, &bmp, 1);
+	modexDrawBmp(VGA, 180, 0, &bmp3, 1);
+	modexDrawBmp(VGA, 170, 100, &bmp4, 1);*/
+	modexDrawBmp(VGA, 0, 0, &bmp, 1);
+	modexDrawBmp(VGA, 100, 20, &bmp3, 1);
     modexShowPage(VGA);
 //    for(index = 0; index<500; index++) {
-	while(1/*!kbhit()*/){ // conditions of screen saver
+	//while(1/*!kbhit()*/){ // conditions of screen saver
+	while (!kbhit()){  /* Wait for a keystroke                         */
 		modexWaitBorder();
-				ch=getch();
-				if(ch==0x71)break; // 'q'
-				if(ch==0x1b)break; // 'ESC'
-	    }
-    modexLeave();
+				//ch=getch();
+				//if(ch==0x71)break; // 'q'
+				//if(ch==0x1b)break; // 'ESC'
+	}
+	(void) getch();   /* Clear the keyboard buffer                    */
+	modexLeave();
 
     return;
 }
diff --git a/16/modex16/PCXTEST.EXE b/16/modex16/PCXTEST.EXE
index 0dbdca7e..2b4abca2 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 039e02af..18afed20 100644
Binary files a/16/modex16/PCXTEST.OBJ and b/16/modex16/PCXTEST.OBJ differ
diff --git a/16/modex16/TEST.EXE b/16/modex16/TEST.EXE
index b1f173e9..9c0dd892 100644
Binary files a/16/modex16/TEST.EXE and b/16/modex16/TEST.EXE differ
diff --git a/16/modex16/TEST.OBJ b/16/modex16/TEST.OBJ
index f32e717c..b12f66b1 100644
Binary files a/16/modex16/TEST.OBJ and b/16/modex16/TEST.OBJ differ
diff --git a/16/modex16/chikyuu.pcx b/16/modex16/chikyuu.pcx
new file mode 100644
index 00000000..4107f0cf
Binary files /dev/null and b/16/modex16/chikyuu.pcx differ
diff --git a/16/modex16/flower.pcx b/16/modex16/flower.pcx
new file mode 100644
index 00000000..92616daf
Binary files /dev/null and b/16/modex16/flower.pcx differ