From 9450dc5f2c3a045c10b4e7b26c2be972718268e0 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 11 Sep 2007 19:45:38 +0000
Subject: [PATCH] Don't complain about transitioning back to PRE_GAME.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@428 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../com/threerings/parlor/game/client/GameController.as   | 8 +++++---
 .../com/threerings/parlor/game/client/GameController.java | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/as/com/threerings/parlor/game/client/GameController.as b/src/as/com/threerings/parlor/game/client/GameController.as
index c89d3f42..f09141aa 100644
--- a/src/as/com/threerings/parlor/game/client/GameController.as
+++ b/src/as/com/threerings/parlor/game/client/GameController.as
@@ -198,13 +198,15 @@ public /*abstract*/ class GameController extends PlaceController
     }
 
     /**
-     * Derived classes can override this method if they add additional game
-     * states and should handle transitions to those states, returning true to
-     * indicate they were handled and calling super for the normal game states.
+     * Derived classes can override this method if they add additional game states and should
+     * handle transitions to those states, returning true to indicate they were handled and calling
+     * super for the normal game states.
      */
     protected function stateDidChange (state :int) :Boolean
     {
         switch (state) {
+        case GameObject.PRE_GAME:
+            return true;
         case GameObject.IN_PLAY:
             gameDidStart();
             return true;
diff --git a/src/java/com/threerings/parlor/game/client/GameController.java b/src/java/com/threerings/parlor/game/client/GameController.java
index a89239d2..603d1791 100644
--- a/src/java/com/threerings/parlor/game/client/GameController.java
+++ b/src/java/com/threerings/parlor/game/client/GameController.java
@@ -207,6 +207,8 @@ public abstract class GameController extends PlaceController
     protected boolean stateDidChange (int state)
     {
         switch (state) {
+        case GameObject.PRE_GAME:
+            return true;
         case GameObject.IN_PLAY:
             gameDidStart();
             return true;