X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=Project%2016.bfproject;h=204b7ab8fc9aca61cd3a649a1f9516e6bd6e0137;hb=5ad8cc4e485b54223dac7f5416ce8463e4dc09a4;hp=663f35e0ccd715bbe2d7e3a818a9c3c9bdd30d75;hpb=826bb2cb2cb8bf7397f2555b8a6b98eb0a838a3f;p=16.git

diff --git a/Project 16.bfproject b/Project 16.bfproject
old mode 100644
new mode 100755
index 663f35e0..204b7ab8
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -1,28 +1,47 @@
-<<<<<<< HEAD
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/16/doc/project.txt:60:0:0:
-openfiles: /dos/z/16/16.c:0:0:0:
-openfiles: /dos/z/16/src/scroll.c:17553:16983:1:
-openfiles: /dos/z/16/src/lib/scroll.c:359:0:0:
-openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0:
-openfiles: /dos/z/16/src/v2/source/ENGINE/CONTROLS.C:2441:1179:0:
-openfiles: /dos/z/16/src/lib/modex16.c:13778:13034:0:
-openfiles: /dos/z/16/src/lib/modex16.h:2059:913:0:
-openfiles: /dos/z/16/src/pcxtest.c:68:0:0:
-openfiles: /dos/z/16/src/lib/dos_kb.c:3352:2801:0:
-openfiles: /dos/z/16/src/lib/dos_kb.h:62:0:0:
-openfiles: /dos/z/16/src/lib/lib_head.h:165:0:0:
-openfiles: /dos/z/16/src/palettec.c:176:0:0:
-openfiles: /dos/z/16/src/test.c:415:629:0:
-openfiles: /dos/z/16/src/test2.c:18:0:0:
-openfiles: /dos/z/16/src/lib/bitmap.c:59:0:0:
-openfiles: /dos/z/16/src/lib/bitmap.h:125:0:0:
-openfiles: /dos/z/16/src/lib/lib_head.cpp:0:0:0:
-openfiles: /dos/z/16/src/lib/types.h:242:0:0:
-openfiles: /dos/z/16/makefile:22:0:0:
-openfiles: /dos/z/16/16/dos_gfx.cpp:6388:0:0:
-openfiles: /dos/z/16/16/dos_gfx.h:175:233:0:
+openfiles: /dos/z/16/doc/project.txt:80:0:0:
+openfiles: /dos/z/16/src/palettec.c:882:0:0:
+openfiles: /dos/z/16/src/pcxtest.c:931:0:0:
+openfiles: /dos/z/16/src/scroll.c:17909:17181:0:
+openfiles: /dos/z/16/src/fmemtest.c:891:0:0:
+openfiles: /dos/z/16/src/emmtest.c:405:0:0:
+openfiles: /dos/z/16/src/emsdump.c:890:0:0:
+openfiles: /dos/z/16/src/maptest.c:886:0:0:
+openfiles: /dos/z/16/src/maptest0.c:886:0:0:
+openfiles: /dos/z/16/src/test.c:890:0:0:
+openfiles: /dos/z/16/src/test2.c:886:0:0:
+openfiles: /dos/z/16/src/inputest.c:976:0:0:
+openfiles: /dos/z/16/src/lib/modex16.c:3597:3271:0:
+openfiles: /dos/z/16/src/lib/modex16.h:1052:576:0:
+openfiles: /dos/z/16/src/lib/planar.h:1008:127:0:
+openfiles: /dos/z/16/src/lib/planar.c:894: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:925:0:0:
+openfiles: /dos/z/16/src/lib/dos_kb.c:670:338:0:
+openfiles: /dos/z/16/src/lib/dos_kb.h:324:0:0:
+openfiles: /dos/z/16/src/lib/mapread.c:3072:1988:0:
+openfiles: /dos/z/16/src/lib/mapread.h:109: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:304:0:0:
+openfiles: /dos/z/16/src/lib/exmm/memory.h:0:0:0:
+openfiles: /dos/z/16/src/lib/exmm/emmsize.h:1159:693:0:
+openfiles: /dos/z/16/src/lib/exmm/emmret.h:0:0:0:
+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/16_in.c:1522:1072:0:
+openfiles: /dos/z/16/src/lib/16_in.h:3692:3652:0:
+openfiles: /dos/z/16/src/lib/16_head.c:3456:2616:0:
+openfiles: /dos/z/16/src/lib/16_head.h:3332:2969:0:
+openfiles: /dos/z/16/makefile:1235:295:1:
+openfiles: /dos/z/16/src/lib/types.h:1043:28:0:
+openfiles: /dos/z/16/src/16.h:943:0:0:
+openfiles: /dos/z/16/src/16.c:891:0:0:
+openfiles: /dos/z/16/src/lib/scroll16.h:961:0:0:
+openfiles: /dos/z/16/src/lib/scroll16.c:0:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -34,31 +53,21 @@ view_left_panel: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0
-opendir: file:///dos/z/16/src/v2/source/ENGINE
+opendir: file:///dos/z/16/src/lib
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: UnPress(
-snr_casesens: 1
+ssearch_text: INL_KeyService
+snr_casesens: 0
 view_blocks: 1
-name: project 16
-replacelist: dest
-replacelist: animatePlayer(bg, spri,
-replacelist: qi=1
-replacelist: qi<=(
-replacelist: \t\t\t\t
-replacelist: animatePlayer(bg, spri, mask, 1
-replacelist: animatePlayer(bg, spri, mask, 0
-replacelist: modexShowPage(mask->
-replacelist: modexShowPage(spri
-replacelist: player.tx == player.ty
-replacelist: TRIGGY
-replacelist: TRIGGX
-replacelist: $(SRCLIB)
-replacelist: $(SRC)
-replacelist: play->
+name: Project 16
+replacelist: mv[id]
+replacelist: ].
+replacelist: mv[id].
+replacelist: <malloc
 fb_show_hidden_f: 0
 editor_tab_width: 4
-show_visible_spacing: 1
+template: /usr/share/bluefish/templates/C_header_GPL
+show_visible_spacing: 0
 view_statusbar: 1
 display_right_margin: 0
 c2e.IE_apos_workaround: 0
@@ -69,16 +78,92 @@ ssearch_regex: 0
 e2c.convert_iso: 0
 ssearch_casesens: 0
 charmap_block: 1
-=======
-view_main_toolbar: 1
-bmarksearchmode: 0
-snr_scope: 0
-snr_type: 0
-view_cline: 0
-editor_indent_wspaces: 0
-c2e.convert_xml: 1
-snr_dotmatchall: 0
-c2e.convert_symbol: 0
+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/modex16.c
+recent_files: file:///dos/z/16/src/pcxtest.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/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/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/lib/planar.c
+recent_files: file:///dos/z/16/src/lib/bitmap.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/dos_kb.h
+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/fmapread.h
+recent_files: file:///dos/z/16/src/lib/lib_head.c
+recent_files: file:///dos/z/16/src/lib/lib_head.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/jsmn/farjsmn.c
+recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.h
+recent_files: file:///dos/z/16/src/lib/exmm/memory.c
+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.c
+recent_files: file:///dos/z/16/src/lib/scroll16.h
+recent_files: file:///dos/z/16/src/lib/scroll16.c
+recent_files: file:///dos/z/16/src/16.h
+recent_files: file:///dos/z/16/src/inputest.c
+recent_files: file:///dos/z/16/src/lib/16_in.h
+recent_files: file:///dos/z/16/src/lib/16_in.c
+snr_replacetype: 0
+savedir: file:///dos/z/16
+spell_check_default: 1
+spell_insert_entities: 0
+last_filefilter: 
+htmlbar_notebooktab: 0
+view_blockstack: 1
+snr_escape_chars: 0
+htmlbar_view: 0
+spell_lang: en
+ssearch_dotmatchall: 0
+searchlist: _dos_
+searchlist: '_dos_geninterrupt
+searchlist: _dos_geninterrupt
+searchlist: geninterrupt
+searchlist: puts
+searchlist: ctrl_Keyboard
+searchlist: keyser
+searchlist: text
+searchlist: joydeg
+searchlist: joydefs
+searchlist: MousePresent
+searchlist: JoyDefs
+searchlist: keyser
+searchlist: static void in
+searchlist: INL_KeyService
+autocomplete: 1
+outputb_show_all_output: 0
+bookmarks_show_mode: 0
+snippets_show_as_menu: 0
+adv_open_recursive: 0
+encoding: SHIFT_JIS
+e2c.convert_special: 0
+autoindent: 1
+fb_viewmode: 0
+filegloblist: *.xml
 filegloblist: *.txt
 filegloblist: *.shtml
 filegloblist: *.py
@@ -93,101 +178,16 @@ filegloblist: *.css
 filegloblist: *.cpp
 filegloblist: *.cgi
 filegloblist: *.c
-filegloblist: *
+recent_dirs: file:///dos/z/16/src
 fb_focus_follow: 1
-adv_open_recursive: 0
-recent_dirs: file:///dos/z/16/16
-encoding: UTF-8
-autoindent: 1
-e2c.convert_special: 0
-fb_viewmode: 0
-htmlbar_view: 0
-snippets_show_as_menu: 1
-bookmarks_show_mode: 0
-outputb_show_all_output: 0
-autocomplete: 1
-searchlist: mapDrawTile
-searchlist: dxThresh
-searchlist: PalFile
-searchlist: src\\lib\\
-searchlist: player.
-searchlist: src\\
-searchlist: void modexPalBlack();
-searchlist: oid modexPalBlack(
-searchlist: id modexPalBlack(
-searchlist: d modexPalBlack(
-spell_lang: en
-snr_escape_chars: 0
-view_blockstack: 1
-htmlbar_notebooktab: 0
-last_filefilter: 
-spell_insert_entities: 0
-spell_check_default: 1
-savedir: file:///dos/z/16/src
-snr_replacetype: 0
->>>>>>> 3a2e65f55f3d4f720e9076f68f6292f702369391
-recent_files: file:///dos/z/16/16/modex16/scroll.c
-recent_files: file:///dos/z/16/16/modex16/dos_kb.c
-recent_files: file:///dos/z/16/16/modex16/makefile
-recent_files: file:///dos/z/16/16/dos_kb.c
-recent_files: file:///dos/z/16/16/TEST.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/16.txt
-recent_files: file:///dos/z/16/16/lib/x/MODEX.H
-recent_files: file:///dos/z/16/16/modex16/dos_kb.h
-recent_files: file:///dos/z/16/doc/16.16
-recent_files: file:///dos/z/16/doc/16story.txt
-recent_files: file:///dos/z/16/README
-recent_files: file:///dos/z/16/scroll.c
-recent_files: file:///dos/z/16/dos_kb.h
-recent_files: file:///dos/z/16/dos_kb.c
-recent_files: file:///dos/z/16/lib/lib_head.h
-recent_files: file:///dos/z/16/modex16.c
-recent_files: file:///dos/z/16/modex16.h
-recent_files: file:///dos/z/16/types.h
-recent_files: file:///dos/z/16/pcxtest.c
-recent_files: file:///dos/z/keen-src/id_mm.h
-recent_files: file:///dos/z/keen-src/id_mm.c
-recent_files: file:///dos/z/keen-src/id_rf.h
-charmap_block: 1
-e2c.convert_iso: 0
-enable_syntax_scan: 1
-outputb_scroll_mode: 0
-leftpanel_active_tab: 0
-c2e.IE_apos_workaround: 0
-display_right_margin: 0
-replacelist: dest
-replacelist: animatePlayer(bg, spri,
-replacelist: qi=1
-replacelist: qi<=(
-replacelist: \t\t\t\t
-replacelist: animatePlayer(bg, spri, mask, 1
-replacelist: animatePlayer(bg, spri, mask, 0
-replacelist: modexShowPage(mask->
-replacelist: modexShowPage(spri
-replacelist: player.tx == player.ty
-editor_tab_width: 4
-view_statusbar: 1
-fb_show_hidden_f: 0
-name: project 16
-view_blocks: 1
-snr_casesens: 1
-c2e.convert_iso: 0
-bookmarks_filename_mode: 1
-wrap_text_default: 0
-opendir: file:///dos/z/16/src/v2/source/ENGINE
-e2c.convert_xml: 1
-default_mime_type: text/plain
-view_left_panel: 0
-htmlbar_thumbnailwidth: 300
-fb_show_backup_f: 0
-view_line_numbers: 1
-show_mbhl: 1
-adv_open_matchname: 0
-convertcolumn_horizontally: 0
-snr_recursion_level: 0
+ssearch_unescape: 0
+c2e.convert_symbol: 0
+snr_dotmatchall: 0
+c2e.convert_xml: 1
+editor_indent_wspaces: 0
+view_cline: 1
+snr_type: 0
+snr_scope: 3
+bmarksearchmode: 0
+view_main_toolbar: 1
 e2c.convert_symbol: 0
-e2c.convert_num: 0
-c2e.convert_special: 0