From 4c8aab0d4f15d83d1f756511bd525395fd43c1ba Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 13 Jun 2016 11:00:45 -0500 Subject: [PATCH] hmmm --- src/lib/scroll16.c | 27 ++++++++++++--------------- src/scroll.c | 5 +++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 748f2ddd..1743318e 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -483,12 +483,12 @@ void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid) mv[0].video->page[id].dx += player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dx >= mv[id].dxThresh ) - { + //if(mv[0].video->page[id].dx >= mv[0].dxThresh ) + //{ /* Snap the origin forward */ mv[0].video->page[id].data += 4; mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth; - } + //} } @@ -498,12 +498,12 @@ void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid) mv[0].video->page[id].dx -= player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dx == 0) - { + //if(mv[0].video->page[id].dx == 0) + //{ /* Snap the origin backward */ mv[0].video->page[id].data -= 4; mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth; - } + //} } void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid) @@ -512,12 +512,12 @@ void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid) mv[0].video->page[id].dy -= player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dy == 0) - { + //if(mv[0].video->page[id].dy == 0) + //{ /* Snap the origin backward */ mv[0].video->page[id].data -= 4; mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth; - } + //} } void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid) @@ -526,15 +526,12 @@ void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid) mv[0].video->page[id].dy += player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dy >= mv[id].dxThresh ) - { + //if(mv[0].video->page[id].dy >= mv[id].dxThresh ) + //{ /* Snap the origin forward */ mv[0].video->page[id].data += 4; mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth; - } -// modexClearRegion(&(mv[0].video->page[id]), 0, 0, -// mv[0].video->page[id].width-1, -// mv[0].video->page[id].height-1, id*2); + //} } sword chkmap(map_t *map, word q) diff --git a/src/scroll.c b/src/scroll.c index 77e996f7..73bf194e 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -275,6 +275,11 @@ void main(int argc, char *argv[]) gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1,1); } + if(IN_KeyDown(67)) //f9 + { + modexClearRegion(mv[3].page, 0, 128, 28, 36, 15); + IN_UserInput(1,1); + } //TODO fmemtest into page /*if(IN_KeyDown(4+1)) //4 { -- 2.11.0