From a140c24a53e8ff5483e35fa0bcb424a6bac903d0 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 17 Oct 2001 23:29:42 +0000
Subject: [PATCH] Added getTurnHolderIndex().

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@483 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../parlor/turn/TurnGameManager.java          | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/java/com/threerings/parlor/turn/TurnGameManager.java b/src/java/com/threerings/parlor/turn/TurnGameManager.java
index 9e26dd443..1d6954a10 100644
--- a/src/java/com/threerings/parlor/turn/TurnGameManager.java
+++ b/src/java/com/threerings/parlor/turn/TurnGameManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: TurnGameManager.java,v 1.2 2001/10/12 19:31:35 mdb Exp $
+// $Id: TurnGameManager.java,v 1.3 2001/10/17 23:29:42 mdb Exp $
 
 package com.threerings.parlor.turn;
 
@@ -76,9 +76,11 @@ public class TurnGameManager extends GameManager
         BodyObject body = (BodyObject)CrowdServer.omgr.getObject(boid);
         if (body != null) {
             _turnGame.setTurnHolder(body.username);
+
         } else {
-            Log.warning("Unable to start game; first player isn't around " +
-                        "[boid=" + boid + "].");
+            Log.warning("Unable to start turn; turn holder isn't around " +
+                        "[username=" + _players[_turnIdx] +
+                        ", boid=" + boid + "].");
         }
     }
 
@@ -142,6 +144,23 @@ public class TurnGameManager extends GameManager
         _turnIdx = (_turnIdx + 1) % _playerOids.length;
     }
 
+    /**
+     * Returns the index of the current turn holder as configured in the
+     * game object.
+     *
+     * @return the index into the players array of the current turn holder
+     * or -1 if there is no current turn holder.
+     */
+    protected int getTurnHolderIndex ()
+    {
+        for (int i = 0; i < _players.length; i++) {
+            if (_players[i].equals(_turnGame.turnHolder)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
     /** A reference to our game object. */
     protected TurnGameObject _turnGame;