X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=16%2Fdos_gfx.cpp;h=268b99ae5f9393febd76d0e967ba3a385450f477;hb=3267427b850b84f59a555c07deec6656abdb776e;hp=abe38f8ea754bfc4a569d6f5de3ac39f0d934626;hpb=08c5e85e75688a487235467fc90493357ab6330d;p=16.git

diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index abe38f8e..268b99ae 100644
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -1,7 +1,8 @@
 //DOS Graphics thingy by sparky4 licence GPL v2
 //a special thanks to everyone to release source code for mode X
 /*src\lib\*/
-#include "dos_gfx.h"
+#include "dos_gfx.h"
+//#include "lib\modex16.h" //____
 
 int old_mode;
 //color ‚Ä‚·‚Æ
@@ -9,7 +10,7 @@ short gq = LGQ;
 
 //‚Ä‚·‚Æ
 short bakax = 0, bakay = 0;
-syte xx = rand()&0%SW, yy = rand()&0%SH, sx = 0, sy = 0;
+word xx = rand()&0%SW, yy = rand()&0%SH, sx = 0, sy = 0;
 byte coor;
 
 byte *vga = (byte *) MK_FP(0xA000, 0);
@@ -19,7 +20,7 @@ byte *vga = (byte *) MK_FP(0xA000, 0);
  * to be included.
  */
 #define TESTING
-#define TILE
+//#define TILE
 
 /////////////////////////////////////////////////////////////////////////////
 //                                                                         //
@@ -56,20 +57,18 @@ void setvideo(/*byte mode, */short vq){
 				//mxSetClipRegion(0, VH+1, VW, (TILEWH*BUFFMX));
 		}
 }
-
-void pdump(){
-	int mult=QUADWH;
-	int palq=mult*16;
-	int palcol=0;
-	for(int paly=0; paly<palq; paly++){
-		for(int palx=0; palx<palq; palx++){
-				mxFillBox((SW-palq)+palx+32, paly+32, TILEWH, TILEWH, palcol, OP_SET);
-			for(int i=1; i<mult; i++) palx++;
-			palcol++;
-		}
-	for(int i=1; i<mult; i++) paly++;
-	}
-}
+
+void pdump(){
+	int mult=(QUADWH)/2;
+	int palq=(mult)*16;
+	int palcol=0;
+	for(int paly=0; paly<palq; paly+=mult){
+		for(int palx=0; palx<palq; palx+=mult){
+				mxFillBox((SW-palq)+palx+32, paly+32, TILEWH, TILEWH, palcol, OP_SET);
+			palcol++;
+		}
+	}
+}
 
 /////////////////////////////////////////////////////////////////////////////
 //																		 //
@@ -92,7 +91,7 @@ short colortest(){
 
 //color ‚Ä‚·‚Æ
 short colorz(){
-		if(gq < HGQ){
+		if(gq <= HGQ){
 //----		  cls(gq, vaddr);
 				cls(gq, vga);
 				gq++;
@@ -129,7 +128,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;
@@ -147,7 +146,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++;
@@ -286,7 +285,9 @@ short ding(int q){
  */
 
 int main(void)
-		{
+		{
+		//bitmap_t bmp; //____
+		//bmp = modexLoadPcx("chikyuu.pcx"); //____
 		short key,d,xpos,ypos,xdir,ydir;
 		int ch=0x0;
 		// main variables
@@ -296,7 +297,10 @@ int main(void)
 		ypos=TILEWH*2;
 		xdir=1;
 		ydir=1;
-		setvideo(1);
+		setvideo(1);
+		//modexPalUpdate(bmp.palette); //____
+		//modexDrawBmp(VGA, 0, 0, &bmp, 0); //____
+		//getch(); //____
 // screen savers
 
 /*while(d!=0){ // on!
@@ -312,7 +316,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);
@@ -339,7 +343,7 @@ int main(void)
 				mxPutPixel(0, y, 15);
 				mxPutPixel(VW-1, y, 15);
 			}
-			*/
+			*/
 			pdump();
 			getch();
 			//text box
@@ -371,7 +375,7 @@ mxBitBlt(TILEWH*2, TILEWH*2, SW, SH, 32, (SH+64+32));
 					//if(ypos==1 || (ypos==(BH-SH-1)))delay(500);
 					//if((xpos>(VW-SW-1)) || (xpos<1))delay(500);
 					//mxWaitRetrace();
-//mxBitBlt(32, (SH+32), SW, SH, xpos, ypos);
+//mxBitBlt(32, (SH+32), SW, SH, xpos, ypos);
 mxBitBlt(TILEWH*2, (SH+64+32), SW, SH, TILEWH*2, TILEWH*2);
 //xpos=ypos=TILEWH*2;
 mxPan(32,32);
@@ -379,7 +383,7 @@ mxPan(32,32);
 				if( (xpos>(VW-SW-1))  || (xpos<1)){xdir=-xdir;}
 				if( (ypos>(BH-SH-1)) || (ypos<1)){ydir=-ydir;} // { Hit a boundry, change
 			//    direction! }
-//mxBitBlt(32, (SH+64+32), SW, SH, xpos, ypos);
+//mxBitBlt(32, (SH+64+32), SW, SH, xpos, ypos);
 //mxBitBlt(TILEWH*2, (SH+64+32), SW, SH, TILEWH*2, TILEWH*2);
 			}
 			ch=getch();