end round when no balls are present

see #19 note that this will be different if balls respawn
VideoBleep · Dec 27, 2014 · 8cc4596 · 8cc4596
1 parent af05977
commit 8cc4596
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/core/LogicController.cpp b/src/core/LogicController.cpp
@@ -171,6 +171,7 @@ void LogicController::onBallHitWall(Ball& ball, Wall& wall) {
     Player* player = ball.player();
 
     ball.kill();
+    _state.decrementLiveBalls();
     notifyBallDestroyed(_state, &ball);
 
     if (player && _appParams.rules().playersCanLoseLives()) {
@@ -180,6 +181,10 @@ void LogicController::onBallHitWall(Ball& ball, Wall& wall) {
         notifyPlayerLost(_state, player);
       }
     }
+
+    if (_state.liveBalls() <= 0) {
+      notifyTryEndRound(END_NO_BALLS);
+    }
   }
 }
 

diff --git a/src/game_objects/GameState.cpp b/src/game_objects/GameState.cpp
@@ -15,6 +15,7 @@ RoundState::RoundState(const RoundConfig& config,
 , _totalBricks(0)
 , _liveBricks(0)
 , _totalBalls(0)
+, _liveBalls(0)
 , endTime(-1) {
   for (auto& player : players) {
     addPlayer(player);
@@ -58,6 +59,8 @@ Wall& RoundState::addWall(const WallSpec& wallSpec) {
 Ball& RoundState::addBall(const BallSpec& ballSpec) {
   ofPtr<Ball> ball(new Ball(_config, ballSpec));
   _balls.push_back(ball);
+  if (ball->alive())
+    _liveBalls++;
   _totalBalls++;
   return *ball;
 }
@@ -69,12 +72,3 @@ void RoundState::addModifier(ofPtr<Modifier> modifier) {
 void RoundState::addAnimation(ofPtr<AnimationObject> animation) {
   _animations.push_back(animation);
 }
-
-int RoundState::liveBalls() const {
-  int count = 0;
-  for (const auto& ball : _balls) {
-    if (ball && ball->alive())
-      count++;
-  }
-  return count;
-}
diff --git a/src/game_objects/GameState.h b/src/game_objects/GameState.h
@@ -54,14 +54,13 @@ class RoundState {
   void addModifier(ofPtr<Modifier> modifier);
   void addAnimation(ofPtr<AnimationObject> animation);
 
-  void decrementLiveBricks() {
-    _liveBricks--;
-  }
+  void decrementLiveBricks() { _liveBricks--; }
+  void decrementLiveBalls() { _liveBalls--; }
 
   int liveBricks() const { return _liveBricks; }
   int totalBricks() const { return _totalBricks; }
 
-  int liveBalls() const;
+  int liveBalls() const { return _liveBalls; }
   int totalBalls() const { return _totalBalls; }
 
   void output(std::ostream& os) const;
@@ -93,6 +92,7 @@ class RoundState {
   GameObjectCollection<AnimationObject> _animations;
   int _liveBricks;
   int _totalBricks;
+  int _liveBalls;
   int _totalBalls;
 };