From 5c38df4df8b049c04dc4e2c60db62bcb5827f925 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 1 Dec 2014 15:36:43 -0600 Subject: [PATCH] modified: Project 16.bfproject modified: src/scroll.c --- Project 16.bfproject | 32 ++++++++++++++++---------------- src/lib/scroll.c | 8 ++++---- src/scroll.c | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Project 16.bfproject b/Project 16.bfproject index 34c2fe90..c2286020 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -2,8 +2,8 @@ c2e.convert_special: 0 e2c.convert_num: 0 openfiles: /dos/z/16/doc/project.txt:60:0:0: openfiles: /dos/z/16/16.c:25:0:0: -openfiles: /dos/z/16/src/scroll.c:18423:392:0: -openfiles: /dos/z/16/src/lib/scroll.c:0:0:1: +openfiles: /dos/z/16/src/scroll.c:5954:5217:1: +openfiles: /dos/z/16/src/lib/scroll.c:0:0:0: openfiles: /dos/z/16/src/lib/scroll.h:1961:598:0: openfiles: /dos/z/16/src/lib/modex16.c:136:0:0: openfiles: /dos/z/16/src/lib/modex16.h:3194:2077:0: @@ -32,14 +32,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: bg replacelist: dest replacelist: animatePlayer(bg, spri, replacelist: qi=1 @@ -54,6 +53,7 @@ replacelist: TRIGGY replacelist: TRIGGX replacelist: $(SRCLIB) replacelist: $(SRC) +replacelist: SPEED); fb_show_hidden_f: 0 editor_tab_width: 4 show_visible_spacing: 1 @@ -67,8 +67,6 @@ ssearch_regex: 0 e2c.convert_iso: 0 ssearch_casesens: 0 charmap_block: 1 -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 @@ -98,27 +96,29 @@ 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/src/lib/scroll.c +recent_files: file:///dos/z/16/src/lib/scroll.h recent_files: file:///dos/z/16/src/lib/modex16.h -recent_files: file:///dos/z/16/src/lib/lib_head.h -recent_files: file:///dos/z/16/src/lib/dos_kb.h +recent_files: file:///dos/z/16/16.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/pcxtest.c +recent_files: file:///dos/z/16/src/scroll.c recent_files: file:///dos/z/16/src/lib/modex16.c -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/lib/dos_kb.h +recent_files: file:///dos/z/16/src/lib/dos_kb.c +recent_files: file:///dos/z/16/src/lib/lib_head.h recent_files: file:///dos/z/16/src/test2.c +recent_files: file:///dos/z/16/src/palettec.c recent_files: file:///dos/z/16/src/lib/bitmap.h +recent_files: file:///dos/z/16/src/test.c recent_files: file:///dos/z/16/src/lib/types.h recent_files: file:///dos/z/16/makefile 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/16/dos_gfx.h recent_files: file:///dos/z/16/16/dos_gfx.cpp -recent_files: file:///dos/z/16/src/lib/scroll.c +recent_files: file:///dos/z/16/src/lib/lib_head.cpp snr_replacetype: 0 -savedir: file:///dos/z/16/src/lib +savedir: file:///dos/z/16/src spell_check_default: 1 spell_insert_entities: 0 last_filefilter: @@ -128,7 +128,6 @@ snr_escape_chars: 0 htmlbar_view: 0 spell_lang: en ssearch_dotmatchall: 0 -searchlist: data searchlist: cra searchlist: drawtile searchlist: UpdateTiles @@ -143,6 +142,7 @@ searchlist: dxThresh searchlist: PalFile searchlist: src\\lib\\ searchlist: src\\ +searchlist: SPEED, q); autocomplete: 1 outputb_show_all_output: 0 bookmarks_show_mode: 0 diff --git a/src/lib/scroll.c b/src/lib/scroll.c index 8ac72c32..b424c8a6 100644 --- a/src/lib/scroll.c +++ b/src/lib/scroll.c @@ -78,7 +78,7 @@ mapScrollRight(map_view_t *mv, byte offset, short lp) { /* draw the next column */ x= SCREEN_WIDTH + mv->map->tiles->tileWidth; - //if(lp%4) + if(lp%4) mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x, mv->page->dx); } } @@ -101,7 +101,7 @@ mapScrollLeft(map_view_t *mv, byte offset, short lp) { mv->page->dx = mv->map->tiles->tileWidth; //} /* draw the next column */ - //if(lp%4) + if(lp%4) mapDrawCol(mv, mv->tx-1, mv->ty-1, 0, mv->page->dx); } } @@ -125,7 +125,7 @@ mapScrollUp(map_view_t *mv, byte offset, short lp) { /* draw the next row */ y= 0; - //if(lp%3) + if(lp%3) mapDrawRow(mv, mv->tx-1 , mv->ty-1, y, mv->page->dy); } } @@ -149,7 +149,7 @@ mapScrollDown(map_view_t *mv, byte offset, short lp) { /* draw the next row */ y= SCREEN_HEIGHT + mv->map->tiles->tileHeight; - //if(lp%3) + if(lp%3) mapDrawRow(mv, mv->tx-1 , mv->ty+15, y, mv->page->dy); } diff --git a/src/scroll.c b/src/scroll.c index 9fd7ad87..36a8f163 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -172,8 +172,8 @@ break; INC_PER_FRAME; //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp); animatePlayer(bg, spri, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp); - mapScrollRight(bg, SPEED, q); - mapScrollRight(spri, SPEED, q); + mapScrollRight(bg, SPEED); + mapScrollRight(spri, SPEED); //mapScrollRight(mask, SPEED); modexShowPage(spri->page); } @@ -210,8 +210,8 @@ break; INC_PER_FRAME; //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp); animatePlayer(bg, spri, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp); - mapScrollLeft(bg, SPEED, q); - mapScrollLeft(spri, SPEED, q); + mapScrollLeft(bg, SPEED); + mapScrollLeft(spri, SPEED); //mapScrollLeft(mask, SPEED); modexShowPage(spri->page); } @@ -248,8 +248,8 @@ break; INC_PER_FRAME; //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp); animatePlayer(bg, spri, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp); - mapScrollDown(bg, SPEED, q); - mapScrollDown(spri, SPEED, q); + mapScrollDown(bg, SPEED); + mapScrollDown(spri, SPEED); //mapScrollDown(mask, SPEED); modexShowPage(spri->page); } @@ -286,8 +286,8 @@ break; INC_PER_FRAME; //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp); animatePlayer(bg, spri, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp); - mapScrollUp(bg, SPEED, q); - mapScrollUp(spri, SPEED, q); + mapScrollUp(bg, SPEED); + mapScrollUp(spri, SPEED); //mapScrollUp(mask, SPEED); modexShowPage(spri->page); } -- 2.39.2