A spot of cleanup.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@543 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -110,11 +110,8 @@ public class EZPartyTurnDelegate extends GameManagerDelegate
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Iterator<Integer> itr = _ordering.iterator();
|
for (int playerId : _ordering) {
|
||||||
while (itr.hasNext()) {
|
if ((playerId != _currentHolderId) && setNextTurn(playerId)) {
|
||||||
nextPlayerId = itr.next();
|
|
||||||
if (nextPlayerId != _currentHolderId) {
|
|
||||||
setNextTurn(nextPlayerId); // should always work
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -170,7 +167,7 @@ public class EZPartyTurnDelegate extends GameManagerDelegate
|
|||||||
/** A reference to our game object. */
|
/** A reference to our game object. */
|
||||||
protected TurnGameObject _turnGame;
|
protected TurnGameObject _turnGame;
|
||||||
|
|
||||||
/** Tracks the turn ordering for occupants. */
|
/** Tracks the turn ordering for occupants. Initialized only if turns are used by the game. */
|
||||||
protected LinkedHashSet<Integer> _ordering;
|
protected LinkedHashSet<Integer> _ordering;
|
||||||
|
|
||||||
/** The oid of the current turn holder. */
|
/** The oid of the current turn holder. */
|
||||||
|
|||||||
Reference in New Issue
Block a user