From bf74001c193ae18cf208f57c145e8c9b8b88c7e8 Mon Sep 17 00:00:00 2001
From: Stephen Enders <smenders@gmail.com>
Date: Fri, 29 Jan 2021 18:12:04 -0500
Subject: Allow player to pass when no available moves

If the player has NO legal moves display the pass option
---
 src/ur.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/ur.cpp')

diff --git a/src/ur.cpp b/src/ur.cpp
index a1d88e8..881cff1 100644
--- a/src/ur.cpp
+++ b/src/ur.cpp
@@ -77,6 +77,8 @@ p2_turn()
 
 inline void
 render_dice(sf::RenderWindow* window,
+            std::shared_ptr<struct player_t> active_player,
+            std::shared_ptr<struct player_t> opponent,
             std::shared_ptr<std::vector<struct dice_t>> dice,
             std::shared_ptr<std::vector<sf::Sprite>> roll_sprites,
             std::shared_ptr<std::vector<sf::Sprite>> pass_sprites,
@@ -101,7 +103,7 @@ render_dice(sf::RenderWindow* window,
       turn_roll += r;
     }
     makeNum(roll_result, turn_roll, textures);
-    if (turn_roll == 0) {
+    if (turn_roll == 0 || !hasMoves(active_player, opponent, turn_roll)) {
       change_state(GameState::PASSING);
     } else {
       change_state(GameState::PLACING);
@@ -122,15 +124,15 @@ render_dice(sf::RenderWindow* window,
     roll_c = dice_c;
   }
 
-  if (state == GameState::PLACING || state == GameState::PASSING) {
+  if (state == GameState::PLACING) {
+    window->draw(*roll_result);
+  } else if (state == GameState::PASSING) {
     // draw roll text
     window->draw(*roll_result);
-    if (turn_roll == 0) {
-      int psi = SPRITE_COLS / 2 - 1;
-      for (auto& ps : (*pass_sprites)) {
-        ps.setPosition(pos(psi++, SPRITE_ROWS / 2));
-        window->draw(ps);
-      }
+    int psi = SPRITE_COLS / 2 - 1;
+    for (auto& ps : (*pass_sprites)) {
+      ps.setPosition(pos(psi++, SPRITE_ROWS / 2));
+      window->draw(ps);
     }
   } else if (state == GameState::ROLLING) {
     // if completed update dice sprites
@@ -415,6 +417,8 @@ main()
     }
 
     render_dice(&window,
+                p1_turn() ? p1 : p2,
+                p2_turn() ? p1 : p2,
                 dice,
                 roll_sprites,
                 pass_sprites,
-- 
cgit v1.2.3-54-g00ecf