modified: Project 16.bfproject

	modified:   data/ptmp.pcx
	new file:   grafx2.pal
	modified:   ptmp.pcx
	modified:   scroll.exe
	modified:   src/scroll.c

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 2db68fb..6ad6606 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -1,20 +1,23 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
-openfiles: /dos/z/16/src/scroll.c:2536:1770:0:
+openfiles: /dos/z/16/src/scroll.c:11795:11088:1:
 openfiles: /dos/z/16/src/lib/modex16.c:136:0:0:
 openfiles: /dos/z/16/src/lib/modex16.h:1931:1068:0:
-openfiles: /dos/z/16/src/pcxtest.c:785:655:0:
+openfiles: /dos/z/16/src/pcxtest.c:68:0:0:
 openfiles: /dos/z/16/src/lib/dos_kb.c:107:0: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:1:
+openfiles: /dos/z/16/src/palettec.c:176:0:0:
 openfiles: /dos/z/16/src/test.c:18:0: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:0: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:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -26,15 +29,13 @@ view_left_panel: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0
-opendir: file:///dos/z/16/src/lib
+opendir: file:///dos/z/16/16
 wrap_text_default: 0
 bookmarks_filename_mode: 1
 ssearch_text: PalFile
 snr_casesens: 1
 view_blocks: 1
 name: project 16
-replacelist: wPage(spri
-replacelist: 34);
 replacelist: bg
 replacelist: dest
 replacelist: animatePlayer(bg, spri,
@@ -48,6 +49,8 @@ replacelist: modexShowPage(spri
 replacelist: player.tx == player.ty
 replacelist: TRIGGY
 replacelist: TRIGGX
+replacelist: $(SRCLIB)
+replacelist: $(SRC)
 fb_show_hidden_f: 0
 editor_tab_width: 4
 show_visible_spacing: 1
@@ -61,15 +64,12 @@ ssearch_regex: 0
 e2c.convert_iso: 0
 ssearch_casesens: 0
 charmap_block: 1
-recent_files: file:///dos/z/16/src/eng_comm.h
 recent_files: file:///dos/z/16/src/lib/dos_comm.h
 recent_files: file:///dos/z/16/16/modex16/lib/lib_com.h
 recent_files: file:///dos/z/16/16/modex16/lib/lib_com.cpp
 recent_files: file:///dos/z/16/16/modex16/modex16.h
 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/dos_gfx.cpp
-recent_files: file:///dos/z/16/16/dos_gfx.h
 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
@@ -90,27 +90,30 @@ 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/16/src/scroll.c
-recent_files: file:///dos/z/16/doc/project.txt
-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/lib/modex16.h
-recent_files: file:///dos/z/16/src/pcxtest.c
-recent_files: file:///dos/z/16/src/lib/modex16.c
-recent_files: file:///dos/z/16/makefile
 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/src/palettec.c
+recent_files: file:///dos/z/16/doc/project.txt
+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/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/lib/modex16.c
+recent_files: file:///dos/z/16/src/scroll.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.c
 recent_files: file:///dos/z/16/src/lib/bitmap.h
 recent_files: file:///dos/z/16/src/lib/lib_head.cpp
 recent_files: file:///dos/z/16/src/lib/types.h
+recent_files: file:///dos/z/16/makefile
+recent_files: file:///dos/z/16/gfx.pal
+recent_files: file:///dos/z/16/16/dos_gfx.cpp
+recent_files: file:///dos/z/16/16/dos_gfx.h
 snr_replacetype: 0
 savedir: file:///dos/z/16/src
 spell_check_default: 1
@@ -122,8 +125,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: enter
-searchlist: bg->tx == bg->ty
 searchlist: data
 searchlist: cra
 searchlist: drawtile
@@ -137,6 +138,8 @@ searchlist: MAPX/2
 searchlist: mapDrawTile
 searchlist: dxThresh
 searchlist: PalFile
+searchlist: src\\lib\\
+searchlist: src\\
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0

diff --git a/data/ptmp.pcx b/data/ptmp.pcx
index 8e40bd2..3b95631 100644 (file)
Binary files a/data/ptmp.pcx and b/data/ptmp.pcx differ

diff --git a/grafx2.pal b/grafx2.pal
new file mode 100644 (file)
index 0000000..a062ec7
Binary files /dev/null and b/grafx2.pal differ

diff --git a/ptmp.pcx b/ptmp.pcx
index 8e40bd2..3b95631 100644 (file)
Binary files a/ptmp.pcx and b/ptmp.pcx differ

diff --git a/scroll.exe b/scroll.exe
index b99bf3d..8bd5e21 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index 5275fc6..2c4cbd7 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -121,8 +121,8 @@ void main() {
        //TODO: erase player initial draw
        modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
        //temp draw trigger box
-       modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 0);
-       modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 0);
+       modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
+       modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
        modexShowPage(spri->page);
        while(!keyp(1))//!keyp(1))
        {
@@ -386,9 +386,9 @@ initMap(map_t *map) {
        for(y=0; y<TILEWH; y++) {
        for(x=0; x<(TILEWH*2); x++) {
                if(x<TILEWH)
-                 map->tiles->data->data[i] = 0x24;
+                 map->tiles->data->data[i] = 0x00;//0x24;
                else
-                 map->tiles->data->data[i] = 0x34;
+                 map->tiles->data->data[i] = 28;//0x34;
                i++;
        }
        }