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
This commit is contained in:
@@ -208,6 +208,15 @@ public class SceneDirector extends BasicDirector
|
|||||||
return _pendingData == null ? null : _pendingData.model;
|
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
|
// from interface SceneService_SceneMoveListener
|
||||||
public function moveSucceeded (placeId :int, config :PlaceConfig) :void
|
public function moveSucceeded (placeId :int, config :PlaceConfig) :void
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
// 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
|
// we were unable to load it, assume a cached version of zero
|
||||||
var sceneVers :int = 0;
|
var sceneVers :int = 0;
|
||||||
var sceneId :int = -1;
|
var sceneId :int = _scdir.getPendingSceneId();
|
||||||
var pendingModel :SceneModel = _scdir.getPendingModel();
|
var pendingModel :SceneModel = _scdir.getPendingModel();
|
||||||
if (pendingModel != null) {
|
if (pendingModel != null) {
|
||||||
sceneVers = pendingModel.version;
|
sceneVers = pendingModel.version;
|
||||||
|
|||||||
Reference in New Issue
Block a user