Brought these two classes back into sync. This wiped out the

hand-modifications to setState() but we're no longer having problems with
multiply ending games so they are no longer needed.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3117 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/parlor/game/GameObject.dobj

@@ -1,5 +1,23 @@
 //
-// $Id: GameObject.dobj,v 1.22 2004/09/01 21:02:44 ray Exp $
+// $Id: GameObject.dobj,v 1.23 2004/09/13 16:11:10 mdb Exp $
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 package com.threerings.parlor.game;
 

src/java/com/threerings/parlor/game/GameObject.java

@@ -1,5 +1,5 @@
 //
-// $Id: GameObject.java,v 1.21 2004/09/01 21:02:44 ray Exp $
+// $Id: GameObject.java,v 1.22 2004/09/13 16:11:10 mdb Exp $
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -225,10 +225,6 @@ public class GameObject extends PlaceObject
      */
     public void setState (int state)
     {
-        if ((state == GAME_OVER || state == CANCELLED) &&
-            (this.state == GAME_OVER || this.state == CANCELLED)) {
-            Thread.dumpStack();
-        }
         requestAttributeChange(STATE, new Integer(state));
         this.state = state;
     }