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

The first great Three Rings renaming. Cocktail changed to Narya, Cher

Browse Source 
changed to Presents and Party changed to Crowd. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@431 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-10-11 04:07:54 +00:00
parent ac477756ea
commit 8a4c46badc
170 changed files with 832 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/client/ParlorCodes.java
+2 -2
View File
@@ -1,9 +1,9 @@
//
// $Id: ParlorCodes.java,v 1.4 2001/10/04 22:47:49 mdb Exp $
// $Id: ParlorCodes.java,v 1.5 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.client;
import com.threerings.cocktail.cher.client.InvocationCodes;
import com.threerings.presents.client.InvocationCodes;
/**
* Contains codes used by the parlor invocation services.
src/java/com/threerings/parlor/client/ParlorDirector.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: ParlorDirector.java,v 1.9 2001/10/09 20:20:52 mdb Exp $
// $Id: ParlorDirector.java,v 1.10 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.client;
@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import com.samskivert.util.HashIntMap;
import com.threerings.cocktail.cher.client.InvocationReceiver;
import com.threerings.presents.client.InvocationReceiver;
import com.threerings.parlor.Log;
import com.threerings.parlor.data.GameConfig;
src/java/com/threerings/parlor/client/ParlorService.java
+3 -3
View File
@@ -1,10 +1,10 @@
//
// $Id: ParlorService.java,v 1.5 2001/10/02 02:09:06 mdb Exp $
// $Id: ParlorService.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.client;
import com.threerings.cocktail.cher.client.Client;
import com.threerings.cocktail.cher.client.InvocationDirector;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationDirector;
import com.threerings.parlor.Log;
import com.threerings.parlor.data.GameConfig;
src/java/com/threerings/parlor/game/GameCodes.java
+2 -2
View File
@@ -1,9 +1,9 @@
//
// $Id: GameCodes.java,v 1.1 2001/10/11 03:12:38 mdb Exp $
// $Id: GameCodes.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.client;
import com.threerings.cocktail.cher.client.InvocationCodes;
import com.threerings.presents.client.InvocationCodes;
/**
* Contains codes used by the game services.
src/java/com/threerings/parlor/game/GameConfig.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: GameConfig.java,v 1.5 2001/10/06 00:25:29 mdb Exp $
// $Id: GameConfig.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.data;
@@ -7,7 +7,7 @@ import java.io.IOException;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import com.threerings.cocktail.party.data.PlaceConfig;
import com.threerings.crowd.data.PlaceConfig;
/**
* The game config class encapsulates the configuration information for a
src/java/com/threerings/parlor/game/GameController.java
+7 -7
View File
@@ -1,5 +1,5 @@
//
// $Id: GameController.java,v 1.5 2001/10/11 03:12:38 mdb Exp $
// $Id: GameController.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.client;
@@ -7,11 +7,11 @@ import java.awt.event.ActionEvent;
import com.samskivert.swing.Controller;
import com.threerings.cocktail.cher.dobj.*;
import com.threerings.cocktail.party.client.PlaceController;
import com.threerings.cocktail.party.data.PlaceConfig;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.cocktail.party.util.PartyContext;
import com.threerings.presents.dobj.*;
import com.threerings.crowd.client.PlaceController;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.parlor.Log;
import com.threerings.parlor.data.GameConfig;
@@ -42,7 +42,7 @@ public abstract class GameController
* @param config the configuration of the game we are intended to
* control.
*/
public void init (PartyContext ctx, PlaceConfig config)
public void init (CrowdContext ctx, PlaceConfig config)
{
// cast our references before we call super.init() so that when
// super.init() calls createPlaceView(), we have our casted
src/java/com/threerings/parlor/game/GameManager.java
+10 -10
View File
@@ -1,15 +1,15 @@
//
// $Id: GameManager.java,v 1.6 2001/10/11 03:12:38 mdb Exp $
// $Id: GameManager.java,v 1.7 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.server;
import com.threerings.cocktail.cher.dobj.MessageEvent;
import com.threerings.presents.dobj.MessageEvent;
import com.threerings.cocktail.party.data.BodyObject;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.cocktail.party.server.PlaceManager;
import com.threerings.cocktail.party.server.PartyServer;
import com.threerings.cocktail.party.server.PartyServer;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.PlaceManager;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.parlor.Log;
import com.threerings.parlor.client.GameCodes;
@@ -77,9 +77,9 @@ public class GameManager
Object[] args = new Object[] {
new Integer(_gameobj.getOid()) };
for (int i = 0; i < _players.length; i++) {
BodyObject bobj = PartyServer.lookupBody(_players[i]);
BodyObject bobj = CrowdServer.lookupBody(_players[i]);
// deliver a game ready notification to the player
PartyServer.invmgr.sendNotification(
CrowdServer.invmgr.sendNotification(
bobj.getOid(), MODULE_NAME, GAME_READY_NOTIFICATION, args);
}
}
@@ -169,7 +169,7 @@ public class GameManager
{
int cloid = event.getSourceOid();
BodyObject body = (BodyObject)
PartyServer.omgr.getObject(cloid);
CrowdServer.omgr.getObject(cloid);
if (body == null) {
Log.warning("Player sent am ready notification and then " +
"disappeared [event=" + event + "].");
src/java/com/threerings/parlor/game/GameObject.dobj
+2 -2
View File
@@ -1,9 +1,9 @@
//
// $Id: GameObject.dobj,v 1.2 2001/10/01 06:19:15 mdb Exp $
// $Id: GameObject.dobj,v 1.3 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.data;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.crowd.data.PlaceObject;
/**
* A game object hosts the shared data associated with a game played by
src/java/com/threerings/parlor/server/ParlorManager.java
+6 -6
View File
@@ -1,16 +1,16 @@
//
// $Id: ParlorManager.java,v 1.7 2001/10/09 20:20:35 mdb Exp $
// $Id: ParlorManager.java,v 1.8 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.server;
import com.samskivert.util.Config;
import com.samskivert.util.HashIntMap;
import com.threerings.cocktail.cher.server.InvocationManager;
import com.threerings.cocktail.cher.server.ServiceFailedException;
import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.server.ServiceFailedException;
import com.threerings.cocktail.party.data.BodyObject;
import com.threerings.cocktail.party.server.PartyServer;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.parlor.Log;
import com.threerings.parlor.client.ParlorCodes;
@@ -176,7 +176,7 @@ public class ParlorManager
// started up (which is done by the place registry once the
// game object creation has completed)
GameManager gmgr = (GameManager)
PartyServer.plreg.createPlace(invite.config);
CrowdServer.plreg.createPlace(invite.config);
// provide the game manager with some initialization info
String[] players = new String[] {
src/java/com/threerings/parlor/server/ParlorProvider.java
+6 -6
View File
@@ -1,12 +1,12 @@
//
// $Id: ParlorProvider.java,v 1.5 2001/10/03 03:44:52 mdb Exp $
// $Id: ParlorProvider.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
package com.threerings.parlor.server;
import com.threerings.cocktail.cher.server.InvocationProvider;
import com.threerings.cocktail.cher.server.ServiceFailedException;
import com.threerings.cocktail.party.data.BodyObject;
import com.threerings.cocktail.party.server.PartyServer;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.presents.server.ServiceFailedException;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.parlor.Log;
import com.threerings.parlor.client.ParlorCodes;
@@ -49,7 +49,7 @@ public class ParlorProvider
// ensure that the invitee is online at present
try {
BodyObject target = PartyServer.lookupBody(invitee);
BodyObject target = CrowdServer.lookupBody(invitee);
if (target == null) {
throw new ServiceFailedException(INVITEE_NOT_ONLINE);
}
src/java/com/threerings/parlor/util/ParlorContext.java
+3 -3
View File
@@ -1,16 +1,16 @@
//
// $Id: ParlorContext.java,v 1.1 2001/10/01 02:56:35 mdb Exp $
// $Id: ParlorContext.java,v 1.2 2001/10/11 04:07:52 mdb Exp $
package com.threerings.parlor.util;
import com.threerings.cocktail.party.util.PartyContext;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.parlor.client.ParlorDirector;
/**
* The parlor context provides access to the various managers, etc. that
* are needed by the parlor client code.
*/
public interface ParlorContext extends PartyContext
public interface ParlorContext extends CrowdContext
{
/**
* Returns a reference to the parlor director.