From e96f05822f9514046908ce027ba8834faa72da20 Mon Sep 17 00:00:00 2001
From: Tomer Shalev <shalev.tomer@gmail.com>
Date: Sat, 27 Feb 2010 07:58:48 +0000
Subject: Brickmania: Fix inner loop used the same variable as outer loop,
 which trashed powerups when paddle hit Normal or Fire powerups

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24932 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/brickmania.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 728651a..9648df3 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -1603,14 +1603,14 @@ static int brickmania_game_loop(void)
                             case POWER_TYPE_PADDLE_SHOOTER:
                                 score += SCORE_POWER_PADDLE_SHOOTER;
                                 paddle_type = PADDLE_TYPE_SHOOTER;
-                                for(k=0;k<used_balls;k++)
-                                    ball[k].glue=false;
+                                for(i=0;i<used_balls;i++)
+                                    ball[i].glue=false;
                                 break;
                             case POWER_TYPE_PADDLE_NORMAL:
                                 score += SCORE_POWER_PADDLE_NORMAL;
                                 paddle_type = PADDLE_TYPE_NORMAL;
-                                for(k=0;k<used_balls;k++)
-                                    ball[k].glue=false;
+                                for(i=0;i<used_balls;i++)
+                                    ball[i].glue=false;
                                 flip_sides=false;
                                 pad_pos_x += (pad_width-PAD_WIDTH)/2;
                                 pad_width = PAD_WIDTH;
@@ -1677,9 +1677,12 @@ static int brickmania_game_loop(void)
                     if (remove_power)
                     {
                         used_powers--;
-                        power[k].top = power[used_powers].top;
-                        power[k].x_pos = power[used_powers].x_pos;
-                        power[k].type = power[used_powers].type;
+                        if (k != used_powers)
+                        {
+                            power[k].top = power[used_powers].top;
+                            power[k].x_pos = power[used_powers].x_pos;
+                            power[k].type = power[used_powers].type;
+                        }
                         k--;
                     }
                 }
-- 
cgit v1.1