modified: 16/DOS_GFX.EXE

	modified:   16/Project 16.bfproject
	modified:   16/dos_gfx.cpp
	modified:   16/dos_gfx.h

diff --git a/16/DOS_GFX.EXE b/16/DOS_GFX.EXE
index fb077d121af3cfc717657f0e43c2940f07bdf07c..6d51a853357fad5bb5e9c6c0c8847c113ec0c756 100644 (file)
Binary files a/16/DOS_GFX.EXE and b/16/DOS_GFX.EXE differ

diff --git a/16/Project 16.bfproject b/16/Project 16.bfproject
index 3410d4ff55b85b3b4e398965227579adb4dcb135..b84f90b0cfdb806e97205b99243bac850da50f37 100644 (file)
--- a/16/Project 16.bfproject
+++ b/16/Project 16.bfproject
@@ -1,22 +1,22 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/16/16/dos_gfx.cpp:8341:8024:0:
-openfiles: /dos/z/16/16/dos_gfx.h:941:208:0:
-openfiles: /dos/z/16/16/dos_kb.c:759:642:0:
-openfiles: /dos/z/16/16/dos_kb.h:179:0:0:
-openfiles: /dos/z/16/16/lib_com.cpp:164:0:0:
+openfiles: /dos/z/16/16/dos_gfx.cpp:0:0:1:
+openfiles: /dos/z/16/16/dos_gfx.h:0:0:0:
+openfiles: /dos/z/16/16/dos_kb.c:0:0:0:
+openfiles: /dos/z/16/16/dos_kb.h:0:0:0:
+openfiles: /dos/z/16/16/lib_com.cpp:0:0:0:
 openfiles: /dos/z/16/16/lib_com.h:0:0:0:
 openfiles: /dos/z/16/16/16.txt:0:0:0:
-openfiles: /dos/z/16/16/project16.txt:1755:1676:0:
+openfiles: /dos/z/16/16/project16.txt:0:0:0:
 openfiles: /dos/z/4x4_16/sauce/jstick.h:0:0:0:
-openfiles: /dos/z/4x4_16/sauce/keydrv.h:0:601:0:
-openfiles: /dos/z/4x4_16/sauce/sprite.h:590:35:0:
-openfiles: /dos/z/4x4_16/sauce/tile.h:327:173:0:
+openfiles: /dos/z/4x4_16/sauce/keydrv.h:0:0:0:
+openfiles: /dos/z/4x4_16/sauce/sprite.h:0:0:0:
+openfiles: /dos/z/4x4_16/sauce/tile.h:0:0:0:
 openfiles: /dos/z/4x4_16/sauce/vgabuff.h:0:0:0:
 openfiles: /dos/z/4x4_16/sauce/vgautils.h:0:0:0:
 openfiles: /dos/z/4x4_16/sauce/keydrv.c:0:0:0:
 openfiles: /dos/z/4x4_16/sauce/sprite.c:0:0:0:
-openfiles: /dos/z/4x4_16/sauce/tile.c:304:55:1:
+openfiles: /dos/z/4x4_16/sauce/tile.c:0:0:0:
 openfiles: /dos/z/4x4_16/sauce/vgabuff.c:0:0:0:
 openfiles: /dos/z/4x4_16/sauce/vgautils.c:0:0:0:
 snr_recursion_level: 0
@@ -105,7 +105,7 @@ searchlist: rect`-
 searchlist: fill_plane(
 searchlist: fmemset
 searchlist: se
-searchlist:     
+searchlist: 
 searchlist: rect
 searchlist: fmem
 searchlist: vga

diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index e5e4c6ed237822777572bfde8f84b8acc5bc3616..e3ab1efa49dabdde8fb050b7b5d316eb80ef82b1 100644 (file)
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -245,68 +245,20 @@ void set320x240x256_X(void)
 \r
 \r
 /*tile*/\r
-// This is Bresenham's Line Drawing Algorithm\r
-void drawline(int x1, int y1, int x2, int y2, char col)\r
-{\r
-               int d, x, y, ax, ay, sx, sy, dx, dy;\r
-\r
-               dx = x2-x1;\r
-               ax = ABS(dx) << 1;\r
-               sx = SGN(dx);\r
-               dy = y2-y1;\r
-               ay = ABS(dy) << 1;\r
-               sy = SGN(dy);\r
-\r
-               x = x1;\r
-               y = y1;\r
-               if( ax > ay )\r
-               {\r
-                               d = ay - (ax >> 1);\r
-                               while( x != x2 )\r
-                               {\r
-                                               putPixel_X( x, y, col );\r
-                                               if( d >= 0 )\r
-                                               {\r
-                                                               y += sy;\r
-                                                               d -= ax;\r
-                                               }\r
-                               x += sx;\r
-                               d += ay;\r
-                               }\r
-               }\r
-               else\r
-               {\r
-                               d = ax - (ay >> 1);\r
-                               while( y != y2 )\r
-                               {\r
-                                               putPixel_X( x, y, col );\r
-                                               if( d >= 0 )\r
-                                               {\r
-                                                               x += sx;\r
-                                                               d -= ay;\r
-                                               }\r
-                                               y += sy;\r
-                                               d += ax;\r
-                               }\r
-               }\r
-               return;\r
-}\r
-\r
-void drawrect(int x1, int y1, int x2, int y2, char color)\r
-{\r
-       drawline(x1,y1,x2,y1,color);\r
-       drawline(x1,y2,x2,y2,color);\r
-       drawline(x1,y1,x1,y2,color);\r
-       drawline(x2,y1,x2,y2+1,color);
-       /*byte far *p;
-       
-       p=vga+y1*width+x1;  // make p point to the start of the line
-       while((y2-y1))                  // repeat for entire line height
-               {
-               _fmemset(vga, color, x2-x1);    // set one line
-               p+=width;               // move down one row
-               }*/\r
-}\r
+void putColorBox_X(int x, int y, int w, int h, byte color) {
+       outp(0x3c4, 0x02);
+
+       int curx, cury;
+       unsigned drawptr;
+       for (curx=x; curx<(x+w); curx++) {
+               outp(0x3c5, 0x01 << (curx & 3));
+               drawptr = (unsigned)(widthBytes * y) + (curx / 4) + actStart;
+               for (cury=0; cury<h; cury++) {
+                       vga[drawptr] = color;
+                       drawptr += widthBytes;
+               }
+       }
+}
 \r
 \r
 /*-----------XXXX-------------*/\r
@@ -368,9 +320,9 @@ void drawText(int x, int y, int color, byte string)
 }\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
-//                                                                                                                                              //\r
+//                                                                         //\r
 // setvideo() - This function Manages the video modes                                    //\r
-//                                                                                                                                              //\r
+//                                                                         //\r
 /////////////////////////////////////////////////////////////////////////////\r
 void setvideo(/*byte mode, */int vq){\r
                union REGS in, out;\r
@@ -554,7 +506,8 @@ int ding(int q){
                                // plot the pixel\r
 //----           ppf(xx, yy, coor, vga);\r
 //++++0000                       putPixel_X(xx, yy, coor);\r
-                               }else drawrect(xx, yy, xx+TILEWH-1, yy+TILEWH-1, coor);\r
+                               }else putColorBox_X(xx, yy, TILEWH, TILEWH, coor);
+                               //drawrect(xx, yy, xx+TILEWH-1, yy+TILEWH-1, coor);\r
 //----           if(q==2) ppf(rand()%, rand()%height, 0, vga);\r
                                if(q==2||q==16) putPixel_X(rand()%width, rand()%height, 0);\r
                                if(q==2||q==4||q==16){ bakax = rand()%3; bakay = rand()%3; }\r

diff --git a/16/dos_gfx.h b/16/dos_gfx.h
index 1036e362fdbe2ea5cd7394b4478f09463d878f73..91ab72e4165a1724ff27c6427691bc0a26e18ea4 100644 (file)
--- a/16/dos_gfx.h
+++ b/16/dos_gfx.h
@@ -27,7 +27,7 @@ void cls(byte color, byte *Where);
 //void plotpixel(int x, int y, byte color, byte *Where);\r
 //void plotpixelfast(int x, int y, byte color, byte *Where);\r
 void putPixel_X(int x, int y, byte color);\r
-//void putTile(int x, int y, byte color);\r
+void putColorBox_X(int x, int y, int w, int h, byte color);\r
 //void BlockMove();\r
 //void eraseplayer(int x, int y);\r
 //void drawplayer(int x, int y, int color);\r