From c5a422f7a2273540decb5aa80af098f80927138b Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 26 Nov 2003 03:17:16 +0000 Subject: [PATCH] Track our manager in the base delegate. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2881 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../puzzle/drop/server/DropManagerDelegate.java | 8 +------- .../threerings/puzzle/server/PuzzleManagerDelegate.java | 5 ++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java b/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java index 402f4226e..eb8b927a6 100644 --- a/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java +++ b/src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: DropManagerDelegate.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: DropManagerDelegate.java,v 1.2 2003/11/26 03:17:16 mdb Exp $ package com.threerings.puzzle.drop.server; @@ -65,9 +65,6 @@ public abstract class DropManagerDelegate extends PuzzleManagerDelegate { super(puzmgr); - // save off the puzzle manager - _puzmgr = puzmgr; - // configure the game-specific settings _usedrop = logic.useBlockDropping(); _userise = logic.useBoardRising(); @@ -146,9 +143,6 @@ public abstract class DropManagerDelegate extends PuzzleManagerDelegate _puzmgr.updateBoardSummary(pidx); } - /** The puzzle manager. */ - protected PuzzleManager _puzmgr; - /** The drop game board for each player. */ protected DropBoard[] _dboards; diff --git a/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java b/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java index 783df0ab3..c5eb2692e 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java +++ b/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: PuzzleManagerDelegate.java,v 1.1 2003/11/26 01:42:34 mdb Exp $ +// $Id: PuzzleManagerDelegate.java,v 1.2 2003/11/26 03:17:16 mdb Exp $ package com.threerings.puzzle.server; @@ -17,6 +17,7 @@ public class PuzzleManagerDelegate extends GameManagerDelegate public PuzzleManagerDelegate (PuzzleManager puzmgr) { super(puzmgr); + _puzmgr = puzmgr; } /** @@ -25,4 +26,6 @@ public class PuzzleManagerDelegate extends GameManagerDelegate public void difficultyChanged (int level) { } + + protected PuzzleManager _puzmgr; }