From 458a187145e672450dff5c46246afe11f6743b31 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 28 Jun 2006 22:04:27 +0000
Subject: [PATCH] Fixes to compile.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@6 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../threerings/whirled/client/SceneController.as  |  1 +
 .../threerings/whirled/client/SceneDirector.as    |  2 +-
 src/as/com/threerings/whirled/data/SceneUpdate.as | 15 +++++++--------
 .../threerings/whirled/spot/client/SpotService.as |  1 +
 .../whirled/spot/data/SpotSceneObject.as          |  1 +
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/as/com/threerings/whirled/client/SceneController.as b/src/as/com/threerings/whirled/client/SceneController.as
index b337aaca..b3276742 100644
--- a/src/as/com/threerings/whirled/client/SceneController.as
+++ b/src/as/com/threerings/whirled/client/SceneController.as
@@ -21,6 +21,7 @@
 
 package com.threerings.whirled.client {
 
+import com.threerings.presents.dobj.MessageAdapter;
 import com.threerings.presents.dobj.MessageEvent;
 import com.threerings.presents.dobj.MessageListener;
 
diff --git a/src/as/com/threerings/whirled/client/SceneDirector.as b/src/as/com/threerings/whirled/client/SceneDirector.as
index 7343cf96..155e7d7e 100644
--- a/src/as/com/threerings/whirled/client/SceneDirector.as
+++ b/src/as/com/threerings/whirled/client/SceneDirector.as
@@ -271,7 +271,7 @@ public class SceneDirector extends BasicDirector
             } catch (ise :IllegalOperationError) {
                 log.warning("Scene update failed validation [model=" + model +
                             ", update=" + update +
-                            ", error=" + ise.getMessage() + "].");
+                            ", error=" + ise.message + "].");
                 failure = true;
                 break;
             }
diff --git a/src/as/com/threerings/whirled/data/SceneUpdate.as b/src/as/com/threerings/whirled/data/SceneUpdate.as
index e59f01f6..fa1798c2 100644
--- a/src/as/com/threerings/whirled/data/SceneUpdate.as
+++ b/src/as/com/threerings/whirled/data/SceneUpdate.as
@@ -80,14 +80,13 @@ public class SceneUpdate
         //throws IllegalStateException
     {
         if (model.sceneId != _targetId) {
-            var errmsg :String = "Wrong target scene, expected id " +
-                _targetId + " got id " + model.sceneId;
-            throw new IllegalOperationError(errmsg);
-        }
-        if (model.version != _targetVersion) {
-            var errmsg :String = "Target scene not proper version, expected " +
-                _targetVersion + " got " + model.version;
-            throw new IllegalOperationError(errmsg);
+            throw new IllegalOperationError("Wrong target scene, expected id " +
+                _targetId + " got id " + model.sceneId);
+
+        } else if (model.version != _targetVersion) {
+            throw new IllegalOperationError("Target scene not proper " +
+                "version, expected " + _targetVersion +
+                " got " + model.version);
         }
     }
 
diff --git a/src/as/com/threerings/whirled/spot/client/SpotService.as b/src/as/com/threerings/whirled/spot/client/SpotService.as
index 7308f81a..c38c6125 100644
--- a/src/as/com/threerings/whirled/spot/client/SpotService.as
+++ b/src/as/com/threerings/whirled/spot/client/SpotService.as
@@ -22,6 +22,7 @@
 package com.threerings.whirled.spot.client {
 
 import com.threerings.presents.client.Client;
+import com.threerings.presents.client.ConfirmListener;
 import com.threerings.presents.client.InvocationService;
 
 import com.threerings.whirled.client.SceneService_SceneMoveListener;
diff --git a/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as b/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as
index 25d30c09..df5f48f0 100644
--- a/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as
+++ b/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as
@@ -25,6 +25,7 @@ import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
 import com.threerings.presents.dobj.DSet;
+import com.threerings.presents.dobj.DSet_Entry;
 import com.threerings.whirled.data.SceneObject;
 
 /**