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 b073c98fd478ab1ac3d305d0a1256aa8f1d7a20b..abb9c11e936dd171713ce6b4915135d440ff2949 100644 (file)
--- a/16/modex16/MAKEFILE
+++ b/16/modex16/MAKEFILE
@@ -1,4 +1,4 @@
-FLAGS=-0 -d2 \r
+FLAGS=-0 -d2 -mh \r
 all: test.exe pcxtest.exe\r
 \r
 test.exe: test.obj modex16.obj\r

diff --git a/16/modex16/MODEX16.OBJ b/16/modex16/MODEX16.OBJ
index cc02f78010bb936a9e41afde2c94994bcbaf6cfb..fdffbd6d7284b3a0e3b254198124c451b32102dc 100644 (file)
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 0d72f30ebea339b1c702c23cf3f03cb98b621584..784a3caf428ab4413f4dad293dde74499a89f392 100644 (file)
--- a/16/modex16/PCXTEST.C
+++ b/16/modex16/PCXTEST.C
@@ -3,41 +3,46 @@
 \r
 void main() {\r
     bitmap_t bmp;\r
-       bitmap_t bmp2;\r
-       bitmap_t bmp3;
-       bitmap_t bmp4;\r
-    int index;\r
-       int ch=0x0;\r
+       //bitmap_t bmp2;\r
+       bitmap_t bmp3;\r
+       //bitmap_t bmp4;\r
+//     int index;\r
+       //int ch=0x0;\r
 \r
     //bmp = modexLoadPcx("ed.pcx");\r
-    //bmp2 = modexLoadPcx("ed2.pcx");\r
-    bmp4 = modexLoadPcx("koishi^^.pcx");\r
-    modexEnter();\r
+//     bmp = modexLoadPcx("koishi^^.pcx");\r
+       bmp = modexLoadPcx("chikyuu.pcx");\r
+       bmp3 = modexLoadPcx("flower.pcx");\r
+    /*bmp2 = modexLoadPcx("ed2.pcx");\r
+    bmp3 = modexLoadPcx("flower.pcx");\r
+    bmp4 = modexLoadPcx("koishi^^.pcx");*/\r
+       modexEnter();\r
 \r
     /* fix up the palette and everything */\r
-    //modexPalUpdate(bmp2.palette);\r
-    modexPalUpdate(bmp4.palette);\r
+       modexPalUpdate(bmp3.palette);\r
 \r
     /* don't show the drawing page */\r
     modexShowPage(VGA + PAGE_SIZE);\r
 \r
     /* clear and draw one sprite and one bitmap */\r
     modexClearRegion(VGA, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0);\r
-       modexDrawBmp(VGA, 20, 20, &bmp2, 0);\r
-    modexDrawBmp(VGA, 180, 20, &bmp, 1);
-    modexDrawBmp(VGA, 0, 0, &bmp3, 1);\r
-    //modexDrawBmp(VGA, 170, 100, &bmp3, 0);\r
-       modexDrawBmp(VGA, 100, 100, &bmp4, 1);\r
-    //modexDrawBmp(VGA, 0, 0, &bmp, 2);\r
+       /*modexDrawBmp(VGA, 20, 20, &bmp2, 0);\r
+    modexDrawBmp(VGA, 180, 20, &bmp, 1);\r
+       modexDrawBmp(VGA, 180, 0, &bmp3, 1);\r
+       modexDrawBmp(VGA, 170, 100, &bmp4, 1);*/\r
+       modexDrawBmp(VGA, 0, 0, &bmp, 1);
+       modexDrawBmp(VGA, 100, 20, &bmp3, 1);\r
     modexShowPage(VGA);\r
 //    for(index = 0; index<500; index++) {\r
-       while(1/*!kbhit()*/){ // conditions of screen saver\r
+       //while(1/*!kbhit()*/){ // conditions of screen saver\r
+       while (!kbhit()){  /* Wait for a keystroke                         */\r
                modexWaitBorder();\r
-                               ch=getch();\r
-                               if(ch==0x71)break; // 'q'\r
-                               if(ch==0x1b)break; // 'ESC'\r
-           }
-    modexLeave();\r
+                               //ch=getch();\r
+                               //if(ch==0x71)break; // 'q'\r
+                               //if(ch==0x1b)break; // 'ESC'\r
+       }\r
+       (void) getch();   /* Clear the keyboard buffer                    */\r
+       modexLeave();\r
 \r
     return;\r
 }\r

diff --git a/16/modex16/PCXTEST.EXE b/16/modex16/PCXTEST.EXE
index 0dbdca7e7d1d316f700071206b318d4b1d0bd451..2b4abca2e8704f32ea249b6e14ba7d1514f3dc23 100644 (file)
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 039e02af7f1d4cb717e51e788334fb610714a427..18afed2031fe6ccb0a450c69a9ca3f140792a741 100644 (file)
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 b1f173e9c1812b2b37d5a30a19f3751d9dffb679..9c0dd89201a2a80a3a6f1a02c35ea8ba362e18b2 100644 (file)
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 f32e717c4c92d5f514f3fdbdf9e8f2df93ed18ff..b12f66b171f64ffa16a7f72a87d5ddcfa408b8c7 100644 (file)
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 (file)
index 0000000..4107f0c
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 (file)
index 0000000..92616da
Binary files /dev/null and b/16/modex16/flower.pcx differ