From: sparky4 <sparky4@cock.li>
Date: Sun, 13 Jul 2014 18:05:08 +0000 (-0500)
Subject: 	modified:   16/DOS_GFX.EXE
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=4098c490a285a716b46640e8c04f621ccf441f81;p=16.git

	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 10e536c5..08b7ecdf 100644
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 69225db8..cb4069d5 100644
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 f26fd4f7..7e3327b5 100644
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -19,7 +19,7 @@ byte *vga = (byte *) MK_FP(0xA000, 0);
  * to be included.
  */
 #define TESTING
-#define TILE
+//#define TILE
 
 /////////////////////////////////////////////////////////////////////////////
 //                                                                         //
@@ -90,7 +90,7 @@ short colortest(){
 
 //color ‚Ä‚·‚Æ
 short colorz(){
-		if(gq < HGQ){
+		if(gq <= HGQ){
 //----		  cls(gq, vaddr);
 				cls(gq, vga);
 				gq++;
@@ -127,7 +127,7 @@ short ding(int q){
 		||q==16
 		) && gq == BONK){
 						if(coor < HGQ && coor < LGQ) coor = LGQ;
-						if(coor < HGQ-1){
+						if(coor < HGQ){
 								coor++;
 				}else{ coor = LGQ;
 						bakax = rand()%3; bakay = rand()%3;
@@ -145,7 +145,7 @@ short ding(int q){
 		}
 
 		if(q==7||q==9){
-				if(gq < HGQ){
+				if(gq <= HGQ){
 						if(q == 7) ssd(q);
 						if(q == 9){ ssd(q); coor++; }
 						gq++;
@@ -310,7 +310,7 @@ int main(void)
 						setvideo(1);
 				}
 		}*/ // else off
-		mxFillBox(0, 0, VW, BH, 10, OP_SET);
+		//mxFillBox(0, 0, VW, BH, 10, OP_SET);
 		while(1){ // conditions of screen saver
 		while(!kbhit()){
 			ding(key);
diff --git a/16/dos_gfx.h b/16/dos_gfx.h
index ce24e28a..70bddb63 100644
--- a/16/dos_gfx.h
+++ b/16/dos_gfx.h
@@ -10,7 +10,7 @@
 //static hgq=NUM_COLORS/(1/8)
 #define BONK	    400
 #define LGQ	     32
-#define HGQ	     56
+#define HGQ	     55
 #define TILEWH			16
 #define QUADWH			TILEWH/2
 #define BUFFMX			4
diff --git a/16/modex16/PCXTEST.C b/16/modex16/PCXTEST.C
index 784a3caf..6e3e6a3f 100644
--- a/16/modex16/PCXTEST.C
+++ b/16/modex16/PCXTEST.C
@@ -3,15 +3,15 @@
 
 void main() {
     bitmap_t bmp;
-	//bitmap_t bmp2;
+	bitmap_t bmp2;
 	bitmap_t bmp3;
 	//bitmap_t bmp4;
 //	int index;
 	//int ch=0x0;
 
     //bmp = modexLoadPcx("ed.pcx");
-//	bmp = modexLoadPcx("koishi^^.pcx");
-	bmp = modexLoadPcx("chikyuu.pcx");
+	bmp = modexLoadPcx("w.pcx");
+	bmp2 = modexLoadPcx("q.pcx");
 	bmp3 = modexLoadPcx("flower.pcx");
     /*bmp2 = modexLoadPcx("ed2.pcx");
     bmp3 = modexLoadPcx("flower.pcx");
@@ -19,7 +19,7 @@ void main() {
 	modexEnter();
 
     /* fix up the palette and everything */
-	modexPalUpdate(bmp3.palette);
+	modexPalUpdate(bmp.palette);
 
     /* don't show the drawing page */
     modexShowPage(VGA + PAGE_SIZE);
@@ -30,8 +30,10 @@ void main() {
     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);
+	modexDrawBmp(VGA, 100, 0, &bmp, 0);
+	//modexDrawBmp(VGA, 120, 20, &bmp3, 0);
+	modexDrawBmp(VGA, 100, 0, &bmp2, 1);
+	//modexDrawBmp(VGA, 120, 60, &bmp3, 1);
     modexShowPage(VGA);
 //    for(index = 0; index<500; index++) {
 	//while(1/*!kbhit()*/){ // conditions of screen saver
diff --git a/16/modex16/PCXTEST.EXE b/16/modex16/PCXTEST.EXE
index 2b4abca2..f8ee41dc 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 18afed20..aef60043 100644
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
index 00000000..a51d634c
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
index 00000000..ad808796
Binary files /dev/null and b/16/modex16/w.pcx differ
diff --git a/boop.sh b/boop.sh
index 86e769c8..04f25e2f 100644
--- 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