Added support for handling games with multiple rounds.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@237 c613c5cb-e716-0410-b11b-feb51c14d237

src/as/com/threerings/ezgame/client/EZGameController.as

@@ -34,6 +34,7 @@ import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.parlor.game.client.GameController;
+import com.threerings.parlor.game.data.GameObject;
 
 import com.threerings.parlor.turn.client.TurnGameController;
 import com.threerings.parlor.turn.client.TurnGameControllerDelegate;
@@ -88,6 +89,12 @@ public class EZGameController extends GameController
         var name :String = event.getName();
         if (EZGameObject.CONTROLLER_OID == name) {
             _panel.backend.controlDidChange();
+        } else if (GameObject.ROUND_ID == name) {
+            if ((event.getValue() as int) > 0) {
+                _panel.backend.roundStateChanged(true);
+            } else {
+                _panel.backend.roundStateChanged(false);
+            }
         } else {
             super.attributeChanged(event);
         }
@@ -113,14 +120,14 @@ public class EZGameController extends GameController
     override protected function gameDidStart () :void
     {
         super.gameDidStart();
-        _panel.backend.gameDidStart();
+        _panel.backend.gameStateChanged(true);
     }
 
     // from GameController
     override protected function gameDidEnd () :void
     {
         super.gameDidEnd();
-        _panel.backend.gameDidEnd();
+        _panel.backend.gameStateChanged(false);
     }
 
     // from PlaceController

src/as/com/threerings/ezgame/client/EZGameService.as

@@ -45,6 +45,9 @@ public interface EZGameService extends InvocationService
     // from Java interface EZGameService
     function endGame (arg1 :Client, arg2 :Array, arg3 :InvocationService_InvocationListener) :void;
 
+    // from Java interface EZGameService
+    function endRound (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
+
     // from Java interface EZGameService
     function endTurn (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
 

src/as/com/threerings/ezgame/client/GameControlBackend.as

@@ -192,8 +192,10 @@ public class GameControlBackend
         o["getControllerId_v1"] = getControllerId_v1;
         o["getUserCookie_v2"] = getUserCookie_v2;
         o["endTurn_v2"] = endTurn_v2;
+        o["endRound_v1"] = endRound_v1;
         o["endGame_v2"] = endGame_v2;
         o["getTurnHolder_v1"] = getTurnHolder_v1;
+        o["getRound_v1"] = getRound_v1;
         o["getOccupantName_v1"] = getOccupantName_v1;
         o["getPlayers_v1"] = getPlayers_v1;
         o["getPlayerPosition_v1"] = getPlayerPosition_v1;
@@ -347,6 +349,11 @@ public class GameControlBackend
         return (occInfo == null) ? 0 : occInfo.bodyOid;
     }
 
+    public function getRound_v1 () :int
+    {
+        return _ezObj.roundId;
+    }
+
     public function getUserCookie_v2 (
         playerId :int, callback :Function) :void
     {
@@ -401,8 +408,14 @@ public class GameControlBackend
 
     public function endTurn_v2 (nextPlayerId :int) :void
     {
-        _ezObj.ezGameService.endTurn(_ctx.getClient(), nextPlayerId,
-            createLoggingConfirmListener("endTurn"));
+        _ezObj.ezGameService.endTurn(
+            _ctx.getClient(), nextPlayerId, createLoggingConfirmListener("endTurn"));
+    }
+
+    public function endRound_v1 (nextRoundDelay :int) :void
+    {
+        _ezObj.ezGameService.endRound(
+            _ctx.getClient(), nextRoundDelay, createLoggingConfirmListener("endRound"));
     }
 
     public function endGame_v2 (... winnerIds) :void
@@ -411,12 +424,11 @@ public class GameControlBackend
         while (winnerIds.length > 0) {
             winners.push(int(winnerIds.shift()));
         }
-        _ezObj.ezGameService.endGame(_ctx.getClient(), winners,
-            createLoggingConfirmListener("endGame"));
+        _ezObj.ezGameService.endGame(
+            _ctx.getClient(), winners, createLoggingConfirmListener("endGame"));
     }
 
-    public function getDictionaryLetterSet_v1 (
-        locale :String, count :int, callback :Function) :void
+    public function getDictionaryLetterSet_v1 (locale :String, count :int, callback :Function) :void
     {
         var listener :InvocationService_ResultListener;
         if (callback != null) {
@@ -682,19 +694,25 @@ public class GameControlBackend
     }
 
     /**
-     * Called by the EZGameController when the game starts.
+     * Called by the EZGameController when the game starts or ends.
      */
-    public function gameDidStart () :void
+    public function gameStateChanged (started :Boolean) :void
     {
-        callUserCode("gameDidStart_v1");
+        if (started && _userFuncs["gameDidStart_v1"] != null) {
+            callUserCode("gameDidStart_v1"); // backwards compatibility
+        } else if (!started && _userFuncs["gameDidEnd_v1"] != null) {
+            callUserCode("gameDidEnd_v1"); // backwards compatibility
+        } else {
+            callUserCode("gameStateChanged_v1", started); // new hotness
+        }
     }
 
     /**
-     * Called by the EZGameController when the game ends.
+     * Called by the EZGameController when a round starts or ends.
      */
-    public function gameDidEnd () :void
+    public function roundStateChanged (started :Boolean) :void
     {
-        callUserCode("gameDidEnd_v1");
+        callUserCode("roundStateChanged_v1", started);
     }
 
     // from SetListener