This logic is twisty.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1024 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-10-14 17:46:58 +00:00
parent 471c7e9c29
commit 6eab62a3bd
1 changed files with 5 additions and 1 deletions
@@ -727,10 +727,14 @@ public class SubtitleChatOverlay extends ChatOverlay

        } else if (message instanceof UserMessage) {
            int type = _logic.decodeType(localtype);
-            // factor in the mode
            if (type != 0) {
+                // factor in the mode
                type = _logic.adjustTypeByMode(((UserMessage) message).mode, type);
+                if (type != 0) {
+                    return type;
+                }
            }
+
            // if we're showing from history, include specialized chat messages
            if (history) {
                return ChatLogic.SPECIALIZED;