modified: 16/DOS_GFX.EXE

	modified:   16/DOS_GFX.OBJ
	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 0d89d2d705e3559efee1fa9daa9daa60998b2d39..a9f888ea160fbb65fc03a7434a0c2f6837dbb115 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 75f41767c71fe17e2879e596fc61f0f8752e56de..79e5df42d65653092742efd8fee506009534b425 100644 (file)
Binary files a/16/DOS_GFX.OBJ and b/16/DOS_GFX.OBJ differ

diff --git a/16/Project 16.bfproject b/16/Project 16.bfproject
index 3a5c79f9cb1546a6523ba72fb3f02dac7a3397c7..953c86ff806ca1d1b009d070d4708e5df3f33a80 100644 (file)
--- a/16/Project 16.bfproject
+++ b/16/Project 16.bfproject
@@ -1,7 +1,7 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/16/16/dos_gfx.cpp:8117:7398:1:
-openfiles: /dos/z/16/16/dos_gfx.h:1243:0:0:
+openfiles: /dos/z/16/16/dos_gfx.cpp:8510:2871:1:
+openfiles: /dos/z/16/16/dos_gfx.h:346:0:0:
 openfiles: /dos/z/16/16/dos_kb.c:892:395:0:
 openfiles: /dos/z/16/16/dos_kb.h:60:0:0:
 openfiles: /dos/z/16/16/lib/lib_com.cpp:0:0:0:
@@ -9,12 +9,14 @@ openfiles: /dos/z/16/16/lib/lib_com.h:2557:1575:0:
 openfiles: /dos/z/16/16/scroll.txt:5307:5080:0:
 openfiles: /dos/z/16/16/project16.txt:8161:6091:0:
 openfiles: /dos/z/16/16/16.txt:0:0:0:
-openfiles: /dos/z/16/16/lib/x/MODEX.H:3282:2568:0:
+openfiles: /dos/z/16/16/lib/x/MODEX.H:1631:987:0:
 openfiles: /dos/z/16/16/lib/intro/lib.c:2417:1910:0:
-openfiles: /dos/z/16/src/lib/dos_gfx.cpp:2384:0:0:
+openfiles: /dos/z/16/src/lib/dos_gfx.cpp:2384:869:0:
 openfiles: /dos/z/16/src/lib/dos_gfx.h:0:0:0:
 openfiles: /dos/z/16/16/lib/x/MXBB.ASM:564:0:0:
-openfiles: /dos/z/4x4_16/modex/DEMO01.PAS:2972:2585:0:
+openfiles: /dos/z/4x4_16/modex/DEMO01.PAS:2972:2048:0:
+openfiles: /dos/z/4x4_16/modex/DEMO07.PAS:1567:683:0:
+openfiles: /dos/z/16/16/lib/x/MXCR.ASM:280:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -29,7 +31,7 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/4x4_16/modex
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: mxBitBlt
+ssearch_text:  OP_SET
 snr_casesens: 0
 view_blocks: 1
 name: project 16
@@ -77,25 +79,26 @@ recent_files: file:///dos/z/16/16/x.bat
 recent_files: file:///dos/z/16/16/xx.bat
 recent_files: file:///dos/z/16/16/lib/x/MXPN.ASM
 recent_files: file:///dos/z/16/16/lib/x/MODEX.DEF
-recent_files: file:///dos/z/4x4_16/modex/DEMO07.PAS
 recent_files: file:///dos/z/16/16/lib/x/MAKEFILE
-recent_files: file:///dos/z/16/16/dos_gfx.cpp
-recent_files: file:///dos/z/16/16/dos_gfx.h
-recent_files: file:///dos/z/16/16/16.txt
-recent_files: file:///dos/z/16/16/lib/lib_com.cpp
+recent_files: file:///dos/z/4x4_16/!/c/TUT10.C
+recent_files: file:///dos/z/16/16/lib/x/MXVS.ASM
+recent_files: file:///dos/z/16/16/lib/lib_com.h
 recent_files: file:///dos/z/16/16/dos_kb.c
 recent_files: file:///dos/z/16/16/dos_kb.h
-recent_files: file:///dos/z/16/16/lib/lib_com.h
-recent_files: file:///dos/z/16/16/project16.txt
+recent_files: file:///dos/z/16/16/lib/lib_com.cpp
 recent_files: file:///dos/z/16/16/scroll.txt
+recent_files: file:///dos/z/16/16/project16.txt
+recent_files: file:///dos/z/16/16/lib/x/MXBB.ASM
 recent_files: file:///dos/z/16/16/lib/x/MODEX.H
-recent_files: file:///dos/z/16/16/lib/intro/lib.c
-recent_files: file:///dos/z/4x4_16/!/c/TUT10.C
+recent_files: file:///dos/z/16/16/16.txt
 recent_files: file:///dos/z/16/src/lib/dos_gfx.h
-recent_files: file:///dos/z/16/src/lib/dos_gfx.cpp
-recent_files: file:///dos/z/16/16/lib/x/MXVS.ASM
-recent_files: file:///dos/z/16/16/lib/x/MXBB.ASM
 recent_files: file:///dos/z/4x4_16/modex/DEMO01.PAS
+recent_files: file:///dos/z/16/src/lib/dos_gfx.cpp
+recent_files: file:///dos/z/16/16/lib/intro/lib.c
+recent_files: file:///dos/z/16/16/dos_gfx.cpp
+recent_files: file:///dos/z/16/16/lib/x/MXCR.ASM
+recent_files: file:///dos/z/4x4_16/modex/DEMO07.PAS
+recent_files: file:///dos/z/16/16/dos_gfx.h
 snr_replacetype: 0
 savedir: file:///dos/z/16/16
 spell_check_default: 1
@@ -107,13 +110,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: texyt
-searchlist: text
-searchlist: Palette
-searchlist: bios_keybrd
-searchlist: Readkey;  Readkey;
-searchlist: Readkey;
-searchlist: Readkey;
 searchlist: Putpic
 searchlist: bit
 searchlist: sxInit
@@ -122,6 +118,13 @@ searchlist: q
 searchlist: sx
 searchlist: bit
 searchlist: mxBitBlt
+searchlist: #ifdef TESTING
+searchlist: BUFFMX
+searchlist: (TILEWH*2))
+searchlist: VH
+searchlist: mxSetClipRegion
+searchlist: mxFillBox(
+searchlist:  OP_SET
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0

diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index 57ec6b5b3c7da11ea4c9f5f2114ff8285a485f80..4542e718ed5963a9840f5a6d2fe2c203e91ddfc9 100644 (file)
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -18,7 +18,8 @@ byte *vga = (byte *) MK_FP(0xA000, 0);
  * Comment out the following #define if you don't want the testing main()\r
  * to be included.\r
  */\r
-#define TESTING\r
+#define TESTING
+#define TILE\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //                                                                         //\r
@@ -47,10 +48,11 @@ void setvideo(/*byte mode, */short vq){
                                mxSetMode( MX_320x240 );\r
 //                             mxSetVirtualScreen(SW+(SW/4), SH+(SH/4));\r
 //                             mxSetVirtualScreen(SW*2, SH*2);\r
-                               mxSetVirtualScreen(VW,VH);\r
+                               mxSetVirtualScreen(VW,(VH+(TILEWH*BUFFMX)));\r
 //                             mxSetVirtualScreen((640-(TILEWH*4)),(480-(TILEWH*4)));\r
-                               mxSetClip(0);\r
-                               //mxSetClipRegion(0, 0, SW, SH);\r
+                               mxSetClip(true);\r
+                               mxSetClipRegion(0, 0, VW, (VH+(TILEWH*BUFFMX)));
+                               //mxSetClipRegion(0, VH+1, VW, (TILEWH*BUFFMX));\r
                }\r
 }\r
 \r
@@ -61,7 +63,7 @@ void setvideo(/*byte mode, */short vq){
 //                                                                                                                                              //\r
 /////////////////////////////////////////////////////////////////////////////\r
 void cls(byte color, byte *Where){\r
-               _fmemset(Where, color, VW*(VH));\r
+               _fmemset(Where, color, VW*(VH*1.5));\r
 }\r
 \r
 //color \82Ä\82·\82Æ\r
@@ -119,7 +121,7 @@ short ding(int q){
                                }\r
                }\r
 \r
-               if(q==8){ colorz(); return gq; mxOutText(SW/2, SH/2, "\83o\83J\83s"); }else\r
+               if(q==8){ colorz(); return gq; mxOutText(SW/2, SH/2, "bakapi"); }else\r
                if(q==10){ ssd(q); /*printf("%d\n", coor);*/ }else\r
                if(q==5){ colortest(); return gq; }else\r
                if(q==11){ colorz(); delay(100); return gq; }\r
@@ -181,19 +183,31 @@ short ding(int q){
                                                                        yy++;\r
                                                                }\r
                                                }else{\r
-                                                               if(!bakax){\r
-//                                                                     xx-=TILEWH;\r
-                                                                       xx--;\r
-                                                               }else if(bakax>1){\r
-//                                                                     xx+=TILEWH;\r
-                                                                       xx++;\r
+                                                               if(!bakax){
+                                                                       #ifdef TILE
+                                                                       xx-=TILEWH;
+                                                                       #else\r
+                                                                       xx--;
+                                                                       #endif\r
+                                                               }else if(bakax>1){
+                                                                       #ifdef TILE
+                                                                       xx+=TILEWH;
+                                                                       #else\r
+                                                                       xx++;
+                                                                       #endif\r
                                                                }\r
-                                                               if(!bakay){\r
-//                                                                     yy-=TILEWH;\r
-                                                                       yy--;\r
-                                                               }else if(bakay>1){\r
-//                                                                     yy+=TILEWH;\r
-                                                                       yy++;\r
+                                                               if(!bakay){
+                                                                       #ifdef TILE\r
+                                                                       yy-=TILEWH;
+                                                                       #else\r
+                                                                       yy--;
+                                                                       #endif\r
+                                                               }else if(bakay>1){
+                                                                       #ifdef TILE\r
+                                                                       yy+=TILEWH;
+                                                                       #else\r
+                                                                       yy++;
+                                                                       #endif\r
                                                                }\r
                                                }\r
                                }\r
@@ -202,7 +216,7 @@ short ding(int q){
                                                if(xx<0) xx=(VW/*-TILEWH*/);\r
                                                if(yy<0) yy=(VH/*-TILEWH*/);\r
                                                if(xx>(VW/*-TILEWH*/)) xx=0;\r
-                                               if(yy>(VH/*-TILEWH*/)) yy=0;\r
+                                               if(yy>(VH+(TILEWH*BUFFMX))) yy=0;\r
                                }\r
 \r
 //interesting effects\r
@@ -215,9 +229,12 @@ short ding(int q){
                                //printf("%d %d %d %d %d %d\n", xx, yy, tx, ty, TILEWH);\r
 \r
                                // plot the pixel\r
-                               }else{\r
-//                                     mxFillBox(xx, yy, TILEWH, TILEWH, coor, 16);\r
-                                       mxPutPixel(xx, yy, coor);\r
+                               }else{
+                                       #ifdef TILE\r
+                                       mxFillBox(xx, yy, TILEWH, TILEWH, coor, OP_SET);
+                                       #else\r
+                                       mxPutPixel(xx, yy, coor);
+                                       #endif\r
                                } \r
 \r
                                if(q==2) mxPutPixel(rand()%VW, rand()%(VH), 0);\r
@@ -247,7 +264,7 @@ int main(void)
                int ch=0x0;\r
                // main variables\r
                d=4; // switch variable\r
-               key=3; // default screensaver number\r
+               key=4; // default screensaver number\r
                xpos=0;\r
                ypos=0;\r
                xdir=1;\r
@@ -321,10 +338,10 @@ int main(void)
                                for(short o = 0; o<TILEWH; o++){\r
                                        xpos+=xdir;\r
                                        ypos+=ydir;\r
-                                       //mxWaitRetrace();\r
+                                       mxWaitRetrace();\r
                                }\r
                                if( (xpos>(VW-SW-1))  || (xpos<1)){xdir=-xdir;}\r
-                               if( (ypos>(VH-SH-1)) || (ypos<1)){ydir=-ydir;} // { Hit a boundry, change\r
+                               if( (ypos>((VH+(TILEWH*13))-SH-1)) || (ypos<1)){ydir=-ydir; delay(1000);} // { Hit a boundry, change\r
                        //    direction! }\r
                        }\r
                        ch=getch();\r
@@ -332,7 +349,7 @@ int main(void)
                        if(ch==0x1b)break; // 'ESC'\r
                }\r
                setvideo(0);\r
-               printf("wwww\nResolution: %dx%d\n", SW,SH);\r
+               printf("wwww\nVirtual Resolution: %dx%d\n", VW,VH);\r
                printf("Mode X Library Version: %d\n", mxGetVersion());\r
                //puts("where to next?  It's your move! wwww");\r
                printf("bakapi ver. 1.04.09.04\nis made by sparky4\81i\81\86\83Ö\81\85\81j feel free to use it ^^\nLicence: GPL v2\n");\r

diff --git a/16/dos_gfx.h b/16/dos_gfx.h
index 7f9b23790ed800ab56338058caac5e2adac85b71..82368d906cbc6cfbaa2b877df61e96612fcddef6 100644 (file)
--- a/16/dos_gfx.h
+++ b/16/dos_gfx.h
@@ -11,13 +11,14 @@
 #define BONK       400\r
 #define LGQ         32\r
 #define HGQ         56\r
-#define TILEWH                   16
-#define QUADWH                 TILEWH/4\r
+#define TILEWH                 16
+#define QUADWH                 TILEWH/4
+#define BUFFMX                 3\r
 /*byte SIZE = 80;      // Size =  40 = 1 across, 4 down\r
                     // Size =  80 = 2 across, 2 down\r
                     // Size = 160 = 4 across, 1 down*/\r
 //#define VMEM     0xA000 // = vga\r
-byte Xfont[2048];
+
 #define SW     320\r
 #define SH     240\r
 #define VW     560\r