From 9f0b27b336059cb9c71a9e60e8887b3008c8cc86 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sun, 7 Dec 2014 02:11:33 -0600 Subject: [PATCH] modified: scroll.exe modified: src/scroll.c --- scroll.exe | Bin 48920 -> 48780 bytes src/scroll.c | 87 +++++++++++++-------------------------------------- 2 files changed, 22 insertions(+), 65 deletions(-) diff --git a/scroll.exe b/scroll.exe index 28cab8a6678f1e526702de7bb6ba4900fbff7bb1..6d3572cbcb30cd639b379f1bb0b2cc7a94a4d525 100644 GIT binary patch delta 9643 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

0F6RzS@FL_%=yPGe>(Fqd{lXH$h@6HfJuC;@ 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 Q8Mm5aPAw3Gmx~bkfBDo4Bme*a diff --git a/src/scroll.c b/src/scroll.c index f511073c..21647006 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -55,7 +55,6 @@ void mapGoTo(map_view_t *mv, int tx, int ty); void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y); void mapDrawRow(map_view_t *mv, int tx, int ty, word y); void mapDrawCol(map_view_t *mv, int tx, int ty, word x); -sword dpad(actor_t *qd); void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp); #define TILEWH 16 @@ -131,7 +130,7 @@ void main() { player.y = player.ty*TILEWH; player.triggerx = player.tx; player.triggery = player.ty+1; - player.q=0; + player.q=1; player.d=0; modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp); @@ -143,20 +142,11 @@ void main() { //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square //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 + #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - - //TODO: make this better like rpg maker 2000 better - if(player.q <= 1) - { - dpad(&player); - if(player.d>0) dpad(&player); - if(player.q<1) player.q++; - } - - #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - - if(player.d == 2) - { + if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2) + { + if(player.d == 0){ player.d = 2; } if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) @@ -169,7 +159,7 @@ void main() { //mapScrollRight(mask, SPEED); modexShowPage(spri->page); player.q++; - } else { player.q = 0; player.d = 0; player.tx++; } + } else { player.q = 1; player.d = 0; player.tx++; } } else if(player.tx < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { @@ -181,7 +171,7 @@ void main() { animatePlayer(bg, spri, 1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; - } else { player.q = 0; player.d = 0; player.tx++; } + } else { player.q = 1; player.d = 0; player.tx++; } } else { @@ -194,8 +184,9 @@ void main() { player.triggery = player.ty; } - if(player.d == 4) - { + if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4) + { + if(player.d == 0){ player.d = 4; } if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) @@ -208,7 +199,7 @@ void main() { //mapScrollLeft(mask, SPEED); modexShowPage(spri->page); player.q++; - } else { player.q = 0; player.d = 0; player.tx--; } + } else { player.q = 1; player.d = 0; player.tx--; } } else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { @@ -220,7 +211,7 @@ void main() { animatePlayer(bg, spri, 3, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; - } else { player.q = 0; player.d = 0; player.tx--; } + } else { player.q = 1; player.d = 0; player.tx--; } } else { @@ -233,8 +224,9 @@ void main() { player.triggery = player.ty; } - if(player.d == 3) - { + if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3) + { + if(player.d == 0){ player.d = 3; } if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) @@ -247,7 +239,7 @@ void main() { //mapScrollDown(mask, SPEED); modexShowPage(spri->page); player.q++; - } else { player.q = 0; player.d = 0; player.ty++; } + } else { player.q = 1; player.d = 0; player.ty++; } } else if(player.ty < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { @@ -259,7 +251,7 @@ void main() { animatePlayer(bg, spri, 2, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; - } else { player.q = 0; player.d = 0; player.ty++; } + } else { player.q = 1; player.d = 0; player.ty++; } } else { @@ -272,8 +264,9 @@ void main() { player.triggery = player.ty+1; } - if(player.d == 1) - { + if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1) + { + if(player.d == 0){ player.d = 1; } if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) @@ -286,7 +279,7 @@ void main() { //mapScrollUp(mask, SPEED); modexShowPage(spri->page); player.q++; - } else { player.q = 0; player.d = 0; player.ty--; } + } else { player.q = 1; player.d = 0; player.ty--; } } else if(player.ty > 1 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { @@ -298,7 +291,7 @@ void main() { modexShowPage(spri->page); animatePlayer(bg, spri, 0, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); player.q++; - } else { player.q = 0; player.d = 0; player.ty--; } + } else { player.q = 1; player.d = 0; player.ty--; } } else { @@ -571,42 +564,6 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) { } } -sword -dpad(actor_t *qd) -{ - if((keyp(75) && !keyp(77))) qd->d = 4; //left - if((keyp(80) && !keyp(72))) qd->d = 3; //down - if((keyp(77) && !keyp(75))) qd->d = 2; //right - if((keyp(72) && !keyp(80))) qd->d = 1; //up -/* if(qd->d==0) - { - //if((keyp(80) || keyp(72))) - //{ - if((keyp(72) && !keyp(80))&&qd->d==0) qd->d = 1; //up - if((keyp(80) && !keyp(72))&&qd->d==0) qd->d = 3; //down - //} - //if((keyp(75) || keyp(77))) - //{ - if((keyp(75) && !keyp(77))&&qd->d==0) qd->d = 4; //left - if((keyp(77) && !keyp(75))&&qd->d==0) qd->d = 2; //right - //} - } - else - { - if((qd->d==2 || qd->d==4)) - { - if(keyp(72) && !keyp(80)) qd->d = 1; //up - if(keyp(80) && !keyp(72)) qd->d = 3; //down - } - else if((qd->d==1 || qd->d==3)) - { - if(keyp(75) && !keyp(77)) qd->d = 4; //left - if(keyp(77) && !keyp(75)) qd->d = 2; //right - } - }*/ - return qd->d; -} - void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp) { -- 2.39.2