From 9f5c3b2b489235a37567ec4cc750979204424203 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 24 Nov 2014 18:21:18 -0600 Subject: [PATCH 1/1] modified: Project 16.bfproject modified: scroll.c modified: scroll.exe --- Project 16.bfproject | 47 +++++++++++++++++++++++-------------------- scroll.c | 24 ++++++++++++---------- scroll.exe | Bin 47592 -> 47592 bytes 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/Project 16.bfproject b/Project 16.bfproject index 19d19bc2..d086847f 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -1,17 +1,20 @@ c2e.convert_special: 0 e2c.convert_num: 0 openfiles: /dos/z/16/doc/project.txt:60:0:0: -openfiles: /dos/z/16/scroll.c:9751:9231:0: +openfiles: /dos/z/16/scroll.c:390:375:1: openfiles: /dos/z/16/modex16.c:6319:6141:0: openfiles: /dos/z/16/modex16.h:1057:344:0: openfiles: /dos/z/16/pcxtest.c:795:442:0: openfiles: /dos/z/16/dos_kb.c:3759:2467:0: openfiles: /dos/z/16/dos_kb.h:464:0:0: -openfiles: /dos/z/16/lib/lib_head.h:1738:1885:0: -openfiles: /dos/z/16/README:668:0:0: -openfiles: /dos/z/16/makefile:181:123:0: -openfiles: /dos/z/keen-src/id_mm.c:2128:1591:1: +openfiles: /dos/z/16/lib/lib_head.h:1738:1443:0: +openfiles: /dos/z/16/README:744:0:0: +openfiles: /dos/z/16/makefile:181:0:0: +openfiles: /dos/z/keen-src/id_mm.c:1835:1591:0: openfiles: /dos/z/keen-src/id_mm.h:0:0:0: +openfiles: /dos/z/keen-src/id_rf.c:50912:46219:0: +openfiles: /dos/z/keen-src/id_rf.h:0:0:0: +openfiles: /dos/z/keen-src/id_rf_a.asm:1555:3465:0: snr_recursion_level: 0 convertcolumn_horizontally: 0 adv_open_matchname: 0 @@ -26,7 +29,7 @@ c2e.convert_iso: 0 opendir: file:///dos/z/keen-src wrap_text_default: 0 bookmarks_filename_mode: 1 -ssearch_text: enter +ssearch_text: cols snr_casesens: 1 view_blocks: 1 name: project 16 @@ -58,9 +61,6 @@ ssearch_regex: 0 e2c.convert_iso: 0 ssearch_casesens: 0 charmap_block: 1 -recent_files: file:///dos/z/16/src/lib/dos_gfx.h -recent_files: file:///dos/z/16/16/lib/intro/lib.c -recent_files: file:///dos/z/16/src/lib/dos_gfx.cpp recent_files: file:///dos/z/16/16/modex16/MODEX16.H recent_files: file:///dos/z/16/16/modex16/MODEX16.C recent_files: file:///dos/z/4x4_16/w_modex/MODEX.CPP @@ -96,18 +96,21 @@ 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/keen-src/id_mm.c recent_files: file:///dos/z/16/doc/project.txt +recent_files: file:///dos/z/16/scroll.c +recent_files: file:///dos/z/16/README +recent_files: file:///dos/z/16/dos_kb.c recent_files: file:///dos/z/16/dos_kb.h recent_files: file:///dos/z/16/lib/lib_head.h -recent_files: file:///dos/z/16/dos_kb.c +recent_files: file:///dos/z/16/makefile recent_files: file:///dos/z/16/modex16.h recent_files: file:///dos/z/16/pcxtest.c recent_files: file:///dos/z/16/modex16.c -recent_files: file:///dos/z/16/scroll.c -recent_files: file:///dos/z/16/README -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 snr_replacetype: 0 savedir: file:///dos/z/16 spell_check_default: 1 @@ -119,14 +122,6 @@ snr_escape_chars: 0 htmlbar_view: 0 spell_lang: en ssearch_dotmatchall: 0 -searchlist: modexShowPage(-> -searchlist: modexShowPage(m-> -searchlist: modexShowPage(ma-> -searchlist: modexShowPage(mas-> -searchlist: modexShowPage(mask-> -searchlist: ptr -searchlist: modexShowPage(mask -searchlist: mask searchlist: draw searchlist: modexDrawBmp searchlist: mapDrawTile @@ -134,6 +129,14 @@ searchlist: draw searchlist: return searchlist: enter searchlist: bg->tx == bg->ty +searchlist: data +searchlist: cra +searchlist: drawtile +searchlist: UpdateTiles +searchlist: dyThresh +searchlist: screen.width +searchlist: width +searchlist: cols autocomplete: 1 outputb_show_all_output: 0 bookmarks_show_mode: 0 diff --git a/scroll.c b/scroll.c index 873c54b5..218d0097 100644 --- a/scroll.c +++ b/scroll.c @@ -11,7 +11,6 @@ typedef struct { word tileWidth; unsigned int rows; unsigned int cols; - //unsigned int tilex,tiley; // tile position on the map } tiles_t; @@ -62,6 +61,8 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short //place holder definitions #define MAPX 40 #define MAPY 30 +#define TRIGGX 10 +#define TRIGGY 9 //#define SWAP(a, b) tmp=a; a=b; b=tmp; void main() { bitmap_t ptmp; // player sprite @@ -88,7 +89,7 @@ void main() { modexPalUpdate(ptmp.palette); screen = modexDefaultPage(); screen.width += (TILEWH*2); - screen.height += ((TILEWH*2)+QUADWH); + screen.height += (TILEWH*2);//+QUADWH; mv.page = &screen; screen2 = modexNextPage(mv.page); mv2.page = &screen2; @@ -155,7 +156,7 @@ break; }*/ if(keyp(77) && !keyp(75)) { - if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == 2 && player.ty == 2)) + if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -169,7 +170,7 @@ break; } player.tx++; } - else if(player.tx < MAPX && !(player.tx+1 == 2 && player.ty == 2)) + else if(player.tx < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -193,7 +194,7 @@ break; if(keyp(75) && !keyp(77)) { - if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == 2 && player.ty == 2)) + if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -207,7 +208,7 @@ break; } player.tx--; } - else if(player.tx > 1 && !(player.tx-1 == 2 && player.ty == 2)) + else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -231,7 +232,7 @@ break; if(keyp(80) && !keyp(72)) { - if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8 && !(player.tx == 2 && player.ty+1 == 2)) + if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -245,7 +246,7 @@ break; } player.ty++; } - else if(player.ty < MAPY && !(player.tx == 2 && player.ty+1 == 2)) + else if(player.ty < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -269,7 +270,7 @@ break; if(keyp(72) && !keyp(80)) { - if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == 2 && player.ty-1 == 2)) + if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -283,7 +284,7 @@ break; } player.ty--; } - else if(player.ty > 1 && !(player.tx == 2 && player.ty-1 == 2)) + else if(player.ty > 1 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { for(q=1; q<=(TILEWH/SPEED); q++) { @@ -305,7 +306,8 @@ break; player.triggery = player.ty-1; } //modexClearRegion(mask->page, 66, 66, 2, 40, 0); - if((player.triggerx == 2 && player.triggery == 2) && keyp(KEY_ENTER)) + //modexClearRegion(spri->page, TRIGGX, TRIGGY, 16, 16, 0); + if((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(KEY_ENTER)) { short i; for(i=600; i>=400; i--) diff --git a/scroll.exe b/scroll.exe index 33f0ed4b0541840d591187f856cd650d09dd0e12..892a73f4a004a8e9a73b1e62c4caa24d51a860fb 100644 GIT binary patch delta 156 zcmaFynd!x6rU~yD6*j&PVC3XtC}nT9V`Jf*?7=h@!Q1?d$rxEui3M5m0E-b&vXpZn z8;gT2=j7k4KuH*H^Gr67PB7O4D0!8A3KFk~;{yj5$VM&}&dphzW-AyEOrHFf0R-VH+5i9m delta 156 zcmaFynd!x6rU~yDRW`m4VB}rHFf0o@BKRR910 -- 2.39.2