Match recent changes in our corresponding java classes.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@14 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -82,11 +82,13 @@ public class Portal
|
||||
/**
|
||||
* Returns true if the portal has a potentially valid target scene and
|
||||
* portal id (they are not guaranteed to exist, but they are at least
|
||||
* potentially valid values rather than -1 or 0).
|
||||
* potentially valid values rather than 0).
|
||||
*/
|
||||
public function isValid () :Boolean
|
||||
{
|
||||
return (targetSceneId > 0) && (targetPortalId > 0);
|
||||
return (targetSceneId > 0) &&
|
||||
// the target portal must be positive, or -1
|
||||
((targetPortalId > 0) || (targetPortalId == -1));
|
||||
}
|
||||
|
||||
// documentation inherited from interface Streamable
|
||||
@@ -110,8 +112,7 @@ public class Portal
|
||||
// documentation inherited from interface Cloneable
|
||||
public function clone () :Object
|
||||
{
|
||||
var clazz :Class = ClassUtil.getClass(this);
|
||||
var p :Portal = new clazz();
|
||||
var p :Portal = (ClassUtil.newInstance(this) as Portal);
|
||||
p.portalId = portalId;
|
||||
p.loc = loc;
|
||||
p.targetSceneId = targetSceneId;
|
||||
|
||||
@@ -57,6 +57,9 @@ public class SpotSceneImpl
|
||||
// documentation inherited from interface
|
||||
public function getPortal (portalId :int) :Portal
|
||||
{
|
||||
if (portalId == -1) {
|
||||
portalId = _smodel.defaultEntranceId;
|
||||
}
|
||||
return (_portals.get(portalId) as Portal);
|
||||
}
|
||||
|
||||
@@ -87,7 +90,7 @@ public class SpotSceneImpl
|
||||
// documentation inherited from interface
|
||||
public function getDefaultEntrance () :Portal
|
||||
{
|
||||
return getPortal(_smodel.defaultEntranceId);
|
||||
return getPortal(-1); // -1 is a shortcut meaning "default"
|
||||
}
|
||||
|
||||
// documentation inherited from interface
|
||||
|
||||
Reference in New Issue
Block a user