Fixes to compile.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@6 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
package com.threerings.whirled.client {
|
package com.threerings.whirled.client {
|
||||||
|
|
||||||
|
import com.threerings.presents.dobj.MessageAdapter;
|
||||||
import com.threerings.presents.dobj.MessageEvent;
|
import com.threerings.presents.dobj.MessageEvent;
|
||||||
import com.threerings.presents.dobj.MessageListener;
|
import com.threerings.presents.dobj.MessageListener;
|
||||||
|
|
||||||
|
|||||||
@@ -271,7 +271,7 @@ public class SceneDirector extends BasicDirector
|
|||||||
} catch (ise :IllegalOperationError) {
|
} catch (ise :IllegalOperationError) {
|
||||||
log.warning("Scene update failed validation [model=" + model +
|
log.warning("Scene update failed validation [model=" + model +
|
||||||
", update=" + update +
|
", update=" + update +
|
||||||
", error=" + ise.getMessage() + "].");
|
", error=" + ise.message + "].");
|
||||||
failure = true;
|
failure = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,14 +80,13 @@ public class SceneUpdate
|
|||||||
//throws IllegalStateException
|
//throws IllegalStateException
|
||||||
{
|
{
|
||||||
if (model.sceneId != _targetId) {
|
if (model.sceneId != _targetId) {
|
||||||
var errmsg :String = "Wrong target scene, expected id " +
|
throw new IllegalOperationError("Wrong target scene, expected id " +
|
||||||
_targetId + " got id " + model.sceneId;
|
_targetId + " got id " + model.sceneId);
|
||||||
throw new IllegalOperationError(errmsg);
|
|
||||||
}
|
} else if (model.version != _targetVersion) {
|
||||||
if (model.version != _targetVersion) {
|
throw new IllegalOperationError("Target scene not proper " +
|
||||||
var errmsg :String = "Target scene not proper version, expected " +
|
"version, expected " + _targetVersion +
|
||||||
_targetVersion + " got " + model.version;
|
" got " + model.version);
|
||||||
throw new IllegalOperationError(errmsg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
package com.threerings.whirled.spot.client {
|
package com.threerings.whirled.spot.client {
|
||||||
|
|
||||||
import com.threerings.presents.client.Client;
|
import com.threerings.presents.client.Client;
|
||||||
|
import com.threerings.presents.client.ConfirmListener;
|
||||||
import com.threerings.presents.client.InvocationService;
|
import com.threerings.presents.client.InvocationService;
|
||||||
|
|
||||||
import com.threerings.whirled.client.SceneService_SceneMoveListener;
|
import com.threerings.whirled.client.SceneService_SceneMoveListener;
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import com.threerings.io.ObjectInputStream;
|
|||||||
import com.threerings.io.ObjectOutputStream;
|
import com.threerings.io.ObjectOutputStream;
|
||||||
|
|
||||||
import com.threerings.presents.dobj.DSet;
|
import com.threerings.presents.dobj.DSet;
|
||||||
|
import com.threerings.presents.dobj.DSet_Entry;
|
||||||
import com.threerings.whirled.data.SceneObject;
|
import com.threerings.whirled.data.SceneObject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user