Use new LocationManager. Some injection in SimulationManager.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@618 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -50,7 +50,7 @@ public class SceneMoveHandler extends AbstractSceneMoveHandler
|
||||
{
|
||||
// move to location associated with this scene
|
||||
int ploid = scmgr.getPlaceObject().getOid();
|
||||
PlaceConfig config = CrowdServer.plreg.locprov.moveTo(_body, ploid);
|
||||
PlaceConfig config = CrowdServer.locman.moveTo(_body, ploid);
|
||||
|
||||
// check to see if they need a newer version of the scene data
|
||||
SceneService.SceneMoveListener listener = (SceneService.SceneMoveListener)_listener;
|
||||
|
||||
@@ -197,7 +197,7 @@ public class SceneRegistry
|
||||
public void moveBody (BodyObject source, int sceneId)
|
||||
{
|
||||
// first remove them from their old place
|
||||
CrowdServer.plreg.locprov.leaveOccupiedPlace(source);
|
||||
CrowdServer.locman.leaveOccupiedPlace(source);
|
||||
|
||||
// then send a forced move notification
|
||||
SceneSender.forcedMove(source, sceneId);
|
||||
@@ -210,7 +210,7 @@ public class SceneRegistry
|
||||
public void leaveOccupiedScene (BodyObject source)
|
||||
{
|
||||
// remove them from their occupied place (clears out scene info as well)
|
||||
CrowdServer.plreg.locprov.leaveOccupiedPlace(source);
|
||||
CrowdServer.locman.leaveOccupiedPlace(source);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -85,7 +85,7 @@ public class ZoneMoveHandler extends AbstractSceneMoveHandler
|
||||
{
|
||||
// move to the place object associated with this scene
|
||||
int ploid = scmgr.getPlaceObject().getOid();
|
||||
PlaceConfig config = WhirledServer.plreg.locprov.moveTo(_body, ploid);
|
||||
PlaceConfig config = WhirledServer.locman.moveTo(_body, ploid);
|
||||
|
||||
// now that we've moved, we can update the user object with the new scene and zone ids
|
||||
_body.startTransaction();
|
||||
|
||||
@@ -25,7 +25,7 @@ import com.samskivert.util.HashIntMap;
|
||||
|
||||
import com.threerings.presents.server.InvocationManager;
|
||||
|
||||
import com.threerings.crowd.server.PlaceRegistry;
|
||||
import com.threerings.crowd.server.LocationManager;
|
||||
import com.threerings.whirled.server.SceneRegistry;
|
||||
|
||||
import com.threerings.whirled.zone.data.ZoneCodes;
|
||||
@@ -45,10 +45,10 @@ public class ZoneRegistry
|
||||
/**
|
||||
* Creates a zone manager with the supplied configuration.
|
||||
*/
|
||||
public ZoneRegistry (InvocationManager invmgr, PlaceRegistry plreg, SceneRegistry screg)
|
||||
public ZoneRegistry (InvocationManager invmgr, LocationManager locman, SceneRegistry screg)
|
||||
{
|
||||
// create a zone provider and register it with the invocation services
|
||||
zoneprov = new ZoneProvider(plreg.locprov, this, screg);
|
||||
zoneprov = new ZoneProvider(locman, this, screg);
|
||||
invmgr.registerDispatcher(new ZoneDispatcher(zoneprov), ZoneCodes.WHIRLED_GROUP);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user