From ad482ece4496adac12fef29e7fc313cb9f001d12 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Wed, 28 Jan 2009 14:09:36 +0100 Subject: [PATCH] look at what the cat brought in --- world/net/library/share.c | 5 ++++- world/net/place/archetype.gen | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/world/net/library/share.c b/world/net/library/share.c index 5d41009..a3845bb 100644 --- a/world/net/library/share.c +++ b/world/net/library/share.c @@ -135,7 +135,7 @@ volatile mapping share = ([ ]), #endif // this table defines variable names to go into the routing layer - // of PSYC. default is to handle them locally in the routing layer + // of PSYC. default is to handle them locally in the routing layer. // PSYC_ROUTING_MERGE means to merge them into end-to-end vars at // parsing time. PSYC_ROUTING_RENDER to accept and render them from // application provided vars. same data structure also in Net::PSYC.pm @@ -143,6 +143,9 @@ volatile mapping share = ([ "_amount_fragments" : PSYC_ROUTING, "_context" : PSYC_ROUTING + PSYC_ROUTING_MERGE, "_count" : PSYC_ROUTING + PSYC_ROUTING_MERGE, + // the name for this is supposed to be _count, not _counter + // this is brought in by ppp - let's ignore it for now + "_counter" : PSYC_ROUTING, // don't merge, don't render.. "_fragment" : PSYC_ROUTING, "_length" : PSYC_ROUTING, "_source" : PSYC_ROUTING + PSYC_ROUTING_MERGE, diff --git a/world/net/place/archetype.gen b/world/net/place/archetype.gen index cbba747..76b2a84 100644 --- a/world/net/place/archetype.gen +++ b/world/net/place/archetype.gen @@ -775,6 +775,7 @@ insert_member(source, mc, data, vars, ni, neu, again) { // semantically it looks ok mc = "_echo" + mc[7..]; //if (v("_filter_conversation")) mc += "_filtered"; + m_delete(vars, "_group"); // why are we merging vars from a _do anyway? sendmsg(source, mc, data, vars); // ensure that a client knows this room has been entered // before any room details like topic etc. are sent