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

disable /set multiplace by default

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-02-26 13:34:36 +01:00
parent 835ac32127
commit 50c6529a85
5 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
world/net/place/archetype.gen
View file

@ -1135,8 +1135,8 @@ P1(("ident: %O is really %O\n", t, source))
return;
}
if (abbrev("_request", mc)) {
// needs a rewrite into a switch()
// mc inheritance should be handled at parsing time, not here
// needs a rewrite into a try-and-slice switch()
// or shouldn't this stuff just move into the signature table?
if (abbrev("_request_enter", mc)
|| abbrev("_request_leave", mc)
|| abbrev("_request_invitation", mc)) {

22
world/net/usercmd.i
View file

@ -793,21 +793,24 @@ cmd(a, args, dest, command) {
]));
w("_echo_end_places_entered");
break;
#ifdef _flag_enable_place_single
# define STAY v("multiplace")
#else
# define STAY 1
#endif
case "change":
//se "channel":
case "ch":
case "c":
if (sizeof(args) < 2) {
if (v("lastplace") && v("lastplace") != NICKPLACE)
teleport(v("lastplace"), "_other",
0, v("multiplace"));
teleport(v("lastplace"), "_other", 0, STAY);
else
w("_error_unavailable_place_other",
"You haven't entered any other room yet.");
break;
}
teleport(args[1], 0, 0 , v("multiplace"));
// , sizeof(args) > 2 ? ARGS(2) : 0
teleport(args[1], 0, 0, STAY);
break;
case "go":
if (sizeof(args) < 2) {
@ -815,7 +818,6 @@ cmd(a, args, dest, command) {
break;
}
teleport(args[1]);
// , sizeof(args) > 2 ? ARGS(2) : 0
break;
case "f":
case "follow":
@ -825,7 +827,7 @@ cmd(a, args, dest, command) {
return;
}
if (v("otherplace")) {
teleport(v("otherplace"), "_other", 0, v("multiplace"));
teleport(v("otherplace"), "_other", 0, STAY);
vDel("otherplace");
return;
}
@ -835,8 +837,7 @@ cmd(a, args, dest, command) {
case "h":
case "ho":
case "home":
teleport(v("home") || DEFPLACE, "_home", 0, v("multiplace"));
// ARGS(1)
teleport(v("home") || DEFPLACE, "_home", 0, STAY);
break;
#ifndef _flag_disable_place_enter_automatic
case "subscribe":
@ -2602,7 +2603,10 @@ checkVar(key, value) {
#ifndef NO_CTCP_PRESENCE
case "ctcppresence": // just for irc users really..
#endif
case "multiplace": // toggle settings with negative default
#ifdef _flag_enable_place_single
case "multiplace":
#endif
// toggle settings with negative default
if (value == "off" || value == "-") value = "-";
else if (value) value = "on";
break;