From 71c7a488c99fbe1ce27ce742e96f77c50a921637 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Mon, 22 Jul 2002 22:54:04 +0000 Subject: [PATCH] byte'd chat mode code git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1600 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/crowd/chat/client/ChatDirector.java | 9 +++++---- .../com/threerings/crowd/chat/client/ChatDisplay.java | 4 ++-- src/java/com/threerings/crowd/chat/data/ChatCodes.java | 8 ++++---- .../com/threerings/crowd/chat/server/ChatProvider.java | 8 ++++---- src/java/com/threerings/micasa/client/ChatPanel.java | 4 ++-- .../whirled/spot/client/SpotSceneDirector.java | 4 ++-- .../com/threerings/whirled/spot/client/SpotService.java | 7 ++++--- .../com/threerings/whirled/spot/server/SpotProvider.java | 6 +++--- .../threerings/whirled/spot/server/SpotSceneManager.java | 4 ++-- 9 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index 09a1938f0..f3e7cf14c 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -1,5 +1,5 @@ // -// $Id: ChatDirector.java,v 1.26 2002/07/22 22:26:26 ray Exp $ +// $Id: ChatDirector.java,v 1.27 2002/07/22 22:54:03 ray Exp $ package com.threerings.crowd.chat; @@ -351,18 +351,19 @@ public class ChatDirector } String bundle = null; - String message, mode; + String message; + byte mode; // determine whether this speak message originated from another // client or from a server entity if (args.length == 3) { message = (String)args[1]; - mode = (String) args[2]; + mode = ((Byte) args[2]).byteValue(); } else { bundle = (String)args[1]; message = (String)args[2]; - mode = (String) args[3]; + mode = ((Byte) args[3]).byteValue(); } // pass this on to our chat displays diff --git a/src/java/com/threerings/crowd/chat/client/ChatDisplay.java b/src/java/com/threerings/crowd/chat/client/ChatDisplay.java index 79c984dbd..49bfd353a 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDisplay.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDisplay.java @@ -1,5 +1,5 @@ // -// $Id: ChatDisplay.java,v 1.11 2002/07/22 22:26:26 ray Exp $ +// $Id: ChatDisplay.java,v 1.12 2002/07/22 22:54:03 ray Exp $ package com.threerings.crowd.chat; @@ -33,7 +33,7 @@ public interface ChatDisplay */ public void displaySpeakMessage ( String type, String speaker, String bundle, String message, - String mode); + byte mode); /** * Called to display a tell message. A tell message is one that is diff --git a/src/java/com/threerings/crowd/chat/data/ChatCodes.java b/src/java/com/threerings/crowd/chat/data/ChatCodes.java index 94489c73a..1a7519e2e 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatCodes.java +++ b/src/java/com/threerings/crowd/chat/data/ChatCodes.java @@ -1,5 +1,5 @@ // -// $Id: ChatCodes.java,v 1.8 2002/07/22 22:26:26 ray Exp $ +// $Id: ChatCodes.java,v 1.9 2002/07/22 22:54:03 ray Exp $ package com.threerings.crowd.chat; @@ -46,15 +46,15 @@ public interface ChatCodes extends InvocationCodes public static final String TELL_NOTIFICATION = "Tell"; /** The default mode used by speak requests. */ - public static final String DEFAULT_MODE = "default"; + public static final byte DEFAULT_MODE = 0; /** The think mode to indicate that the user is thinking * what they're saying, or is it that they're saying what they're * thinking? */ - public static final String THINK_MODE = "think"; + public static final byte THINK_MODE = 1; /** The mode to indicate that a speak is actually an emote. */ - public static final String EMOTE_MODE = "emote"; + public static final byte EMOTE_MODE = 2; /** An error code delivered when the user targeted for a tell * notification is not online. */ diff --git a/src/java/com/threerings/crowd/chat/server/ChatProvider.java b/src/java/com/threerings/crowd/chat/server/ChatProvider.java index 47c7c1fa6..8c5f914ed 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatProvider.java +++ b/src/java/com/threerings/crowd/chat/server/ChatProvider.java @@ -1,5 +1,5 @@ // -// $Id: ChatProvider.java,v 1.11 2002/07/22 22:26:26 ray Exp $ +// $Id: ChatProvider.java,v 1.12 2002/07/22 22:54:03 ray Exp $ package com.threerings.crowd.chat; @@ -106,13 +106,13 @@ public class ChatProvider */ public static void sendChatMessage ( int placeOid, String speaker, String bundle, String message, - String mode) + byte mode) { Object[] outargs = null; if (bundle == null) { - outargs = new Object[] { speaker, message, mode }; + outargs = new Object[] { speaker, message, new Byte(mode) }; } else { - outargs = new Object[] { speaker, bundle, message, mode }; + outargs = new Object[] { speaker, bundle, message, new Byte(mode) }; } MessageEvent nevt = new MessageEvent( placeOid, ChatService.SPEAK_NOTIFICATION, outargs); diff --git a/src/java/com/threerings/micasa/client/ChatPanel.java b/src/java/com/threerings/micasa/client/ChatPanel.java index 88291ffc5..41c612073 100644 --- a/src/java/com/threerings/micasa/client/ChatPanel.java +++ b/src/java/com/threerings/micasa/client/ChatPanel.java @@ -1,5 +1,5 @@ // -// $Id: ChatPanel.java,v 1.16 2002/07/22 22:26:26 ray Exp $ +// $Id: ChatPanel.java,v 1.17 2002/07/22 22:54:04 ray Exp $ package com.threerings.micasa.client; @@ -226,7 +226,7 @@ public class ChatPanel // documentation inherited public void displaySpeakMessage ( - String type, String speaker, String bundle, String message, String mode) + String type, String speaker, String bundle, String message, byte mode) { // wrap the speaker in brackets speaker = "<" + speaker + "> "; diff --git a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java index b15bc673d..9c9316d43 100644 --- a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java +++ b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java @@ -1,5 +1,5 @@ // -// $Id: SpotSceneDirector.java,v 1.15 2002/07/22 22:26:26 ray Exp $ +// $Id: SpotSceneDirector.java,v 1.16 2002/07/22 22:54:04 ray Exp $ package com.threerings.whirled.spot.client; @@ -217,7 +217,7 @@ public class SpotSceneDirector * @return true if a cluster speak message was delivered, false if we * are not in a valid cluster and refused to deliver the request. */ - public boolean requestClusterSpeak (String message, String mode) + public boolean requestClusterSpeak (String message, byte mode) { // make sure we're currently in a scene DisplaySpotScene scene = (DisplaySpotScene)_scdir.getScene(); diff --git a/src/java/com/threerings/whirled/spot/client/SpotService.java b/src/java/com/threerings/whirled/spot/client/SpotService.java index 38849e04f..efc5d2c03 100644 --- a/src/java/com/threerings/whirled/spot/client/SpotService.java +++ b/src/java/com/threerings/whirled/spot/client/SpotService.java @@ -1,5 +1,5 @@ // -// $Id: SpotService.java,v 1.9 2002/07/22 22:26:26 ray Exp $ +// $Id: SpotService.java,v 1.10 2002/07/22 22:54:04 ray Exp $ package com.threerings.whirled.spot.client; @@ -56,11 +56,12 @@ public class SpotService implements SpotCodes */ public static void clusterSpeak ( Client client, int sceneId, int locationId, String message, - String mode, SpotSceneDirector rsptarget) + byte mode, SpotSceneDirector rsptarget) { InvocationDirector invdir = client.getInvocationDirector(); Object[] args = new Object[] { - new Integer(sceneId), new Integer(locationId), message, mode }; + new Integer(sceneId), new Integer(locationId), message, + new Byte(mode) }; invdir.invoke(MODULE_NAME, CLUSTER_SPEAK_REQUEST, args, rsptarget); Log.debug("Sent clusterSpeak request [sceneId=" + sceneId + ", locId=" + locationId + ", message=" + message + "]."); diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java index 383d46c1c..782862789 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java +++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java @@ -1,5 +1,5 @@ // -// $Id: SpotProvider.java,v 1.11 2002/07/22 22:26:26 ray Exp $ +// $Id: SpotProvider.java,v 1.12 2002/07/22 22:54:04 ray Exp $ package com.threerings.whirled.spot.server; @@ -195,7 +195,7 @@ public class SpotProvider extends InvocationProvider */ public void handleClusterSpeakRequest ( BodyObject source, int invid, int sceneId, int locId, String message, - String mode) + byte mode) { sendClusterChatMessage(sceneId, locId, source.getOid(), source.username, null, message, mode); @@ -222,7 +222,7 @@ public class SpotProvider extends InvocationProvider */ public static void sendClusterChatMessage ( int sceneId, int locId, int speakerOid, String speaker, - String bundle, String message, String mode) + String bundle, String message, byte mode) { // look up the scene manager for the specified scene SpotSceneManager smgr = (SpotSceneManager) diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index 7bdf987ac..b17ab1362 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java @@ -1,5 +1,5 @@ // -// $Id: SpotSceneManager.java,v 1.14 2002/07/22 22:26:26 ray Exp $ +// $Id: SpotSceneManager.java,v 1.15 2002/07/22 22:54:04 ray Exp $ package com.threerings.whirled.spot.server; @@ -218,7 +218,7 @@ public class SpotSceneManager extends SceneManager */ protected void handleClusterSpeakRequest ( int sourceOid, String source, int locationId, - String bundle, String message, String mode) + String bundle, String message, byte mode) { // make sure this user occupies the specified location int locidx = _sscene.getLocationIndex(locationId);