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

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
@@ -84,7 +84,7 @@ public abstract class GameController extends PlaceController
// if this place object is not our current location we'll need to add it as an auxiliary
// chat source
BodyObject bobj = (BodyObject)_ctx.getClient().getClientObject();
if (bobj.location != plobj.getOid()) {
if (bobj.location == null || bobj.location.placeOid != plobj.getOid()) {
_ctx.getChatDirector().addAuxiliarySource(_gobj, GameCodes.GAME_CHAT_TYPE);
}
@@ -708,7 +708,7 @@ public class GameManager extends PlaceManager
return; // body object can be null for ai players
}
DObject place = CrowdServer.omgr.getObject(user.location);
DObject place = CrowdServer.omgr.getObject(user.getPlaceOid());
if (place != null) {
place.postMessage(PLAYER_KNOCKED_OUT, new Object[] { new int[] { user.getOid() } });
}
@@ -1180,7 +1180,7 @@ public class GameManager extends PlaceManager
for (int ii=0; ii < numPlayers; ii++) {
BodyObject user = getPlayer(ii);
if (user != null) {
places.add(user.location);
places.add(user.getPlaceOid());
(_gameobj.isWinner(ii) ? winners : losers).add(user.getOid());
}
}