psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

not ready to say bye bye to USE_THE_NICK

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-03-07 18:00:39 +01:00
parent 1b9b468ecf
commit 40adfaea01
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
world/net/include/net.h
View file

@ -220,9 +220,6 @@
# define NEW_UNLINK
# define NEW_RENDER
# define MUCSUC
#else
// the old nick code seems to introduce the remote-part bug
# define USE_THE_NICK
#endif
#define GAMMA // code that has left BETA and is in production use
@ -241,6 +238,9 @@
# define HTFORWARD // let person entity buffer output for http usage
# endif
#else
// the old nick code seems to introduce the remote-part bug
// but if we don't use it, psyced will render [_nick] wrong in many places
# define USE_THE_NICK
//# define PRE_SPEC // things that changed during the spec process
//# ifndef __PIKE__
//# define USE_LIVING

8
world/net/library/text.c
View file

@ -73,7 +73,7 @@ varargs string psyctext(string s, mapping m, vastring data,
break;
case "_source":
// should this support _source_relay? var inheritance!
#ifdef USE_THE_NICK
#ifdef USE_THE_NICK_TOO_MUCH
r += p + (nick || m["_nick"] || m["_source"]
|| UNIFORM(source) || "?");
#else
@ -84,7 +84,7 @@ varargs string psyctext(string s, mapping m, vastring data,
#endif
break;
case "_source_relay":
#ifdef USE_THE_NICK
#ifdef USE_THE_NICK_TOO_MUCH
r += p + (nick || m["_nick"] || m["_source_relay"] || "?");
#else
q = m["_source_relay"] || "?";
@ -94,7 +94,7 @@ varargs string psyctext(string s, mapping m, vastring data,
#endif
break;
case "_target":
#ifdef USE_THE_NICK
#ifdef USE_THE_NICK_TOO_MUCH
r += p + (m["_nick_target"] || m["_target"] || "?");
#else
q = m["_target"] || "?";
@ -104,7 +104,7 @@ varargs string psyctext(string s, mapping m, vastring data,
#endif
break;
case "_context":
#ifdef USE_THE_NICK
#ifdef USE_THE_NICK_TOO_MUCH
r += p + (m["_nick_place"] || m["_context"] || "?");
#else
q = m["_context"] || "?";