From 6b8e138eb4c31b8435377f07a8c2fd6203a8409a Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Wed, 19 Jan 2011 15:37:08 +0100
Subject: [PATCH] _error_status_person_connected

---
 world/default/de/plain.textdb | 2 +-
 world/default/en/plain.textdb | 2 +-
 world/net/common.c            | 4 +---
 world/net/library.i           | 4 ++++
 world/net/person.c            | 4 +++-
 world/net/server.c            | 3 +--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/world/default/de/plain.textdb b/world/default/de/plain.textdb
index 2a38bba..53beaa7 100644
--- a/world/default/de/plain.textdb
+++ b/world/default/de/plain.textdb
@@ -692,7 +692,7 @@ _error_status_place_chosen
 |Du bist bereits in einem Raum.
 
 _error_status_person_connected
-|Tut mir Leid, aber %O ist schon da. Wählen Sie bitte einen anderen Namen.
+|Tut mir Leid, aber [_nick] ist schon da. Wählen Sie bitte einen anderen Namen.
 
 _error_status_person_display_none
 |Das geht nicht. Du musst zuerst aufhören [_nick_target] zu ignorieren.
diff --git a/world/default/en/plain.textdb b/world/default/en/plain.textdb
index 389fc24..f76e02c 100644
--- a/world/default/en/plain.textdb
+++ b/world/default/en/plain.textdb
@@ -635,7 +635,7 @@ _error_rejected_query_location
 |You're currently not permitted to request the location.
 
 _error_status_person_connected
-|This person is already connected.
+|Sorry. [_nick] is already connected. Please pick a different name.
 
 _failure_filter_strangers
 |[_nick] has not enabled messages from strangers.
diff --git a/world/net/common.c b/world/net/common.c
index 483b188..c52112b 100644
--- a/world/net/common.c
+++ b/world/net/common.c
@@ -43,9 +43,7 @@ connect(nick, pw) {
 		    return;
 		} 
 		if (user->online() && user->vQuery("ip") != query_ip_number()) {
-		    w("_error_status_person_connected",
-		      "Sorry. [_nick] is already here.\
-		      Please pick a different name.",
+		    w("_error_status_person_connected", 0,
 		      ([ "_nick": nick ]) );
 		    return;
 		}
diff --git a/world/net/library.i b/world/net/library.i
index 28a9168..4ef7580 100644
--- a/world/net/library.i
+++ b/world/net/library.i
@@ -874,6 +874,10 @@ varargs mixed sendmsg(mixed target, string mc, mixed data, vamapping vars,
 				register_target(target, o);
 				o -> msg(source, mc, data, vars);
 				return 3;
+#endif
+#ifdef RTMP_PATH
+                        case "rtmp":
+                                return 0;  // unreachable
 #endif
 			}
 			if (schemes[u[UScheme]])
diff --git a/world/net/person.c b/world/net/person.c
index 53af51c..09c9e5c 100644
--- a/world/net/person.c
+++ b/world/net/person.c
@@ -1037,6 +1037,7 @@ case "_request_location":
 			return 0;
 case "_request_link":
 case "_set_password":
+			PT(("_request_link for %O\n", ME))
 	// TODO: shouldn't we use some kind of observer pattern on the
 	// 	current_interactive to become aware of disconnects?
 	// 	at least if the current interactive is not a server2server
@@ -1067,7 +1068,8 @@ case "_set_password":
 						// we are a newbie. reject the
 						// kick-out request.
 						sendmsg(source,
-						    "_error_status_person_connected");
+						    "_error_status_person_connected", 0,
+						    ([ "_nick": MYNICK ]));
 						return 0;
 					}
 					// we are a legitimate new client.
diff --git a/world/net/server.c b/world/net/server.c
index 0e2a630..324bb11 100644
--- a/world/net/server.c
+++ b/world/net/server.c
@@ -164,8 +164,7 @@ authChecked(int result, ni, try, elm) {
             && user->vQuery("ip") != query_ip_number()
 #endif
             ) {
-		pr("_error_status_person_connected",
-		    "Sorry. %O is already connected.\n", nick);
+		w("_error_status_person_connected", 0, ([ "_nick": nick ]) );
 		QUIT
 	}
 #endif