Fixed so the queued balls disappear according to the amount of lives …

…left

Signed-off-by: Erik Andersson <erik.rothoff@gmail.com>

arrow.cpp

@@ -34,15 +34,11 @@ Arrow::Arrow(Game *game): Sprite(game)
 	// Queue balls
 	// Create one more than specified, for the current ball
 	for ( int i = 0; i <= ARROW_QUEUE_SIZE; i++ )
-	{
-		Ball *ball = Ball::create(_game);
-		_queue.push_back(ball);
-	}
+		_queue.push_back(Ball::create(_game));
 
 	setCurrent();
 }
 
-
 Arrow::~Arrow()
 {
 	SDL_FreeSurface(_origin);
@@ -53,12 +49,19 @@ void Arrow::tick()
 {
 	if ( _game->isPaused() )
 		return;
+
+	int i = 0;
+	for ( ball_queue::iterator iter = _queue.begin(); iter != _queue.end(); iter++, i++ )
+	{
+		if ( i >= _game->lives() )
+			(*iter)->visible(false);
+		else
+			(*iter)->visible(true);
+	}
 }
 
 void Arrow::draw()
 {
-	//if ( ! dirty() )
-	//	return;
 	if ( _game->isPaused() )
 		return;
 

arrow.h

@@ -50,6 +50,8 @@ class Arrow: public Sprite
 	void setCurrent();
 	void release();
 
+	Ball* createBall();
+
 	bool isReady() const { return _is_ready; };
 	void setReady(bool ready) { _is_ready = ready; };
 };

grid.cpp

@@ -214,7 +214,6 @@ void Grid::handleDanglies()
 		}
 		else
 			delete result;
-
 	}
 
 	for ( island_list::iterator iter = islands.begin(); iter != islands.end(); iter++ )

scorescrollnode.cpp

@@ -136,7 +136,7 @@ void ScoreScrollNode::renderText()
 	iter = _scores.begin() + start_score;
 	to = _scores.begin() + end_score;
 
-	for (; iter != to; iter++ )
+	for (; iter != to; iter++)
 	{
 		SDL_Surface **surfaces = (*iter);