From 7600be51e0e03ca0ab5e554b8b9c4dd12a0021b2 Mon Sep 17 00:00:00 2001 From: jylam Date: Wed, 27 Sep 2006 07:54:53 +0000 Subject: [PATCH] * Score is updated while removing many lines, fixed down key bug while beeing at left of the playfield git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/cacatris/trunk@1117 92316355-f0b4-4df1-b90c-862c8a59935f --- src/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 7dd4862..180681d 100644 --- a/src/main.c +++ b/src/main.c @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) } if(down) { - while((movable(current_piece, x-1, y, rotation)) && (!has_landed(current_piece, x-1, y, rotation))) + while((movable(current_piece, x, y, rotation)) && (!has_landed(current_piece, x, y, rotation))) { fixed_y+=speed; y = fixed_y>>8; @@ -303,7 +303,6 @@ unsigned char has_landed(unsigned int id, unsigned int x, unsigned int y, unsign return 0; } - return 1; } @@ -319,8 +318,9 @@ unsigned char maybe_remove_line(void) if(v==FIELD_WIDTH) { memmove(&playfield[FIELD_WIDTH], playfield, (FIELD_HEIGHT-1)*FIELD_WIDTH); + ret++; ret += maybe_remove_line(); return ret; } - return 0; + return ret; }