Don't choke if we're asked about game over and we've already shut down and
pitched our game object. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1344 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// $Id: GameController.java,v 1.12 2002/04/18 16:57:29 shaper Exp $
|
||||
// $Id: GameController.java,v 1.13 2002/05/07 00:49:24 mdb Exp $
|
||||
|
||||
package com.threerings.parlor.game;
|
||||
|
||||
@@ -92,7 +92,9 @@ public abstract class GameController extends PlaceController
|
||||
*/
|
||||
public boolean isGameOver ()
|
||||
{
|
||||
return (_gameOver || _gobj.state != GameObject.IN_PLAY);
|
||||
boolean gameOver =
|
||||
(_gobj != null) ? (_gobj.state != GameObject.IN_PLAY) : true);
|
||||
return (_gameOver || gameOver);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user