From: sparky4 Date: Sun, 21 Jun 2015 02:46:32 +0000 (-0500) Subject: wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=6699920bb2afd9d7ee422062ad9d71d4d640ccca;p=16.git wwww modified: Project 16.bfproject modified: src/16.c modified: src/lib/fmapread.c modified: src/lib/lib_head.h modified: src/lib/modex16.c modified: src/lib/planar.h modified: src/lib/types.h modified: src/lib/wcpu/wcpu.h modified: src/pcxtest.c modified: src/scroll.c --- diff --git a/Project 16.bfproject b/Project 16.bfproject index f5b7d095..551a7f7a 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -1,10 +1,10 @@ c2e.convert_special: 0 e2c.convert_num: 0 openfiles: /dos/z/16/doc/project.txt:127:0:0: -openfiles: /dos/z/16/src/palettec.c:882:85:1: -openfiles: /dos/z/16/src/pcxtest.c:891:0:0: +openfiles: /dos/z/16/src/palettec.c:882:0:0: +openfiles: /dos/z/16/src/pcxtest.c:890:0:0: openfiles: /dos/z/16/src/scroll.c:4297:3926:0: -openfiles: /dos/z/16/src/fmemtest.c:890:0:0: +openfiles: /dos/z/16/src/fmemtest.c:891:0:0: openfiles: /dos/z/16/src/emmtest.c:439:0:0: openfiles: /dos/z/16/src/emsdump.c:890:0:0: openfiles: /dos/z/16/src/maptest.c:890:0:0: @@ -13,18 +13,18 @@ openfiles: /dos/z/16/src/test.c:890:0:0: openfiles: /dos/z/16/src/test2.c:890:0:0: openfiles: /dos/z/16/src/lib/modex16.c:890:0:0: openfiles: /dos/z/16/src/lib/modex16.h:966:338:0: -openfiles: /dos/z/16/src/lib/planar.h:1010:511:0: +openfiles: /dos/z/16/src/lib/planar.h:1008:127:0: openfiles: /dos/z/16/src/lib/planar.c:944:0:0: openfiles: /dos/z/16/src/lib/bitmap.c:890:0:0: openfiles: /dos/z/16/src/lib/bitmap.h:0:0:0: openfiles: /dos/z/16/src/lib/wcpu/wcpu.c:942:0:0: -openfiles: /dos/z/16/src/lib/wcpu/wcpu.h:995:0:0: +openfiles: /dos/z/16/src/lib/wcpu/wcpu.h:962:0:0: openfiles: /dos/z/16/src/lib/dos_kb.c:118:0:0: openfiles: /dos/z/16/src/lib/dos_kb.h:361:0:0: -openfiles: /dos/z/16/src/lib/mapread.c:2792:1988:0: -openfiles: /dos/z/16/src/lib/mapread.h:148:0:0: -openfiles: /dos/z/16/src/lib/fmapread.c:5968:4541:0: -openfiles: /dos/z/16/src/lib/fmapread.h:240:0:0: +openfiles: /dos/z/16/src/lib/mapread.c:3072:1988:0: +openfiles: /dos/z/16/src/lib/mapread.h:147:0:0: +openfiles: /dos/z/16/src/lib/fmapread.c:5029:4541:0: +openfiles: /dos/z/16/src/lib/fmapread.h:0:0:0: openfiles: /dos/z/16/src/lib/exmm/memory.c:308:215:0: openfiles: /dos/z/16/src/lib/exmm/memory.h:0:0:0: openfiles: /dos/z/16/src/lib/exmm/emmsize.h:1223:819:0: @@ -33,12 +33,12 @@ openfiles: /dos/z/16/src/lib/jsmn/farjsmn.c:7182:6170:0: openfiles: /dos/z/16/src/lib/jsmn/farjsmn.h:861:381:0: openfiles: /dos/z/16/src/lib/lib_head.c:890:0:0: openfiles: /dos/z/16/src/lib/lib_head.h:890:338:0: -openfiles: /dos/z/16/makefile:890:45:0: -openfiles: /dos/z/16/src/lib/types.h:885:0:0: +openfiles: /dos/z/16/makefile:1190:45:0: +openfiles: /dos/z/16/src/lib/types.h:1228:0:0: openfiles: /dos/z/16/src/16.h:943:0:0: -openfiles: /dos/z/16/src/16.c:929:0:0: +openfiles: /dos/z/16/src/16.c:928:0:0: openfiles: /dos/z/16/src/lib/scroll16.h:961:0:0: -openfiles: /dos/z/16/src/lib/scroll16.c:944:0:0: +openfiles: /dos/z/16/src/lib/scroll16.c:944:0:1: snr_recursion_level: 0 convertcolumn_horizontally: 0 adv_open_matchname: 0 @@ -50,7 +50,7 @@ view_left_panel: 0 default_mime_type: text/plain e2c.convert_xml: 1 c2e.convert_iso: 0 -opendir: file:///dos/z/16/src/lib/wcpu +opendir: file:///dos/z/16/src/lib wrap_text_default: 0 bookmarks_filename_mode: 1 ssearch_text: getfree @@ -75,57 +75,58 @@ ssearch_regex: 0 e2c.convert_iso: 0 ssearch_casesens: 0 charmap_block: 1 -recent_files: file:///dos/z/rbaka.c -recent_files: file:///dos/z/baka.c -recent_files: file:///dos/z/bakac.c -recent_files: file:///dos/z/16/src/lib/xms.c -recent_files: file:///dos/z/16/src/lib/xms.h -recent_files: file:///dos/z/16/src/lib/ems.c recent_files: file:///dos/z/16/src/emm.c recent_files: file:///dos/z/16/src/far.c recent_files: file:///dos/z/16/src/emstest.c recent_files: file:///dos/z/16/src/lib/exmm/x.bat recent_files: file:///dos/z/16/src/lib/jsmn/jsmn.c recent_files: file:///dos/z/16/src/lib/jsmn/jsmn.h +recent_files: file:///dos/z/16/src/lib/PLANAR.C +recent_files: file:///dos/z/16/16.c +recent_files: file:///dos/z/16/src/lib/wcpu/wtest.c +recent_files: file:///dos/z/16/src/lib/wcpu/wtest.h +recent_files: file:///dos/z/16/src/lib/wcpu/makefile +recent_files: file:///dos/z/16/src/lib/fmapread.c recent_files: file:///dos/z/16/doc/project.txt recent_files: file:///dos/z/16/src/palettec.c recent_files: file:///dos/z/16/src/pcxtest.c recent_files: file:///dos/z/16/src/fmemtest.c +recent_files: file:///dos/z/16/src/emmtest.c recent_files: file:///dos/z/16/src/emsdump.c recent_files: file:///dos/z/16/src/maptest.c -recent_files: file:///dos/z/16/src/emmtest.c +recent_files: file:///dos/z/16/src/scroll.c +recent_files: file:///dos/z/16/src/maptest0.c recent_files: file:///dos/z/16/src/test.c +recent_files: file:///dos/z/16/src/test2.c recent_files: file:///dos/z/16/src/lib/modex16.h recent_files: file:///dos/z/16/src/lib/planar.h -recent_files: file:///dos/z/16/src/maptest0.c +recent_files: file:///dos/z/16/src/lib/planar.c +recent_files: file:///dos/z/16/src/lib/bitmap.c +recent_files: file:///dos/z/16/src/lib/modex16.c recent_files: file:///dos/z/16/src/lib/bitmap.h +recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.c +recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.h recent_files: file:///dos/z/16/src/lib/dos_kb.c -recent_files: file:///dos/z/16/src/lib/PLANAR.C recent_files: file:///dos/z/16/src/lib/dos_kb.h -recent_files: file:///dos/z/16/src/test2.c -recent_files: file:///dos/z/16/src/lib/bitmap.c recent_files: file:///dos/z/16/src/lib/mapread.c recent_files: file:///dos/z/16/src/lib/mapread.h -recent_files: file:///dos/z/16/src/lib/fmapread.c -recent_files: file:///dos/z/16/src/lib/exmm/memory.c recent_files: file:///dos/z/16/src/lib/fmapread.h +recent_files: file:///dos/z/16/src/lib/exmm/memory.h +recent_files: file:///dos/z/16/src/lib/exmm/emmsize.h recent_files: file:///dos/z/16/src/lib/exmm/emmret.h -recent_files: file:///dos/z/16/src/lib/lib_head.h -recent_files: file:///dos/z/16/src/lib/types.h recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.c -recent_files: file:///dos/z/16/makefile -recent_files: file:///dos/z/16/src/lib/exmm/memory.h +recent_files: file:///dos/z/16/src/lib/exmm/memory.c recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.h -recent_files: file:///dos/z/16/src/lib/exmm/emmsize.h recent_files: file:///dos/z/16/src/lib/lib_head.c -recent_files: file:///dos/z/16/src/scroll.c -recent_files: file:///dos/z/16/src/lib/modex16.c -recent_files: file:///dos/z/16/16.c -recent_files: file:///dos/z/16/src/lib/wcpu/wtest.c -recent_files: file:///dos/z/16/src/lib/wcpu/wtest.h -recent_files: file:///dos/z/16/src/lib/wcpu/makefile +recent_files: file:///dos/z/16/src/lib/lib_head.h +recent_files: file:///dos/z/16/makefile +recent_files: file:///dos/z/16/src/lib/types.h +recent_files: file:///dos/z/16/src/16.h +recent_files: file:///dos/z/16/src/16.c +recent_files: file:///dos/z/16/src/lib/scroll16.h +recent_files: file:///dos/z/16/src/lib/scroll16.c snr_replacetype: 0 -savedir: file:///dos/z/16/src +savedir: file:///dos/z/16/src/lib spell_check_default: 1 spell_insert_entities: 0 last_filefilter: diff --git a/src/16.c b/src/16.c index 1dae6896..5f3487fe 100644 --- a/src/16.c +++ b/src/16.c @@ -23,5 +23,5 @@ void main(int argc, char *argv[]) { - + } diff --git a/src/lib/fmapread.c b/src/lib/fmapread.c index 2b7eb0b7..12c52ea3 100644 --- a/src/lib/fmapread.c +++ b/src/lib/fmapread.c @@ -181,7 +181,7 @@ again: /* I think it crashes on the line below when it tries to parse the data of huge maps... wwww this is a jsmn problem wwww */ -//++++ +//++++ r = jsmn_parse(&p, js, jslen, tok, tokcount); //0000fprintf(stdout, "r= [%d]\n", r); if (r < 0) { diff --git a/src/lib/lib_head.h b/src/lib/lib_head.h index b4b18d6e..3d5355d3 100644 --- a/src/lib/lib_head.h +++ b/src/lib/lib_head.h @@ -137,7 +137,7 @@ must be zeroed before using this macro */ //#define trap(N,R) intr(N,R) typedef union REGPACK regs_t; -typedef enum {FALSE,TRUE} boolean; +typedef enum {false,true} boolean; void wait(clock_t wait); void* AllocateLargestFreeBlock(size_t* Size); diff --git a/src/lib/modex16.c b/src/lib/modex16.c index af4c946e..1f2b58b0 100644 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -183,7 +183,7 @@ modexShowPage(page_t *page) { outp(CRTC_DATA, crtcOffset); /* wait for one retrace */ - while (!(inp(INPUT_STATUS_1) & VRETRACE)); + while (!(inp(INPUT_STATUS_1) & VRETRACE)); /* do PEL panning here */ outp(AC_INDEX, 0x33); @@ -320,7 +320,7 @@ modexDrawBmpRegion(page_t *page, int x, int y, ;-- begin plane painting MOV AX, height ; start the row counter - MOV rowCounter, AX ; + MOV rowCounter, AX ; MOV DI, poffset ; go to the first pixel MOV SI, bmpOffset ; go to the bmp pixel ROW_LOOP: @@ -400,7 +400,7 @@ modexDrawSpriteRegion(page_t *page, int x, int y, ;-- begin plane painting MOV AX, height ; start the row counter - MOV rowCounter, AX ; + MOV rowCounter, AX ; MOV DI, poffset ; go to the first pixel MOV SI, bmpOffset ; go to the bmp pixel ROW_LOOP: diff --git a/src/lib/planar.h b/src/lib/planar.h index 38ee46eb..1e617ce0 100644 --- a/src/lib/planar.h +++ b/src/lib/planar.h @@ -20,7 +20,7 @@ * */ /* - * Functions and types for a planar image buffer. + * Functions and types for a planar image buffer. * This is meant to be able to load into video memory faster. */ #include "src/lib/bitmap.h" diff --git a/src/lib/types.h b/src/lib/types.h index 63b7f3ad..cf3bec48 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -22,12 +22,16 @@ /* * Just some handy typedefs that make it easier to think about the low * level code - */ + */ + +#ifndef TYPE_H +#define TYPE_H typedef unsigned char byte; typedef unsigned short word; typedef unsigned long dword; typedef signed char sbyte; typedef signed short sword; -typedef signed long sdword; +typedef signed long sdword; +#endif/*TYPE_H*/ diff --git a/src/lib/wcpu/wcpu.h b/src/lib/wcpu/wcpu.h index ab741502..ba69b686 100644 --- a/src/lib/wcpu/wcpu.h +++ b/src/lib/wcpu/wcpu.h @@ -27,6 +27,6 @@ //#define TEST -extern byte detectcpu(void); +byte detectcpu(void); #endif/*_WCPU_H_*/ diff --git a/src/pcxtest.c b/src/pcxtest.c index 989aa58f..4053e51a 100644 --- a/src/pcxtest.c +++ b/src/pcxtest.c @@ -19,7 +19,7 @@ * Fifth Floor, Boston, MA 02110-1301 USA. * */ - + #include #include #include diff --git a/src/scroll.c b/src/scroll.c index 9d3a93f1..65929b5a 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -977,6 +977,6 @@ animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, s //modexClearRegion(top->page, 66, 66, 2, 40, 0); //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40); //turn this off if XT - //XTif(detectcpu() > 0) + //XTif(detectcpu() > 0) modexWaitBorder(); }