From 4f739b8bfeffa47ca4c7380c3e0bd23cc59e275a Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Tue, 8 Jun 2010 01:52:35 +0000 Subject: [PATCH] Incorporate the fixes from the java side to make actionscript handle the not-yet-cached scene case correctly. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@922 c613c5cb-e716-0410-b11b-feb51c14d237 --- src/as/com/threerings/whirled/client/SceneDirector.as | 9 +++++++++ .../com/threerings/whirled/zone/client/ZoneDirector.as | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/as/com/threerings/whirled/client/SceneDirector.as b/src/as/com/threerings/whirled/client/SceneDirector.as index 86a3a57e..453c3e47 100644 --- a/src/as/com/threerings/whirled/client/SceneDirector.as +++ b/src/as/com/threerings/whirled/client/SceneDirector.as @@ -208,6 +208,15 @@ public class SceneDirector extends BasicDirector return _pendingData == null ? null : _pendingData.model; } + /** + * Returns the scene id set in preparation for a scene transition. As with + * {@link #getPendingModel}, this is for cooperating directors. + */ + public function getPendingSceneId () :int + { + return _pendingData.sceneId; + } + // from interface SceneService_SceneMoveListener public function moveSucceeded (placeId :int, config :PlaceConfig) :void { diff --git a/src/as/com/threerings/whirled/zone/client/ZoneDirector.as b/src/as/com/threerings/whirled/zone/client/ZoneDirector.as index 0aeb72c8..18ab5959 100644 --- a/src/as/com/threerings/whirled/zone/client/ZoneDirector.as +++ b/src/as/com/threerings/whirled/zone/client/ZoneDirector.as @@ -113,7 +113,7 @@ public class ZoneDirector extends BasicDirector // check the version of our cached copy of the scene to which we're requesting to move; if // we were unable to load it, assume a cached version of zero var sceneVers :int = 0; - var sceneId :int = -1; + var sceneId :int = _scdir.getPendingSceneId(); var pendingModel :SceneModel = _scdir.getPendingModel(); if (pendingModel != null) { sceneVers = pendingModel.version;