From 94659d03e0f96f097a654c0a96d3ea89c54e6215 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 4 Dec 2014 16:39:46 -0600 Subject: [PATCH] modified: scroll.exe modified: src/scroll.c --- scroll.exe | Bin 48791 -> 48811 bytes src/scroll.c | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/scroll.exe b/scroll.exe index c699cd91c0da7db6dbce23b0f38bc52f734eeffd..776f5aeaf0631e6b2ecf27d06eec3f017a43cf8e 100644 GIT binary patch delta 8150 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 delta 8229 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 diff --git a/src/scroll.c b/src/scroll.c index cc076c34..21fd76d5 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -145,6 +145,8 @@ void main() { //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map + + //TODO: make this better if(keyp(72) && !keyp(80) && player.q == 1) player.d = 1; if(keyp(77) && !keyp(75) && player.q == 1) player.d = 2; if(keyp(80) && !keyp(72) && player.q == 1) player.d = 3; @@ -188,6 +190,7 @@ void main() { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp); modexShowPage(spri->page); + player.d = 0; } player.triggerx = player.tx+1; player.triggery = player.ty; @@ -228,6 +231,7 @@ void main() { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp); modexShowPage(spri->page); + player.d = 0; } player.triggerx = player.tx-1; player.triggery = player.ty; @@ -268,6 +272,7 @@ void main() { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp); modexShowPage(spri->page); + player.d = 0; } player.triggerx = player.tx; player.triggery = player.ty+1; @@ -308,6 +313,7 @@ void main() { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp); modexShowPage(spri->page); + player.d = 0; } player.triggerx = player.tx; player.triggery = player.ty-1; -- 2.39.5