From 2299e6a1deb2d77dd27ae0f1e22cead80f5c9718 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 30 Mar 2005 00:44:03 +0000 Subject: [PATCH] More Stage bits. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3439 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/stage/client/StageScenePanel.java | 8 +++----- .../com/threerings/stage/server/StageSceneManager.java | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/java/com/threerings/stage/client/StageScenePanel.java b/src/java/com/threerings/stage/client/StageScenePanel.java index 62760469b..130a70485 100644 --- a/src/java/com/threerings/stage/client/StageScenePanel.java +++ b/src/java/com/threerings/stage/client/StageScenePanel.java @@ -85,7 +85,7 @@ public class StageScenePanel extends MisoScenePanel /** * Constructs a stage scene view panel. */ - public StageScenePanel (StageContext ctx, StageSceneController ctrl) + public StageScenePanel (StageContext ctx, Controller ctrl) { super(ctx, StageSceneUtil.getMetrics()); @@ -568,9 +568,7 @@ public class StageScenePanel extends MisoScenePanel */ protected UniformTileSet loadPortalTileSet () { -// return YoUI.client.loadTileSet( -// "media/yohoho/icons/portal_arrows.png", -// PORTAL_ICON_WIDTH, PORTAL_ICON_HEIGHT); + // TODO: load some sort of portal tileset return null; } @@ -599,7 +597,7 @@ public class StageScenePanel extends MisoScenePanel protected StageContext _ctx; /** The controller with which we work in tandem. */ - protected StageSceneController _ctrl; + protected Controller _ctrl; /** Our currently displayed scene. */ protected StageScene _scene; diff --git a/src/java/com/threerings/stage/server/StageSceneManager.java b/src/java/com/threerings/stage/server/StageSceneManager.java index 443ee7758..5a9e3ff72 100644 --- a/src/java/com/threerings/stage/server/StageSceneManager.java +++ b/src/java/com/threerings/stage/server/StageSceneManager.java @@ -244,6 +244,12 @@ public class StageSceneManager extends SpotSceneManager return StageSceneObject.class; } + // documentation inherited + protected Class getOccupantInfoClass (BodyObject body) + { + return StageOccupantInfo.class; + } + // documentation inherited protected void bodyLeft (int bodyOid) {