From e4aad9213a71874bb1395505b7b190174614f611 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 18 Sep 2002 18:33:20 +0000 Subject: [PATCH] Not to do the fiddly business with game state constants. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1710 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/parlor/game/GameObject.dobj | 8 ++++---- src/java/com/threerings/parlor/game/GameObject.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java/com/threerings/parlor/game/GameObject.dobj b/src/java/com/threerings/parlor/game/GameObject.dobj index 9b7df5109..e11f95db9 100644 --- a/src/java/com/threerings/parlor/game/GameObject.dobj +++ b/src/java/com/threerings/parlor/game/GameObject.dobj @@ -1,5 +1,5 @@ // -// $Id: GameObject.dobj,v 1.12 2002/09/18 04:01:29 shaper Exp $ +// $Id: GameObject.dobj,v 1.13 2002/09/18 18:33:20 mdb Exp $ package com.threerings.parlor.game; @@ -25,13 +25,13 @@ public class GameObject extends PlaceObject public static final int AWAITING_PLAYERS = 0; /** A game state constant indicating that the game is in play. */ - public static final int IN_PLAY = AWAITING_PLAYERS+1; + public static final int IN_PLAY = 1; /** A game state constant indicating that the game ended normally. */ - public static final int GAME_OVER = IN_PLAY+2; + public static final int GAME_OVER = 2; /** A game state constant indicating that the game was cancelled. */ - public static final int CANCELLED = GAME_OVER+3; + public static final int CANCELLED = 3; /** Provides general game invocation services. */ public GameMarshaller service; diff --git a/src/java/com/threerings/parlor/game/GameObject.java b/src/java/com/threerings/parlor/game/GameObject.java index 315c0bcc5..0b1018f2a 100644 --- a/src/java/com/threerings/parlor/game/GameObject.java +++ b/src/java/com/threerings/parlor/game/GameObject.java @@ -1,5 +1,5 @@ // -// $Id: GameObject.java,v 1.7 2002/09/18 04:01:29 shaper Exp $ +// $Id: GameObject.java,v 1.8 2002/09/18 18:33:20 mdb Exp $ package com.threerings.parlor.game; @@ -40,13 +40,13 @@ public class GameObject extends PlaceObject public static final int AWAITING_PLAYERS = 0; /** A game state constant indicating that the game is in play. */ - public static final int IN_PLAY = AWAITING_PLAYERS+1; + public static final int IN_PLAY = 1; /** A game state constant indicating that the game ended normally. */ - public static final int GAME_OVER = IN_PLAY+2; + public static final int GAME_OVER = 2; /** A game state constant indicating that the game was cancelled. */ - public static final int CANCELLED = GAME_OVER+3; + public static final int CANCELLED = 3; /** Provides general game invocation services. */ public GameMarshaller service;