From 36ebf498e28c9cb269f900fa29a67ebbe864a7d0 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 28 Nov 2014 15:50:24 -0600 Subject: [PATCH] modified: Project 16.bfproject modified: data/ptmp.pcx new file: grafx2.pal modified: ptmp.pcx modified: scroll.exe modified: src/scroll.c --- Project 16.bfproject | 43 +++++++++++++++++++++++-------------------- data/ptmp.pcx | Bin 5047 -> 5047 bytes grafx2.pal | Bin 0 -> 10537 bytes ptmp.pcx | Bin 5047 -> 5047 bytes scroll.exe | Bin 48290 -> 48290 bytes src/scroll.c | 8 ++++---- 6 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 grafx2.pal diff --git a/Project 16.bfproject b/Project 16.bfproject index 2db68fb4..6ad6606a 100644 --- 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 8e40bd25f038ba95f49b87e9aff8d8aac816c9e7..3b9563133076f181874616e04810f59f7fa51e7d 100644 GIT binary patch delta 14 Wcmdn4zFmF8Zw^M@&3`y{a{&M^n+5s+ delta 14 Wcmdn4zFmF8Zw^L@&3`y{a{&M^-3A2! diff --git a/grafx2.pal b/grafx2.pal new file mode 100644 index 0000000000000000000000000000000000000000..a062ec7163abefa83b13952c0b28dbfdf10c3726 GIT binary patch literal 10537 zcmeI2F=*6K7{~uDClu+>pCGXQNIF9@M{@K|XNfWRE5AcBi=mH5a7#6r0 z1`7pR7G0N(2E&k1WX_^G2e$yfgkTX}8;OH~cTo-3G}tPzZE?qCYVp-Ri6+o0cO zxW@?PGHe^32j52!pxZ@~U@*|L+e~Xr8)U$=N5}GM^uM}Ih*>RV8sus5z{hjbE ziFne_=TR!bGU3=0b!W2aPKR})yEzxB;(pUiwpNbXwd0-U$zJ>XU{60!{nP*G&o(xG RAJl8?_MP?J-Cfspe*mZ=LJt4{ literal 0 HcmV?d00001 diff --git a/ptmp.pcx b/ptmp.pcx index 8e40bd25f038ba95f49b87e9aff8d8aac816c9e7..3b9563133076f181874616e04810f59f7fa51e7d 100644 GIT binary patch delta 14 Wcmdn4zFmF8Zw^M@&3`y{a{&M^n+5s+ delta 14 Wcmdn4zFmF8Zw^L@&3`y{a{&M^-3A2! diff --git a/scroll.exe b/scroll.exe index b99bf3dee6d53ab38ae624b6a28b4d6df4de6eef..8bd5e21e876adf05d5f7240e214a5e2a4dabf7c4 100644 GIT binary patch delta 3659 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 MZ>2SSLU*3{|5kgAx&QzG delta 3745 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 diff --git a/src/scroll.c b/src/scroll.c index 5275fc69..2c4cbd7e 100644 --- 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; ytiles->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++; } } -- 2.39.2