From ece45f9b5ba638d6181bbc6e8663676ad890bf35 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 1 Dec 2014 02:19:33 -0600 Subject: [PATCH] modified: scroll.exe modified: src/scroll.c --- 16/Project 16.bfproject | 20 ++++---------------- scroll.exe | Bin 49398 -> 49366 bytes src/scroll.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/16/Project 16.bfproject b/16/Project 16.bfproject index 217dd1c1..16a7e130 100644 --- a/16/Project 16.bfproject +++ b/16/Project 16.bfproject @@ -1,20 +1,14 @@ c2e.convert_special: 0 e2c.convert_num: 0 openfiles: /dos/z/16/16/dos_gfx.cpp:7655:7604:0: -openfiles: /dos/z/16/16/dos_gfx.h:910:295:0: +openfiles: /dos/z/16/16/dos_gfx.h:910:295:1: openfiles: /dos/z/16/16/dos_kb.c:0:0:0: openfiles: /dos/z/16/16/dos_kb.h:161:0:0: openfiles: /dos/z/16/16/lib/lib_com.cpp:2:0:0: openfiles: /dos/z/16/16/lib/lib_com.h:633:1027:0: -openfiles: /dos/z/16/16/scroll.txt:5256:4537:0: -openfiles: /dos/z/16/16/project16.txt:8063:6091:0: openfiles: /dos/z/16/16/16.txt:0:0:0: openfiles: /dos/z/16/16/lib/x/MODEX.H:5511:2798:0: openfiles: /dos/z/16/16/TEST.C:430:6112:0: -openfiles: /dos/z/16/16/modex16/scroll.c:1744:1341:0: -openfiles: /dos/z/16/16/modex16/makefile:106:0:0: -openfiles: /dos/z/16/16/modex16/dos_kb.c:1017:217:1: -openfiles: /dos/z/16/16/modex16/dos_kb.h:0:0:0: snr_recursion_level: 0 convertcolumn_horizontally: 0 adv_open_matchname: 0 @@ -85,22 +79,16 @@ 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/dos_gfx.h -recent_files: file:///dos/z/16/16/dos_gfx.cpp recent_files: file:///dos/z/16/16/dos_kb.c recent_files: file:///dos/z/16/16/dos_kb.h recent_files: file:///dos/z/16/16/lib/lib_com.cpp recent_files: file:///dos/z/16/16/lib/lib_com.h -recent_files: file:///dos/z/16/16/scroll.txt -recent_files: file:///dos/z/16/16/project16.txt +recent_files: file:///dos/z/16/16/dos_gfx.cpp recent_files: file:///dos/z/16/16/16.txt -recent_files: file:///dos/z/16/16/TEST.C -recent_files: file:///dos/z/16/16/modex16/dos_kb.c -recent_files: file:///dos/z/16/16/modex16/modex16.h -recent_files: file:///dos/z/16/16/modex16/makefile -recent_files: file:///dos/z/16/16/modex16/dos_kb.h recent_files: file:///dos/z/16/16/lib/x/MODEX.H -recent_files: file:///dos/z/16/16/modex16/scroll.c +recent_files: file:///dos/z/16/16/TEST.C snr_replacetype: 0 savedir: file:///dos/z/16/16/modex16 spell_check_default: 1 diff --git a/scroll.exe b/scroll.exe index afcb2529dc09cc400a98509575218a0daea3f278..5b78fd97f0789660ba7a9917b7a9f29a8fe156bd 100644 GIT binary patch delta 7975 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 RFBSau>UvsXYk#eV|36Nrm6iYi delta 8026 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 diff --git a/src/scroll.c b/src/scroll.c index 12230d94..5e561a83 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -428,7 +428,8 @@ mapScrollRight(map_view_t *mv, byte offset, short lp) { /* draw the next column */ x= SCREEN_WIDTH + mv->map->tiles->tileWidth; if(lp%2) - mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x, mv->page->dx); + //mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x, mv->page->dx); + mapDrawWCol(mv, mv->tx + 20 , mv->ty-1, x); //} } @@ -451,7 +452,8 @@ mapScrollLeft(map_view_t *mv, byte offset, short lp) { } /* draw the next column */ if(lp%2) - mapDrawCol(mv, mv->tx-1, mv->ty-1, 0, mv->page->dx); + //mapDrawCol(mv, mv->tx-1, mv->ty-1, 0, mv->page->dx); + mapDrawWCol(mv, mv->tx-1, mv->ty-1, 0); //} } @@ -475,7 +477,8 @@ mapScrollUp(map_view_t *mv, byte offset, short lp) { /* draw the next row */ y= 0; if(lp%3) - mapDrawRow(mv, mv->tx-1 , mv->ty-1, y, mv->page->dy); + //mapDrawRow(mv, mv->tx-1 , mv->ty-1, y, mv->page->dy); + mapDrawWRow(mv, mv->tx-1 , mv->ty-1, y); //} } @@ -499,7 +502,8 @@ mapScrollDown(map_view_t *mv, byte offset, short lp) { /* draw the next row */ y= SCREEN_HEIGHT + mv->map->tiles->tileHeight; if(lp%3) - mapDrawRow(mv, mv->tx-1 , mv->ty+15, y, mv->page->dy); + //mapDrawRow(mv, mv->tx-1 , mv->ty+15, y, mv->page->dy); + mapDrawWRow(mv, mv->tx-1 , mv->ty+15, y); //} } -- 2.39.5