From 8de11561ac36f31c647cc42a80cd628900df46cc Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 3 Dec 2003 23:38:45 +0000 Subject: [PATCH] Out with XLATE_MODES which Narya doesn't use; and make sure it's a default message received on the user object that we consider to be a tell. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2889 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/crowd/chat/client/ChatDirector.java | 8 +++++--- src/java/com/threerings/crowd/chat/data/ChatCodes.java | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index d8ec45ed7..2b2409aed 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.55 2003/11/24 17:53:11 mdb Exp $ +// $Id: ChatDirector.java,v 1.56 2003/12/03 23:38:45 mdb Exp $ package com.threerings.crowd.chat.client; @@ -501,12 +501,14 @@ public class ChatDirector extends BasicDirector // if the message came from a user, make sure we want to hear it if (msg instanceof UserMessage) { - String speaker = ((UserMessage) msg).speaker; + UserMessage umsg = (UserMessage)msg; + String speaker = umsg.speaker; message = filter(message, speaker, false); if (message == null) { return; - } else if (USER_CHAT_TYPE.equals(localtype)) { + } else if (USER_CHAT_TYPE.equals(localtype) && + umsg.mode == ChatCodes.DEFAULT_MODE) { // if it was a tell, add the speaker as a chatter addChatter(speaker); diff --git a/src/java/com/threerings/crowd/chat/data/ChatCodes.java b/src/java/com/threerings/crowd/chat/data/ChatCodes.java index 61ae6f136..d8a4248e7 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.18 2003/11/24 17:53:11 mdb Exp $ +// $Id: ChatCodes.java,v 1.19 2003/12/03 23:38:45 mdb Exp $ package com.threerings.crowd.chat.data; @@ -49,10 +49,6 @@ public interface ChatCodes extends InvocationCodes * actually a server-wide broadcast. */ public static final byte BROADCAST_MODE = 4; - /** String translations for the various chat modes. */ - public static final String[] XLATE_MODES = { - "default", "think", "emote", "shout", "broadcast" }; - /** An error code delivered when the user targeted for a tell * notification is not online. */ public static final String USER_NOT_ONLINE = "m.user_not_online";