From 1c7fbbdccf94549fd848f5acac54a2832173cc01 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 11 Jun 2003 17:06:42 +0000 Subject: [PATCH] Need to name this differently to avoid conflicts. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2650 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/whirled/client/SceneController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/whirled/client/SceneController.java b/src/java/com/threerings/whirled/client/SceneController.java index 6f4524b9f..f6b9bfb26 100644 --- a/src/java/com/threerings/whirled/client/SceneController.java +++ b/src/java/com/threerings/whirled/client/SceneController.java @@ -1,5 +1,5 @@ // -// $Id: SceneController.java,v 1.2 2003/06/11 04:14:11 mdb Exp $ +// $Id: SceneController.java,v 1.3 2003/06/11 17:06:42 mdb Exp $ package com.threerings.whirled.client; @@ -26,7 +26,7 @@ public abstract class SceneController extends PlaceController public void init (CrowdContext ctx, PlaceConfig config) { super.init(ctx, config); - _ctx = (WhirledContext)ctx; + _wctx = (WhirledContext)ctx; } // documentation inherited @@ -52,7 +52,7 @@ public abstract class SceneController extends PlaceController protected void sceneUpdated (SceneUpdate update) { // apply the update to the scene - _ctx.getSceneDirector().getScene().updateReceived(update); + _wctx.getSceneDirector().getScene().updateReceived(update); // we don't persistify these updates in this circumstance, but // next time we come to this scene we'll redownload the update and @@ -69,5 +69,5 @@ public abstract class SceneController extends PlaceController } }; - protected WhirledContext _ctx; + protected WhirledContext _wctx; }