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

Updates to reflect SpeakProvider refactoring.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@395 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2007-07-31 21:05:36 +00:00
parent 8233be01e7
commit 09ad0ca87d
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/game/server/GameManager.java
+3 -4
View File
@@ -39,7 +39,7 @@ import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.MessageEvent; import com.threerings.presents.dobj.MessageEvent;
import com.threerings.crowd.chat.server.SpeakProvider; import com.threerings.crowd.chat.server.SpeakUtil;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.data.PlaceObject;
@@ -391,8 +391,7 @@ public class GameManager extends PlaceManager
* *
* @param waitForStart if true, the message will not be sent until the game has started. * @param waitForStart if true, the message will not be sent until the game has started.
*/ */
public void systemMessage ( public void systemMessage (String msgbundle, String msg, boolean waitForStart)
String msgbundle, String msg, boolean waitForStart)
{ {
if (waitForStart && ((_gameobj == null) || (_gameobj.state == GameObject.PRE_GAME))) { if (waitForStart && ((_gameobj == null) || (_gameobj.state == GameObject.PRE_GAME))) {
// queue up the message. // queue up the message.
@@ -404,7 +403,7 @@ public class GameManager extends PlaceManager
} }
// otherwise, just deliver the message // otherwise, just deliver the message
SpeakProvider.sendInfo(_gameobj, msgbundle, msg); SpeakUtil.sendInfo(_gameobj, msgbundle, msg);
} }
/** /**
src/java/com/threerings/whirled/spot/server/SpotProvider.java
+2 -2
View File
@@ -32,7 +32,7 @@ import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider; import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.chat.server.SpeakProvider; import com.threerings.crowd.chat.server.SpeakUtil;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.server.PlaceRegistry; import com.threerings.crowd.server.PlaceRegistry;
@@ -182,7 +182,7 @@ public class SpotProvider
BodyObject source = (BodyObject)caller; BodyObject source = (BodyObject)caller;
String errmsg = source.checkAccess(ChatCodes.CHAT_ACCESS, null); String errmsg = source.checkAccess(ChatCodes.CHAT_ACCESS, null);
if (errmsg != null) { if (errmsg != null) {
SpeakProvider.sendFeedback(source, MessageManager.GLOBAL_BUNDLE, errmsg); SpeakUtil.sendFeedback(source, MessageManager.GLOBAL_BUNDLE, errmsg);
} else { } else {
sendClusterChatMessage(ScenePlace.getSceneId(source), source.getOid(), sendClusterChatMessage(ScenePlace.getSceneId(source), source.getOid(),
source.getVisibleName(), null, message, mode); source.getVisibleName(), null, message, mode);
src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+2 -2
View File
@@ -32,7 +32,7 @@ import com.threerings.presents.dobj.Subscriber;
import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.ObjectAccessException;
import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationException;
import com.threerings.crowd.chat.server.SpeakProvider; import com.threerings.crowd.chat.server.SpeakUtil;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo; import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.server.CrowdServer; import com.threerings.crowd.server.CrowdServer;
@@ -393,7 +393,7 @@ public class SpotSceneManager extends SceneManager
Log.warning("Non-clustered user requested cluster speak [where=" + where() + Log.warning("Non-clustered user requested cluster speak [where=" + where() +
", chatter=" + source + " (" + sourceOid + "), msg=" + message + "]."); ", chatter=" + source + " (" + sourceOid + "), msg=" + message + "].");
} else { } else {
SpeakProvider.sendSpeak(clrec.getClusterObject(), source, bundle, message, mode); SpeakUtil.sendSpeak(clrec.getClusterObject(), source, bundle, message, mode);
} }
} }