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
	modified:   16/lib/lib_com.h
	modified:   16proj.bfproject

diff --git a/16/DOS_GFX.EXE b/16/DOS_GFX.EXE
index 4019618bcb5b367dfb19a683a6eefbe8730f5c43..0d89d2d705e3559efee1fa9daa9daa60998b2d39 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 00248b20692579e8fe325fff7e490e44f81f01cd..75f41767c71fe17e2879e596fc61f0f8752e56de 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 e962e60138a337a25a0d5334540dfa7d99dc43c9..3a5c79f9cb1546a6523ba72fb3f02dac7a3397c7 100644 (file)
--- a/16/Project 16.bfproject
+++ b/16/Project 16.bfproject
@@ -1,20 +1,20 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/16/16/dos_gfx.cpp:6494:6858:1:
-openfiles: /dos/z/16/16/dos_gfx.h:363:0: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_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:
-openfiles: /dos/z/16/16/lib/lib_com.h:2553:1416:0:
+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:4025:2832:0:
+openfiles: /dos/z/16/16/lib/x/MODEX.H:3282:2568: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.h:0:0:0:
-openfiles: /dos/z/4x4_16/modex/DEMO01.PAS:3301:2608:0:
-openfiles: /dos/z/4x4_16/!/c/TUT10.C:4286:3454:0:
+openfiles: /dos/z/16/16/lib/x/MXBB.ASM:564:0:0:
+openfiles: /dos/z/4x4_16/modex/DEMO01.PAS:2972:2585:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -26,10 +26,10 @@ view_left_panel: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0
-opendir: file:///dos/z/4x4_16/!/c
+opendir: file:///dos/z/4x4_16/modex
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: Readkey;
+ssearch_text: mxBitBlt
 snr_casesens: 0
 view_blocks: 1
 name: project 16
@@ -75,26 +75,27 @@ recent_files: file:///dos/z/16/16/Project%2016.bfproject
 recent_files: file:///dos/z/16/16/lib/x/compile.bat
 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/MXVS.ASM
 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/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.cpp
 recent_files: file:///dos/z/16/16/lib/lib_com.h
-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/scroll.txt
 recent_files: file:///dos/z/16/16/lib/x/MODEX.H
-recent_files: file:///dos/z/16/16/lib/x/MODEX.DEF
+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/src/lib/dos_gfx.h
-recent_files: file:///dos/z/16/16/16.txt
-recent_files: file:///dos/z/4x4_16/modex/DEMO07.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/lib/x/MAKEFILE
+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/4x4_16/!/c/TUT10.C
 snr_replacetype: 0
 savedir: file:///dos/z/16/16
 spell_check_default: 1
@@ -106,21 +107,21 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: mxPutPixel
-searchlist: setactive
-searchlist: vga
-searchlist: put
-searchlist: mxOutStr
-searchlist: Str
-searchlist: mxSetTextColor
-searchlist: OP_TRANS
 searchlist: texyt
 searchlist: text
 searchlist: Palette
 searchlist: bios_keybrd
-searchlist:   Readkey;  Readkey;
-searchlist:  Readkey;
+searchlist: Readkey;  Readkey;
+searchlist: Readkey;
 searchlist: Readkey;
+searchlist: Putpic
+searchlist: bit
+searchlist: sxInit
+searchlist: Init
+searchlist: q
+searchlist: sx
+searchlist: bit
+searchlist: mxBitBlt
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0

diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index 40c0a24df0436767564f16af03fe9f093560b9e9..57ec6b5b3c7da11ea4c9f5f2114ff8285a485f80 100644 (file)
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -5,11 +5,11 @@
 \r
 int old_mode;\r
 //color \82Ä\82·\82Æ\r
-int gq = LGQ;\r
+short gq = LGQ;\r
+\r
 //\82Ä\82·\82Æ\r
-int q = 0;\r
-int bakax = 0, bakay = 0;\r
-cord xx = rand()&0%320, yy = rand()&0%240, sx = 0, sy = 0;\r
+short bakax = 0, bakay = 0;\r
+syte xx = rand()&0%SW, yy = rand()&0%SH, sx = 0, sy = 0;\r
 byte coor;\r
 \r
 byte *vga = (byte *) MK_FP(0xA000, 0);\r
@@ -25,7 +25,7 @@ byte *vga = (byte *) MK_FP(0xA000, 0);
 // setvideo() - This function Manages the video modes                                    //\r
 //                                                                         //\r
 /////////////////////////////////////////////////////////////////////////////\r
-void setvideo(/*byte mode, */int vq){\r
+void setvideo(/*byte mode, */short vq){\r
                union REGS in, out;\r
 \r
                if(!vq){ // deinit the video\r
@@ -36,7 +36,7 @@ void setvideo(/*byte mode, */int vq){
                                in.h.al = old_mode;\r
                                int86(0x10, &in, &out);\r
 \r
-               }else if(vq == 1){ // init the video\r
+               }else if(vq==1){ // init the video\r
                                // get old video mode\r
                                in.h.ah = 0xf;\r
                                int86(0x10, &in, &out);\r
@@ -65,7 +65,7 @@ void cls(byte color, byte *Where){
 }\r
 \r
 //color \82Ä\82·\82Æ\r
-int colortest(){\r
+short colortest(){\r
                if(gq < NUM_COLORS){\r
                                cls(gq, vga);\r
                                gq++;\r
@@ -74,7 +74,7 @@ int colortest(){
 }\r
 \r
 //color \82Ä\82·\82Æ\r
-int colorz(){\r
+short colorz(){\r
                if(gq < HGQ){\r
 //----           cls(gq, vaddr);\r
                                cls(gq, vga);\r
@@ -84,7 +84,7 @@ int colorz(){
 }\r
 \r
 //slow spectrum down\r
-void ssd(int svq){\r
+void ssd(short svq){\r
                if(sy < SH+1){\r
                                if(sx < SW+1){\r
                                                //plotpixel(xx, yy, coor, vga);\r
@@ -102,9 +102,9 @@ void ssd(int svq){
 }\r
 \r
 /*-----------ding-------------*/\r
-int ding(int q){\r
+short ding(int q){\r
 \r
-               int d3y;\r
+               short d3y;\r
 \r
 //++++  if(q <= 4 && q!=2 && gq == BONK-1) coor = rand()%HGQ;\r
                if((q == 2\r
@@ -119,7 +119,7 @@ int ding(int q){
                                }\r
                }\r
 \r
-               if(q==8){ colorz(); return gq; }else\r
+               if(q==8){ colorz(); return gq; mxOutText(SW/2, SH/2, "\83o\83J\83s"); }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
@@ -138,17 +138,17 @@ int ding(int q){
                }\r
                if((q<5 && gq<BONK) || (q==16 && gq<BONK)){ // the number variable make the colors more noticable\r
                                if(q==1){\r
-                                               if(xx==SW){bakax=0;}\r
+                                               if(xx==VW){bakax=0;}\r
                                                if(xx==0){bakax=1;}\r
-                                               if(yy==SH){bakay=0;}\r
+                                               if(yy==VH){bakay=0;}\r
                                                if(yy==0){bakay=1;}\r
                                }else if(q==3){\r
-                                               if(xx!=SW||yy!=SH){\r
+                                               if(xx!=VW||yy!=VH){\r
                                                                if(xx==0){bakax=1;bakay=-1;d3y=1;}\r
                                                                if(yy==0){bakax=1;bakay=0;d3y=1;}\r
-                                                               if(xx==SW){bakax=-1;bakay=-1;d3y=1;}\r
-                                                               if(yy==SH){bakax=1;bakay=0;d3y=1;}\r
-                                               }else if(xx==SW&&yy==SH) xx=yy=0;\r
+                                                               if(xx==VW){bakax=-1;bakay=-1;d3y=1;}\r
+                                                               if(yy==VH){bakax=1;bakay=0;d3y=1;}\r
+                                               }else if(xx==VW&&yy==VH) xx=yy=0;\r
                                }\r
                                if(q==3){\r
                                                if(d3y){\r
@@ -208,7 +208,7 @@ int ding(int q){
 //interesting effects\r
                                if(q==16)\r
                                {\r
-                               int tx=0,ty=0;\r
+                               short tx=0,ty=0;\r
                                tx+=xx+16;\r
                                ty+=yy+16;\r
                                mxPutPixel(tx, ty, coor);\r
@@ -225,8 +225,7 @@ int ding(int q){
                                if(q==2||q==4||q==16){ bakax = rand()%3; bakay = rand()%3; }  //random 3 switch\r
                                gq++;\r
 //if(xx<0||xx>320||yy<0||yy>(SH*3))\r
-//       printf("%d %d %d %d %d %d\n", xx, yy, coor, bakax, bakay, getPixel_X(xx,yy));\r
-//       printf("%d\n", getPixel_X(xx,yy));\r
+//       printf("%d %d %d %d %d\n", xx, yy, coor, bakax, bakay);\r
                }else gq = LGQ;\r
                return gq;\r
 }\r
@@ -244,12 +243,11 @@ int ding(int q){
 \r
 int main(void)\r
                {\r
-               int key,d,xpos,ypos,xdir,ydir;
+               short key,d,xpos,ypos,xdir,ydir;\r
                int ch=0x0;\r
-               //short int temp;\r
                // main variables\r
-               d=1; // switch variable\r
-               key=4; // default screensaver number\r
+               d=4; // switch variable\r
+               key=3; // default screensaver number\r
                xpos=0;\r
                ypos=0;\r
                xdir=1;\r
@@ -270,9 +268,9 @@ int main(void)
                                                setvideo(1);\r
                                }\r
                }*/ // else off\r
-               while(1){ // conditions of screen saver
+               while(1){ // conditions of screen saver\r
                while(!kbhit()){\r
-                       ding(key);
+                       ding(key);\r
                }\r
                //end of screen savers\r
                //doTest();\r
@@ -295,14 +293,14 @@ int main(void)
                        {\r
                                mxPutPixel(0, y, 15);\r
                                mxPutPixel(VW-1, y, 15);\r
-                       }
+                       }\r
                        \r
                getch();\r
-               //mxFillBox(xx, yy, QUADWH, QUADWH, 1, 16);
-               //mxFillBox(xx, yy, QUADWH, QUADWH, 2, 16);
-               //mxFillBox(xx, yy, QUADWH, QUADWH, 3, 16);
+               //mxFillBox(xx, yy, QUADWH, QUADWH, 1, 16);\r
+               //mxFillBox(xx, yy, QUADWH, QUADWH, 2, 16);\r
+               //mxFillBox(xx, yy, QUADWH, QUADWH, 3, 16);\r
                //mxFillBox(xx, yy, QUADWH, QUADWH, 4, 16);\r
-               mxSetTextColor(16, OP_TRANS);\r
+               mxSetTextColor(8, OP_TRANS);\r
                                mxOutText(56, SH-40, "CRAZY!!!!]");\r
                                mxOutText(64, SH-32, "CRAZY!!!!]");\r
                                mxOutText(64, SH-24, "____  CRAZY!!!!]");\r
@@ -318,18 +316,18 @@ int main(void)
                                //mxOutText(64, SH-40, "CRAZY!!!!");\r
                                //mxOutText(64, SH-32, "CRAZY!!!!");\r
                                //mxOutText(64, SH-24, "  _  CRAZY!!!!");\r
-                               //mxOutText(64, SH-16, "  _    _  CRAZY!!!!");
+                               //mxOutText(64, SH-16, "  _    _  CRAZY!!!!");\r
                                mxPan(xpos,ypos);\r
-                               for(int o = 0; o<TILEWH; o++){
+                               for(short o = 0; o<TILEWH; o++){\r
                                        xpos+=xdir;\r
-                                       ypos+=ydir;
-                                       //mxWaitRetrace();
+                                       ypos+=ydir;\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
                        //    direction! }\r
-                       }
-                       ch=getch();
+                       }\r
+                       ch=getch();\r
                        if(ch==0x71)break; // 'q'\r
                        if(ch==0x1b)break; // 'ESC'\r
                }\r

diff --git a/16/dos_gfx.h b/16/dos_gfx.h
index a6a08f9f4a4a50ad94c3a3ceaea075b1271d2cb3..7f9b23790ed800ab56338058caac5e2adac85b71 100644 (file)
--- a/16/dos_gfx.h
+++ b/16/dos_gfx.h
@@ -25,7 +25,7 @@ byte Xfont[2048];
 \r
 //void drawChar(int x, int y, int color, byte c);\r
 //void drawText(int x, int y, int color, byte string);\r
-void setvideo(/*byte mode, */int vq);\r
+void setvideo(/*byte mode, */short vq);\r
 //void setvbuff(int vq);\r
 //void updatevbuff();\r
 void cls(byte color, byte *Where);\r
@@ -40,11 +40,11 @@ void cls(byte color, byte *Where);
 //void BlockMove();\r
 //void eraseplayer(int x, int y);\r
 //void drawplayer(int x, int y, int color);\r
-int colortest();\r
-int colorz();\r
-void ssd(int svq);\r
+short colortest();\r
+short colorz();\r
+void ssd(short svq);\r
 //void pdump(int mult);\r
 //void tulip();\r
-int ding(int q);\r
+short ding(int q);\r
 \r
 #endif/*_DOSLIB_GFX_H_*/\r

diff --git a/16/lib/lib_com.h b/16/lib/lib_com.h
index 2910d6874b6d8f99a721436bf54241de50520bad..90392ec6f8efb6effc0ec258e3753e9fe0df47de 100644 (file)
--- a/16/lib/lib_com.h
+++ b/16/lib/lib_com.h
@@ -98,7 +98,7 @@
 \r
 typedef unsigned char byte;
 typedef unsigned int word;
-typedef unsigned short cord;\r
+typedef unsigned short syte;\r
 \r
 void wait(clock_t wait);\r
 \r

diff --git a/16proj.bfproject b/16proj.bfproject
index a010bfcb4d491d24b4cb4fece3b46030f712bfe7..305fa8b6c3bf2636bc96195435d854ed2d7aaf7b 100644 (file)
--- a/16proj.bfproject
+++ b/16proj.bfproject
@@ -69,29 +69,29 @@ recent_files: file:///dos/z/16/16.bat
 recent_files: file:///dos/z/16/remake.bat
 recent_files: file:///dos/z/16/ojowwww.cpp
 recent_files: file:///dos/z/16/doc/project.txt
-recent_files: file:///dos/z/16/src/eng_core.cpp
+recent_files: file:///dos/z/16/src/eng_comm.h
+recent_files: file:///dos/z/16/src/eng_comm.cpp
 recent_files: file:///dos/z/16/src/eng_core.h
+recent_files: file:///dos/z/16/src/eng_core.cpp
 recent_files: file:///dos/z/16/src/eng_gfx.cpp
 recent_files: file:///dos/z/16/src/lib/dos_comm.c
-recent_files: file:///dos/z/16/src/lib/dos_gfx.h
+recent_files: file:///dos/z/16/src/lib/dos_comm.h
+recent_files: file:///dos/z/16/src/eng_gfx.h
 recent_files: file:///dos/z/16/src/eng_snd.h
+recent_files: file:///dos/z/16/src/lib/dos_gfx.h
 recent_files: file:///dos/z/16/src/eng_snd.cpp
-recent_files: file:///dos/z/16/src/eng_gfx.h
-recent_files: file:///dos/z/16/src/eng_comm.h
-recent_files: file:///dos/z/16/src/eng_comm.cpp
-recent_files: file:///dos/z/16/src/lib/dos_comm.h
+recent_files: file:///dos/z/16/src/lib/lib_com.cpp
+recent_files: file:///dos/z/16/src/lib/opl2.h
 recent_files: file:///dos/z/16/src/lib/dos_gfx.cpp
+recent_files: file:///dos/z/16/src/lib/dos_opl2.cpp
+recent_files: file:///dos/z/16/src/lib/lib_com.h
 recent_files: file:///dos/z/16/src/eng_ai.h
 recent_files: file:///dos/z/16/src/eng_ai.cpp
-recent_files: file:///dos/z/16/src/lib/dos_opl2.cpp
+recent_files: file:///dos/z/16/src/engine.h
+recent_files: file:///dos/z/16/doc/ojoww.cpp
 recent_files: file:///dos/z/16/src/timer.cpp
 recent_files: file:///dos/z/16/src/timer.h
 recent_files: file:///dos/z/16/src/main.cpp
-recent_files: file:///dos/z/16/doc/ojoww.cpp
-recent_files: file:///dos/z/16/src/engine.h
-recent_files: file:///dos/z/16/src/lib/lib_com.cpp
-recent_files: file:///dos/z/16/src/lib/lib_com.h
-recent_files: file:///dos/z/16/src/lib/opl2.h
 recent_files: file:///dos/z/16/doc/char.txt
 snr_replacetype: 0
 savedir: file:///dos/z/16/doc