AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates to reflect new BodyObject.location change. We now have a ScenePlace and

Browse Source 
ScenedBodyObject goes away.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@372 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2007-07-21 00:47:00 +00:00
parent c8b2f7212b
commit e03ddd71e8
20 changed files with 174 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/zone/data/ZonedBodyObject.java
+4 -4
View File
@@ -21,13 +21,13 @@
package com.threerings.whirled.zone.data;
import com.threerings.whirled.data.ScenedBodyObject;
import com.threerings.crowd.data.BodyObject;
/**
* A system that uses the zone services must provide a body object
* extension that implements this interface.
* A system that uses the zone services must extend {@link BodyObject} and implement this
* interface.
*/
public interface ZonedBodyObject extends ScenedBodyObject
public interface ZonedBodyObject
{
/**
* Returns the zone id currently occupied by this body.
src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java
-2
View File
@@ -29,7 +29,6 @@ import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.data.ScenedBodyObject;
import com.threerings.whirled.server.AbstractSceneMoveHandler;
import com.threerings.whirled.server.SceneManager;
import com.threerings.whirled.server.SceneMoveHandler;
@@ -90,7 +89,6 @@ public class ZoneMoveHandler extends AbstractSceneMoveHandler
// now that we've moved, we can update the user object with the new scene and zone ids
_body.startTransaction();
try {
((ScenedBodyObject)_body).setSceneId(scmgr.getScene().getId());
((ZonedBodyObject)_body).setZoneId(_summary.zoneId);
} finally {
_body.commitTransaction();
src/java/com/threerings/whirled/zone/server/ZoneProvider.java
+1 -2
View File
@@ -33,7 +33,6 @@ import com.threerings.crowd.server.LocationProvider;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.data.ScenedBodyObject;
import com.threerings.whirled.server.SceneManager;
import com.threerings.whirled.server.SceneRegistry;
@@ -150,7 +149,7 @@ public class ZoneProvider
}
// remove them from their occupied scene
_screg.leaveOccupiedScene(source);
_screg.leaveOccupiedScene((BodyObject)source);
// and clear out their zone information
source.setZoneId(-1);