netsize()

CHANGESTODO

@@ -3926,3 +3926,5 @@ net/person
 === 201101 ============================================================
 *	removed interesting but unrecoverable FORK code
 *	unlink detection rewrite and other fixes in client linking code
+edit.i	now renamed into render.i because it renders psyc packets
+

world/default/de/plain.textdb

@@ -1005,6 +1005,9 @@ _notice_place_invitation
 _notice_place_enter
 |[_nick] betritt [_nick_place].
 
+_notice_place_enter_relinked
+|## request for no output
+
 _notice_place_masquerade
 |[_nick_local] ist eigentlich [_nick] in Verkleidung.
 

world/net/place/archetype.gen

@@ -2138,7 +2138,7 @@ names() { return m_values(_u); }	// used by irc/user, applet/user
 					// place/owned and place/storic
 objects() { return m_indices(_u); }	// used by place/owned
 
-size() { return sizeof(_u); }		// who needs this!?
+size() { return sizeof(_u); }		// netsize() uses this
 
 // this is overridden in more complex rooms to provide continous status output
 memberInfo() { return _u; }		// used by showRoom() in http/user

world/net/place/master.c

@@ -334,4 +334,7 @@ mixed isValidRelay(mixed x) { return x == ME || member(l, x); }
 
 #else
 # include "storic.c"
+
+// with cslaves we no longer keep extra track of "netppl"
+netsize() { return size(); }
 #endif

world/net/psyc/render.i

@@ -157,8 +157,10 @@ static varargs string psyc_render(mixed source, string mc, mixed data,
 		else {
 			data = T(mc, "") || "";
 			P3(("edit: fmt from textdb for %O: %O\n", mc, data))
+# ifndef NEW_LINE
 			if (strlen(data) && char_from_end(data, 1) == '\n')
 			    excessiveNewline = 1;
+# endif
 		}
 #else
 		PT(("non-string data: %O\n", data))