modified: 16/DOS_GFX.EXE

	modified:   16/DOS_GFX.OBJ
	modified:   16/dos_gfx.cpp
	modified:   16/dos_gfx.h
	modified:   16/modex16/PCXTEST.C
	modified:   16/modex16/PCXTEST.EXE
	modified:   16/modex16/PCXTEST.OBJ
	new file:   16/modex16/q.pcx
	new file:   16/modex16/w.pcx
	modified:   boop.sh

diff --git a/16/DOS_GFX.EXE b/16/DOS_GFX.EXE
index 10e536c5b1d77432e03b2126453abe034aac0c9e..08b7ecdf6a6a06dc3fce81201c4cdd5b25576554 100644 (file)
Binary files a/16/DOS_GFX.EXE and b/16/DOS_GFX.EXE differ

diff --git a/16/DOS_GFX.OBJ b/16/DOS_GFX.OBJ
index 69225db8fdab6654745a6f7a025401982c06c690..cb4069d50c74f520e28d386ae7724a10f6e10d49 100644 (file)
Binary files a/16/DOS_GFX.OBJ and b/16/DOS_GFX.OBJ differ

diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index f26fd4f7de71450862b08013513d66713b964c11..7e3327b531019f22c7c3c3cdae8b180e3ea27c74 100644 (file)
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -19,7 +19,7 @@ byte *vga = (byte *) MK_FP(0xA000, 0);
  * to be included.\r
  */\r
 #define TESTING\r
-#define TILE\r
+//#define TILE\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //                                                                         //\r
@@ -90,7 +90,7 @@ short colortest(){
 \r
 //color \82Ä\82·\82Æ\r
 short colorz(){\r
-               if(gq < HGQ){\r
+               if(gq <= HGQ){\r
 //----           cls(gq, vaddr);\r
                                cls(gq, vga);\r
                                gq++;\r
@@ -127,7 +127,7 @@ short ding(int q){
                ||q==16\r
                ) && gq == BONK){\r
                                                if(coor < HGQ && coor < LGQ) coor = LGQ;\r
-                                               if(coor < HGQ-1){\r
+                                               if(coor < HGQ){\r
                                                                coor++;\r
                                }else{ coor = LGQ;\r
                                                bakax = rand()%3; bakay = rand()%3;\r
@@ -145,7 +145,7 @@ short ding(int q){
                }\r
 \r
                if(q==7||q==9){\r
-                               if(gq < HGQ){\r
+                               if(gq <= HGQ){\r
                                                if(q == 7) ssd(q);\r
                                                if(q == 9){ ssd(q); coor++; }\r
                                                gq++;\r
@@ -310,7 +310,7 @@ int main(void)
                                                setvideo(1);\r
                                }\r
                }*/ // else off\r
-               mxFillBox(0, 0, VW, BH, 10, OP_SET);\r
+               //mxFillBox(0, 0, VW, BH, 10, OP_SET);\r
                while(1){ // conditions of screen saver\r
                while(!kbhit()){\r
                        ding(key);\r

diff --git a/16/dos_gfx.h b/16/dos_gfx.h
index ce24e28af11680252332b4169cf0ff1d1d95f005..70bddb634c11ff34ccb401a1b564f7817efa9345 100644 (file)
--- a/16/dos_gfx.h
+++ b/16/dos_gfx.h
@@ -10,7 +10,7 @@
 //static hgq=NUM_COLORS/(1/8)\r
 #define BONK       400\r
 #define LGQ         32\r
-#define HGQ         56\r
+#define HGQ         55\r
 #define TILEWH                 16
 #define QUADWH                 TILEWH/2
 #define BUFFMX                 4\r

diff --git a/16/modex16/PCXTEST.C b/16/modex16/PCXTEST.C
index 784a3caf428ab4413f4dad293dde74499a89f392..6e3e6a3feb55dac01dab2e1f15afc97b80a12974 100644 (file)
--- a/16/modex16/PCXTEST.C
+++ b/16/modex16/PCXTEST.C
@@ -3,15 +3,15 @@
 \r
 void main() {\r
     bitmap_t bmp;\r
-       //bitmap_t bmp2;\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
-//     bmp = modexLoadPcx("koishi^^.pcx");\r
-       bmp = modexLoadPcx("chikyuu.pcx");\r
+       bmp = modexLoadPcx("w.pcx");
+       bmp2 = modexLoadPcx("q.pcx");\r
        bmp3 = modexLoadPcx("flower.pcx");\r
     /*bmp2 = modexLoadPcx("ed2.pcx");\r
     bmp3 = modexLoadPcx("flower.pcx");\r
@@ -19,7 +19,7 @@ void main() {
        modexEnter();\r
 \r
     /* fix up the palette and everything */\r
-       modexPalUpdate(bmp3.palette);\r
+       modexPalUpdate(bmp.palette);\r
 \r
     /* don't show the drawing page */\r
     modexShowPage(VGA + PAGE_SIZE);\r
@@ -30,8 +30,10 @@ void main() {
     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
+       modexDrawBmp(VGA, 100, 0, &bmp, 0);
+       //modexDrawBmp(VGA, 120, 20, &bmp3, 0);
+       modexDrawBmp(VGA, 100, 0, &bmp2, 1);
+       //modexDrawBmp(VGA, 120, 60, &bmp3, 1);\r
     modexShowPage(VGA);\r
 //    for(index = 0; index<500; index++) {\r
        //while(1/*!kbhit()*/){ // conditions of screen saver\r

diff --git a/16/modex16/PCXTEST.EXE b/16/modex16/PCXTEST.EXE
index 2b4abca2e8704f32ea249b6e14ba7d1514f3dc23..f8ee41dc797304fb307d5ef6dc7234609855ac30 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 18afed2031fe6ccb0a450c69a9ca3f140792a741..aef600438498e676ebb57b223bf9ef3f0fc23d9b 100644 (file)
Binary files a/16/modex16/PCXTEST.OBJ and b/16/modex16/PCXTEST.OBJ differ

diff --git a/16/modex16/q.pcx b/16/modex16/q.pcx
new file mode 100644 (file)
index 0000000..a51d634
Binary files /dev/null and b/16/modex16/q.pcx differ

diff --git a/16/modex16/w.pcx b/16/modex16/w.pcx
new file mode 100644 (file)
index 0000000..ad80879
Binary files /dev/null and b/16/modex16/w.pcx differ

diff --git a/boop.sh b/boop.sh
index 86e769c8d819d61e046f41cb1de72417f937374b..04f25e2ff22d361d1a590b63901dcb4a66aeb080 100644 (file)
--- a/boop.sh
+++ b/boop.sh
@@ -2,3 +2,4 @@ git commit -a
 git push x4 master
 git push origin master
 git push jp master
+git push hub master