Merge remote-tracking branch 'origin'

CHANGESTODO

@@ -30,10 +30,6 @@ ________________________________________________________________________
 	ERQ could not resolve "symlynX".
 	(it tries to resolve the irc:nick)
 
-- psyced's memory of places joined is weird -- and neither the default
-  place from psyced.ini, nor the autojoin rooms in the irc client seem
-  to make a difference
-
 - "invalid context" errors happen where local rooms send _context
   as string uniform while local users expect the object pointer. huh?
 
@@ -3938,3 +3934,10 @@ edit.i	now renamed into render.i because it renders psyc packets
 === 201105 ============================================================
 net/spyc net/psyc
 	tg added support for libpsyc aka PSYC syntax according to spec!
+=== 2013, 2014 ========================================================
+	various "onion" mods to support Tor hidden services
+	psyc federation over tor would however require further work
+	(and still doesn't address the many problems of federation)
+=== 201509 ============================================================
+-	fixed autojoin bug for psyc, telnet and webchat users
+

world/drivers/ldmud/master/accept.c

@@ -22,7 +22,7 @@
 #else
 # define AUTODETECT 0
 # ifdef SPYC_PATH
-#  echo PSYC 1.0 will not work: libpsyc is not enabled in driver.
+#  echo libpsyc is not enabled in driver. Using old protocol parser instead.
 # endif
 #endif
 

world/net/lastlog.c

@@ -82,7 +82,7 @@ logClip(maxlen, cutlen) {
 // TODO: logView *since* timestamp. see also user.c:disconnected()
 //
 // uh. vim lpc syntax file doesn't like default in variablenames. renamed.
-logView(a, showingLog, defAmount) {
+logView(a, showingLog, defAmount, offset) {
 	string grep;
 	int i, ll;
 
@@ -141,6 +141,9 @@ logView(a, showingLog, defAmount) {
 	P4(("\n%O :logView: %O\n", ME, _log))
 	unless (ll) ll = defAmount || 15;
 	ll *= 4;
+	/* FIXME: here's where the _offset parameter needs to be considered
+	 *	  but let's see if ryuka is serious about wanting to use this  ;)
+	 */
 	if (sizeof(_log) < ll) {
 		ll = sizeof(_log);
 		i = 0;

world/net/place/archetype.gen

@@ -2470,7 +2470,7 @@ _request_history(source, mc, data, vars, b) {
 #  endif
 # endif
 	logView(vars["_match"] || vars["_parameter"] || vars["_amount"],
-	    source);
+	    source, 0, vars["_offset"]);
 	sendmsg(source, "_echo_history"); // indicate end of history
 	return 1;
 }