From: sparky4 Date: Fri, 6 Jun 2014 14:30:30 +0000 (-0500) Subject: modified: 16/DOS_GFX.EXE X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0dd992dad94b4e77db64936dba6a08f55550fd47;p=16.git 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 4019618b..0d89d2d7 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 00248b20..75f41767 100644 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 e962e601..3a5c79f9 100644 --- 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 40c0a24d..57ec6b5b 100644 --- a/16/dos_gfx.cpp +++ b/16/dos_gfx.cpp @@ -5,11 +5,11 @@ int old_mode; //color ‚Ä‚·‚Æ -int gq = LGQ; +short gq = LGQ; + //‚Ä‚·‚Æ -int q = 0; -int bakax = 0, bakay = 0; -cord xx = rand()&0%320, yy = rand()&0%240, sx = 0, sy = 0; +short bakax = 0, bakay = 0; +syte xx = rand()&0%SW, yy = rand()&0%SH, sx = 0, sy = 0; byte coor; byte *vga = (byte *) MK_FP(0xA000, 0); @@ -25,7 +25,7 @@ byte *vga = (byte *) MK_FP(0xA000, 0); // setvideo() - This function Manages the video modes // // // ///////////////////////////////////////////////////////////////////////////// -void setvideo(/*byte mode, */int vq){ +void setvideo(/*byte mode, */short vq){ union REGS in, out; if(!vq){ // deinit the video @@ -36,7 +36,7 @@ void setvideo(/*byte mode, */int vq){ in.h.al = old_mode; int86(0x10, &in, &out); - }else if(vq == 1){ // init the video + }else if(vq==1){ // init the video // get old video mode in.h.ah = 0xf; int86(0x10, &in, &out); @@ -65,7 +65,7 @@ void cls(byte color, byte *Where){ } //color ‚Ä‚·‚Æ -int colortest(){ +short colortest(){ if(gq < NUM_COLORS){ cls(gq, vga); gq++; @@ -74,7 +74,7 @@ int colortest(){ } //color ‚Ä‚·‚Æ -int colorz(){ +short colorz(){ if(gq < HGQ){ //---- cls(gq, vaddr); cls(gq, vga); @@ -84,7 +84,7 @@ int colorz(){ } //slow spectrum down -void ssd(int svq){ +void ssd(short svq){ if(sy < SH+1){ if(sx < SW+1){ //plotpixel(xx, yy, coor, vga); @@ -102,9 +102,9 @@ void ssd(int svq){ } /*-----------ding-------------*/ -int ding(int q){ +short ding(int q){ - int d3y; + short d3y; //++++ if(q <= 4 && q!=2 && gq == BONK-1) coor = rand()%HGQ; if((q == 2 @@ -119,7 +119,7 @@ int ding(int q){ } } - if(q==8){ colorz(); return gq; }else + if(q==8){ colorz(); return gq; mxOutText(SW/2, SH/2, "ƒoƒJƒs"); }else if(q==10){ ssd(q); /*printf("%d\n", coor);*/ }else if(q==5){ colortest(); return gq; }else if(q==11){ colorz(); delay(100); return gq; } @@ -138,17 +138,17 @@ int ding(int q){ } if((q<5 && gq320||yy<0||yy>(SH*3)) -// printf("%d %d %d %d %d %d\n", xx, yy, coor, bakax, bakay, getPixel_X(xx,yy)); -// printf("%d\n", getPixel_X(xx,yy)); +// printf("%d %d %d %d %d\n", xx, yy, coor, bakax, bakay); }else gq = LGQ; return gq; } @@ -244,12 +243,11 @@ int ding(int q){ int main(void) { - int key,d,xpos,ypos,xdir,ydir; + short key,d,xpos,ypos,xdir,ydir; int ch=0x0; - //short int temp; // main variables - d=1; // switch variable - key=4; // default screensaver number + d=4; // switch variable + key=3; // default screensaver number xpos=0; ypos=0; xdir=1; @@ -270,9 +268,9 @@ int main(void) setvideo(1); } }*/ // else off - while(1){ // conditions of screen saver + while(1){ // conditions of screen saver while(!kbhit()){ - ding(key); + ding(key); } //end of screen savers //doTest(); @@ -295,14 +293,14 @@ int main(void) { mxPutPixel(0, y, 15); mxPutPixel(VW-1, y, 15); - } + } getch(); - //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); + //mxFillBox(xx, yy, QUADWH, QUADWH, 2, 16); + //mxFillBox(xx, yy, QUADWH, QUADWH, 3, 16); //mxFillBox(xx, yy, QUADWH, QUADWH, 4, 16); - mxSetTextColor(16, OP_TRANS); + mxSetTextColor(8, OP_TRANS); mxOutText(56, SH-40, "CRAZY!!!!]"); mxOutText(64, SH-32, "CRAZY!!!!]"); mxOutText(64, SH-24, "____ CRAZY!!!!]"); @@ -318,18 +316,18 @@ int main(void) //mxOutText(64, SH-40, "CRAZY!!!!"); //mxOutText(64, SH-32, "CRAZY!!!!"); //mxOutText(64, SH-24, " _ CRAZY!!!!"); - //mxOutText(64, SH-16, " _ _ CRAZY!!!!"); + //mxOutText(64, SH-16, " _ _ CRAZY!!!!"); mxPan(xpos,ypos); - for(int o = 0; o(VW-SW-1)) || (xpos<1)){xdir=-xdir;} if( (ypos>(VH-SH-1)) || (ypos<1)){ydir=-ydir;} // { Hit a boundry, change // direction! } - } - ch=getch(); + } + ch=getch(); if(ch==0x71)break; // 'q' if(ch==0x1b)break; // 'ESC' } diff --git a/16/dos_gfx.h b/16/dos_gfx.h index a6a08f9f..7f9b2379 100644 --- a/16/dos_gfx.h +++ b/16/dos_gfx.h @@ -25,7 +25,7 @@ byte Xfont[2048]; //void drawChar(int x, int y, int color, byte c); //void drawText(int x, int y, int color, byte string); -void setvideo(/*byte mode, */int vq); +void setvideo(/*byte mode, */short vq); //void setvbuff(int vq); //void updatevbuff(); void cls(byte color, byte *Where); @@ -40,11 +40,11 @@ void cls(byte color, byte *Where); //void BlockMove(); //void eraseplayer(int x, int y); //void drawplayer(int x, int y, int color); -int colortest(); -int colorz(); -void ssd(int svq); +short colortest(); +short colorz(); +void ssd(short svq); //void pdump(int mult); //void tulip(); -int ding(int q); +short ding(int q); #endif/*_DOSLIB_GFX_H_*/ diff --git a/16/lib/lib_com.h b/16/lib/lib_com.h index 2910d687..90392ec6 100644 --- a/16/lib/lib_com.h +++ b/16/lib/lib_com.h @@ -98,7 +98,7 @@ typedef unsigned char byte; typedef unsigned int word; -typedef unsigned short cord; +typedef unsigned short syte; void wait(clock_t wait); diff --git a/16proj.bfproject b/16proj.bfproject index a010bfcb..305fa8b6 100644 --- 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