EZGame's done get gameWillReset(), so just clear the turn holder
in gameWillStart. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@523 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -646,6 +646,9 @@ public class EZGameManager extends GameManager
|
|||||||
// because the super's version of this function will immediately increment it, and then
|
// because the super's version of this function will immediately increment it, and then
|
||||||
// distribute the new incremented value.
|
// distribute the new incremented value.
|
||||||
_ezObj.roundId = 0;
|
_ezObj.roundId = 0;
|
||||||
|
// clear out the turn holder in case we're restarting
|
||||||
|
_ezObj.setTurnHolder(null);
|
||||||
|
|
||||||
super.gameWillStart();
|
super.gameWillStart();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,15 +42,6 @@ public class EZGameTurnDelegate extends TurnGameManagerDelegate
|
|||||||
endTurn();
|
endTurn();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void gameWillReset ()
|
|
||||||
{
|
|
||||||
super.gameWillReset();
|
|
||||||
|
|
||||||
// make it nobody's turn
|
|
||||||
_turnGame.setTurnHolder(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setFirstTurnHolder ()
|
protected void setFirstTurnHolder ()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user