Merge branch 'master' of github.com:sparky4/16

Conflicts:
	Project 16.bfproject
	scroll.exe

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 83e3284..663f35e 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
@@ -68,6 +69,63 @@ 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
+filegloblist: *.txt
+filegloblist: *.shtml
+filegloblist: *.py
+filegloblist: *.pl
+filegloblist: *.php
+filegloblist: *.js
+filegloblist: *.java
+filegloblist: *.htm
+filegloblist: *.html
+filegloblist: *.h
+filegloblist: *.css
+filegloblist: *.cpp
+filegloblist: *.cgi
+filegloblist: *.c
+filegloblist: *
+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
@@ -93,91 +151,43 @@ 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
-recent_files: file:///dos/z/keen-src/id_rf_a.asm
-recent_files: file:///dos/z/keen-src/id_rf.c
-recent_files: file:///dos/z/16/gfx.pal
-recent_files: file:///dos/z/16/src/scroll.c
-recent_files: file:///dos/z/16/doc/project.txt
-recent_files: file:///dos/z/16/src/lib/scroll.h
-recent_files: file:///dos/z/16/src/lib/scroll.c
-recent_files: file:///dos/z/16/src/lib/modex16.h
-recent_files: file:///dos/z/16/src/pcxtest.c
-recent_files: file:///dos/z/16/16.c
-recent_files: file:///dos/z/16/src/lib/modex16.c
-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/lib_head.h
-recent_files: file:///dos/z/16/src/palettec.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/bitmap.h
-recent_files: file:///dos/z/16/src/lib/bitmap.c
-recent_files: file:///dos/z/16/src/lib/lib_head.cpp
-recent_files: file:///dos/z/16/makefile
-recent_files: file:///dos/z/16/src/lib/types.h
-recent_files: file:///dos/z/16/16/dos_gfx.h
-recent_files: file:///dos/z/16/16/dos_gfx.cpp
-recent_files: file:///dos/z/16/src/v2/source/ENGINE/CONTROLS.C
-snr_replacetype: 0
-savedir: file:///dos/z/16/src
-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: mapDrawTile
-searchlist: dxThresh
-searchlist: PalFile
-searchlist: src\\lib\\
-searchlist: player.
-searchlist: src\\
-searchlist: void modexPalBlack();
-searchlist: oid modexPalBlack(
-searchlist: id modexPalBlack(
-searchlist: d modexPalBlack(
-searchlist: modexPalBlack(
-searchlist: fadePalette(
-searchlist: modexPalBlack(
-searchlist: modexPalUpdate
-searchlist: UnPress(
-autocomplete: 1
-outputb_show_all_output: 0
-bookmarks_show_mode: 0
-snippets_show_as_menu: 1
-adv_open_recursive: 0
-encoding: SHIFT_JIS
-e2c.convert_special: 0
-autoindent: 1
-fb_viewmode: 0
-filegloblist: *.txt
-filegloblist: *.shtml
-filegloblist: *.py
-filegloblist: *.pl
-filegloblist: *.php
-filegloblist: *.js
-filegloblist: *.java
-filegloblist: *.htm
-filegloblist: *.html
-filegloblist: *.h
-filegloblist: *.css
-filegloblist: *.cpp
-filegloblist: *.cgi
-filegloblist: *.c
-filegloblist: *
-recent_dirs: file:///dos/z/16/16
-fb_focus_follow: 1
-ssearch_unescape: 0
-c2e.convert_symbol: 0
-snr_dotmatchall: 0
-c2e.convert_xml: 1
-editor_indent_wspaces: 0
-view_cline: 0
-snr_type: 0
-snr_scope: 0
-bmarksearchmode: 0
-view_main_toolbar: 1
+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
 e2c.convert_symbol: 0
+e2c.convert_num: 0
+c2e.convert_special: 0