# Patch name: No Pueblo # Patch version: 1.0 # Author's name: Noltar uth Mormadar # Author's email: noltar@korongil.org # Version of PennMUSH: 1.7.5p7 # Date patch made: Sat Jun 8 22:55:01 EDT 2002 # Author is willing to support (yes/no): yes # Patch format: Context # # # This is a contributed PennMUSH patch. Its use is subject to the # same restrictions found in PennMUSH's hdrs/copyrite.h file. # # No warranty is given for this patch. It is not necessarily going # to work on your system, with any version of PennMUSH other than # the one above, etc. # # If the author given above was willing to support the patch, you # should write to the author if you have any questions or problems. Do # *NOT* send email messages to Javelin or any PennMUSH mailing list about # this patch! # # Below this line is the author's description of the patch, # followed by the patch itself. If the patch is in context diff # format, you'll probably apply it by typing: patch < patchfile # in your top-level MUSH directory, unless instructed otherwise # below. # # A patch to remove Pueblo from Pennmush 1.7.5p7 # *** ../pennmush-clean/src/Makefile Sat Jun 8 18:06:15 2002 --- src/Makefile Sat Jun 8 22:09:39 2002 *************** *** 333,339 **** bsd.o: ../hdrs/help.h bsd.o: ../hdrs/match.h bsd.o: ../hdrs/ansi.h - bsd.o: ../hdrs/pueblo.h bsd.o: ../hdrs/parse.h bsd.o: ../hdrs/access.h bsd.o: ../hdrs/version.h --- 333,338 ---- *************** *** 428,434 **** conf.o: ../hdrs/mushtype.h conf.o: ../hdrs/externs.h conf.o: ../confmagic.h - conf.o: ../hdrs/pueblo.h conf.o: ../hdrs/mushdb.h conf.o: ../hdrs/parse.h conf.o: ../hdrs/command.h --- 427,432 ---- *************** *** 523,529 **** extchat.o: ../hdrs/ansi.h extchat.o: ../hdrs/privtab.h extchat.o: ../hdrs/mymalloc.h - extchat.o: ../hdrs/pueblo.h extchat.o: ../hdrs/parse.h extchat.o: ../hdrs/lock.h extchat.o: ../hdrs/boolexp.h --- 521,526 ---- *************** *** 545,551 **** extmail.o: ../hdrs/attrib.h extmail.o: ../hdrs/parse.h extmail.o: ../hdrs/mymalloc.h - extmail.o: ../hdrs/pueblo.h extmail.o: ../hdrs/flags.h extmail.o: ../hdrs/log.h extmail.o: ../hdrs/lock.h --- 542,547 ---- *************** *** 676,682 **** funstr.o: ../hdrs/case.h funstr.o: ../hdrs/match.h funstr.o: ../hdrs/parse.h - funstr.o: ../hdrs/pueblo.h funstr.o: ../hdrs/attrib.h funstr.o: ../hdrs/flags.h funstr.o: ../hdrs/dbdefs.h --- 672,677 ---- *************** *** 751,757 **** help.o: ../hdrs/help.h help.o: ../hdrs/log.h help.o: ../hdrs/ansi.h - help.o: ../hdrs/pueblo.h help.o: ../hdrs/flags.h help.o: ../hdrs/dbdefs.h help.o: ../hdrs/mymalloc.h --- 746,751 ---- *************** *** 833,839 **** look.o: ../hdrs/externs.h look.o: ../confmagic.h look.o: ../hdrs/ansi.h - look.o: ../hdrs/pueblo.h look.o: ../hdrs/extchat.h look.o: ../hdrs/game.h look.o: ../hdrs/parse.h --- 827,832 ---- *************** *** 870,876 **** malias.o: ../hdrs/privtab.h malias.o: ../hdrs/mymalloc.h malias.o: ../hdrs/flags.h - malias.o: ../hdrs/pueblo.h malias.o: ../hdrs/log.h match.o: ../hdrs/copyrite.h match.o: ../config.h --- 863,868 ---- *************** *** 1078,1084 **** strutil.o: ../hdrs/mushtype.h strutil.o: ../hdrs/case.h strutil.o: ../hdrs/ansi.h - strutil.o: ../hdrs/pueblo.h strutil.o: ../hdrs/parse.h strutil.o: ../confmagic.h strutil.o: ../hdrs/externs.h --- 1070,1075 ---- *************** *** 1109,1115 **** unparse.o: ../confmagic.h unparse.o: ../hdrs/attrib.h unparse.o: ../hdrs/ansi.h - unparse.o: ../hdrs/pueblo.h unparse.o: ../hdrs/parse.h utils.o: ../hdrs/copyrite.h utils.o: ../config.h --- 1100,1105 ---- *** ../pennmush-clean/src/bsd.c Sat Jun 8 18:06:15 2002 --- src/bsd.c Sat Jun 8 22:41:26 2002 *************** *** 92,98 **** #include "help.h" #include "match.h" #include "ansi.h" - #include "pueblo.h" #include "parse.h" #include "access.h" #include "version.h" --- 92,97 ---- *************** *** 871,884 **** NA_ASCII = 0, NA_ANSI, /* ANSI flag */ NA_COLOR, /* ANSI and COLOR flags */ - NA_PUEBLO, /* html */ NA_PASCII, /* Player without any of the above */ NA_TANSI, /* Like above with telnet-aware client */ NA_TCOLOR, /* Like above with telnet-aware client */ NA_TPASCII, /* Like above with telnet-aware client */ NA_NANSI, /* ANSI and NOACCENTS */ NA_NCOLOR, /* ANSI, COLOR, NOACCENTS */ - NA_NPUEBLO, /* html & NOACCENTS */ NA_NPASCII /* 11. NOACCENTS */ }; #define TA_BGC 0 --- 870,881 ---- *************** *** 1018,1035 **** #undef add_ansi_if - int html_cols[] = { - 0xC0C0C0, /* Default */ - 0x000000, - 0xC00000, - 0x00C000, - 0xC0C000, - 0x0000C0, - 0xC000C0, - 0x00C0C0, - 0xC0C0C0 - }; - static void zero_strings(struct notify_strings messages[]) { --- 1015,1020 ---- *************** *** 1059,1071 **** char *t; int state[6] = { 0, 0, 0, 0, 0, 0 }; int newstate[6] = { 0, 0, 0, 0, 0, 0 }; - int n; - int b, f; int changed = 0; int color = 0; int strip = 0; - int fc, bc; - char colbuff[128]; static char tbuf[BUFFER_LEN]; if (messages[type].made) --- 1044,1052 ---- *************** *** 1081,1090 **** case NA_ASCII: while (*p) { switch (*p) { - case TAG_START: - while (*p && *p != TAG_END) - p++; - break; case '\r': case BEEP_CHAR: break; --- 1062,1067 ---- *************** *** 1118,1127 **** else safe_chr(IAC, t, &o); break; - case TAG_START: - while (*p && *p != TAG_END) - p++; - break; case ESC_CHAR: while (*p && *p != 'm') p++; --- 1095,1100 ---- *************** *** 1144,1278 **** messages[type].len = o - tbuf; return messages[type].message; - case NA_NPUEBLO: - strip = 1; - case NA_PUEBLO: - while (*p) { - if (*p == ESC_CHAR) { - fillstate(newstate, &p); - changed = 1; - } else { - if (changed) { - changed = 0; - /* Do we need to close any attribute tags? */ - if (state[TA_BOLD] && !newstate[TA_BOLD]) - safe_str("", t, &o); - if (state[TA_ULINE] && !newstate[TA_ULINE]) - safe_str("", t, &o); - /* Are we going to start a new font? If so, temporarily - * close attribute tags */ - if (!state[TA_BGC] && !state[TA_FGC] && - (newstate[TA_FGC] || newstate[TA_FGC])) { - if (state[TA_BOLD] && newstate[TA_BOLD]) - safe_str("", t, &o); - if (state[TA_ULINE] && newstate[TA_ULINE]) - safe_str("", t, &o); - } - /* Are we changing fonts? If so, close the FONT tag and - any attribute tags */ - if (((state[TA_BGC] || state[TA_FGC]) && - ((state[TA_BGC] != newstate[TA_BGC]) || - (state[TA_FGC] != newstate[TA_FGC]))) || - (state[TA_REV] != newstate[TA_REV])) { - /* If we're in bold, and staying bold, temporarily close the tag */ - if (state[TA_BOLD] && newstate[TA_BOLD]) - safe_str("", t, &o); - if (state[TA_ULINE] && newstate[TA_ULINE]) - safe_str("", t, &o); - safe_str("", t, &o); - } - /* Should we start a new FONT tag? */ - if ((newstate[TA_BGC] && (state[TA_BGC] != newstate[TA_BGC])) - || (newstate[TA_FGC] && (state[TA_FGC] != newstate[TA_FGC])) - || (newstate[TA_REV] && (state[TA_REV] != newstate[TA_REV])) - ) { - fc = newstate[TA_FGC]; - bc = newstate[TA_BGC]; - if (newstate[TA_REV]) { - if (!fc) - fc = 8; - if (!bc) - bc = 1; - f = html_cols[bc]; - b = html_cols[fc]; - } else { - f = html_cols[fc]; - b = html_cols[bc]; - } - if (bc && fc) { - sprintf(colbuff, "", f, b); - } else if (fc) { - sprintf(colbuff, "", f); - } else { - sprintf(colbuff, "", b); - } - safe_str(colbuff, t, &o); - /* Should we reopen attribute tags, too? */ - if (state[TA_BOLD] && newstate[TA_BOLD]) - safe_str("", t, &o); - if (state[TA_ULINE] && newstate[TA_ULINE]) - safe_str("", t, &o); - } - /* If we weren't bold before, or if we were bold+font and now - * are just bold, we reopen bold tag if we're going to be bold - */ - if ((!state[TA_BOLD] || (state[TA_BOLD] && (state[TA_FGC] || - state[TA_BGC]) - && !newstate[TA_FGC] && !newstate[TA_BGC])) - && newstate[TA_BOLD]) - safe_str("", t, &o); - if ((!state[TA_ULINE] || (state[TA_ULINE] && (state[TA_FGC] || - state[TA_BGC]) - && !newstate[TA_FGC] && !newstate[TA_BGC])) - && newstate[TA_ULINE]) - safe_str("", t, &o); - for (n = 0; n < 6; n++) - state[n] = newstate[n]; - } - switch (*p) { - case TAG_START: - safe_chr('<', t, &o); - p++; - while ((*p) && (*p != TAG_END)) { - safe_chr(*p, t, &o); - p++; - } - safe_chr('>', t, &o); - break; - case TAG_END: - /* Should never be seen alone */ - break; - case '\r': - break; - default: - if (strip) { - /* Even if we're NOACCENTS, we must still translate a few things */ - switch ((unsigned char) *p) { - case '\n': - case '&': - case '<': - case '>': - safe_str(accent_table[(unsigned char) *p].entity, t, &o); - break; - default: - safe_chr((char) accent_table[(unsigned char) *p].base, t, &o); - break; - } - } else if (accent_table[(unsigned char) *p].entity) - safe_str(accent_table[(unsigned char) *p].entity, t, &o); - else - safe_chr(*p, t, &o); - } - } - p++; - } - if (state[TA_BGC] || state[TA_FGC] || state[TA_REV]) - safe_str("", t, &o); - if (state[TA_BOLD]) - safe_str("", t, &o); - if (state[TA_ULINE]) - safe_str("", t, &o); - break; case NA_COLOR: case NA_TCOLOR: case NA_NCOLOR: --- 1117,1122 ---- *************** *** 1297,1306 **** else safe_chr(IAC, t, &o); break; - case TAG_START: - while (*p && *p != TAG_END) - p++; - break; case '\r': break; case '\n': --- 1141,1146 ---- *************** *** 1464,1476 **** for (; *p != '\0'; p++) { switch (*p) { - case TAG_START: - do { - p++; - } while (*p != '\0' && *p != TAG_END); - break; - case TAG_END: /* Just in case */ - break; default: n++; } --- 1304,1309 ---- *************** *** 1487,1495 **** if (!d->connected || IS(d->player, TYPE_PLAYER, PLAYER_NOACCENTS)) strip = 1; ! if (d->conn_flags & CONN_HTML) { ! poutput = strip ? NA_NPUEBLO : NA_PUEBLO; ! } else if (ShowAnsi(d->player)) { if (ShowAnsiColor(d->player)) { if (strip) poutput = NA_NCOLOR; --- 1320,1326 ---- if (!d->connected || IS(d->player, TYPE_PLAYER, PLAYER_NOACCENTS)) strip = 1; ! if (ShowAnsi(d->player)) { if (ShowAnsiColor(d->player)) { if (strip) poutput = NA_NCOLOR; *************** *** 1569,1575 **** if (d->connected && d->player == target) { poutput = notify_type(d); ! if ((flags & NA_PONLY) && (poutput != NA_PUEBLO)) continue; if (nsfunc && Nospoof(target) && (target != speaker)) { --- 1400,1406 ---- if (d->connected && d->player == target) { poutput = notify_type(d); ! if (flags & NA_PONLY) continue; if (nsfunc && Nospoof(target) && (target != speaker)) { *************** *** 1600,1613 **** queue_newwrite(d, pstring, plen); } if (!(flags & NA_NOENTER)) { ! if ((poutput == NA_PUEBLO) || (poutput == NA_NPUEBLO)) { ! if (flags & NA_NOPENTER) ! queue_newwrite(d, "\n", 1); ! else ! queue_newwrite(d, "
\n", 5); ! } else { ! queue_newwrite(d, "\r\n", 2); ! } } } } --- 1431,1437 ---- queue_newwrite(d, pstring, plen); } if (!(flags & NA_NOENTER)) { ! queue_newwrite(d, "\r\n", 2); } } } *************** *** 1745,1807 **** na_depth--; } - int - safe_tag(a_tag, buf, bp) - char const *a_tag; - char *buf; - char **bp; - { - int result = 0; - - if (SUPPORT_PUEBLO) { - result += safe_chr(TAG_START, buf, bp); - result += safe_str(a_tag, buf, bp); - result += safe_chr(TAG_END, buf, bp); - } - return result; - } - - int - safe_tag_cancel(a_tag, buf, bp) - char const *a_tag; - char *buf; - char **bp; - { - int result = 0; - if (SUPPORT_PUEBLO) { - result += safe_chr(TAG_START, buf, bp); - result += safe_chr('/', buf, bp); - result += safe_str(a_tag, buf, bp); - result += safe_chr(TAG_END, buf, bp); - } - return result; - } - - int - safe_tag_wrap(a_tag, params, data, buf, bp) - char const *a_tag; - char const *params; - char const *data; - char *buf; - char **bp; - { - int result = 0; - if (SUPPORT_PUEBLO) { - result += safe_chr(TAG_START, buf, bp); - result += safe_str(a_tag, buf, bp); - if (params && *params) { - result += safe_chr(' ', buf, bp); - result += safe_str(params, buf, bp); - } - result += safe_chr(TAG_END, buf, bp); - } - result += safe_str(data, buf, bp); - if (SUPPORT_PUEBLO) { - result += safe_tag_cancel(a_tag, buf, bp); - } - return result; - } - void raw_notify(player, msg) dbref player; --- 1569,1574 ---- *************** *** 2397,2403 **** int guest; int i; ! for (i = 0; i < (SUPPORT_PUEBLO ? 2 : 1); i++) { conn = fcache_read(&fcache.connect_fcache[i], options.connect_file[i]); motd = fcache_read(&fcache.motd_fcache[i], options.motd_file[i]); wiz = fcache_read(&fcache.wizmotd_fcache[i], options.wizmotd_file[i]); --- 2164,2170 ---- int guest; int i; ! for (i = 0; i < 1; i++) { conn = fcache_read(&fcache.connect_fcache[i], options.connect_file[i]); motd = fcache_read(&fcache.motd_fcache[i], options.motd_file[i]); wiz = fcache_read(&fcache.wizmotd_fcache[i], options.wizmotd_file[i]); *************** *** 2412,2418 **** notify_format(player, T ("%s sizes: NewUser...%d Connect...%d Guest...%d Motd...%d Wizmotd...%d Quit...%d Register...%d Down...%d Full...%d"), ! i ? "HTMLFile" : "File", new, conn, guest, motd, wiz, quit, reg, down, full); } } --- 2179,2185 ---- notify_format(player, T ("%s sizes: NewUser...%d Connect...%d Guest...%d Motd...%d Wizmotd...%d Quit...%d Register...%d Down...%d Full...%d"), ! "File", new, conn, guest, motd, wiz, quit, reg, down, full); } } *************** *** 3107,3119 **** char buff[BUFFER_LEN]; struct notify_strings messages[MESSAGE_TYPES]; char *s; - PUEBLOBUFF; size_t len; if ((n == 2) && (b[0] == '\r') && (b[1] == '\n')) { - if ((d->conn_flags & CONN_HTML)) - queue_newwrite(d, "
\n", 5); - else queue_newwrite(d, b, 2); return n; } --- 2874,2882 ---- *************** *** 3125,3140 **** zero_strings(messages); ! if (d->conn_flags & CONN_HTML) { ! PUSE; ! tag_wrap("SAMP", NULL, buff); ! PEND; ! s = notify_makestring(pbuff, messages, NA_PUEBLO); ! len = messages[NA_PUEBLO].len; ! } else { ! s = notify_makestring(buff, messages, notify_type(d)); ! len = messages[notify_type(d)].len; ! } queue_newwrite(d, s, len); free_strings(messages); return n; --- 2888,2896 ---- zero_strings(messages); ! s = notify_makestring(buff, messages, notify_type(d)); ! len = messages[notify_type(d)].len; ! queue_newwrite(d, s, len); free_strings(messages); return n; *************** *** 3239,3248 **** static int queue_eol(DESC *d) { ! if (SUPPORT_PUEBLO && (d->conn_flags & CONN_HTML)) ! return queue_newwrite(d, "
\n", 5); ! else ! return queue_newwrite(d, "\r\n", 2); } static int --- 2995,3001 ---- static int queue_eol(DESC *d) { ! return queue_newwrite(d, "\r\n", 2); } static int *************** *** 3357,3364 **** welcome_user(d) DESC *d; { - if (SUPPORT_PUEBLO && !(d->conn_flags & CONN_HTML)) - queue_newwrite(d, PUEBLO_HELLO, strlen(PUEBLO_HELLO)); fcache_dump(d, fcache.connect_fcache); } --- 3110,3115 ---- *************** *** 3652,3667 **** set_userstring(&d->output_prefix, command + strlen(PREFIX_COMMAND)); } else if (!strncmp(command, SUFFIX_COMMAND, strlen(SUFFIX_COMMAND))) { set_userstring(&d->output_suffix, command + strlen(SUFFIX_COMMAND)); - } else if (SUPPORT_PUEBLO - && !strncmp(command, PUEBLO_COMMAND, strlen(PUEBLO_COMMAND))) { - if (!(d->conn_flags & CONN_HTML)) { - queue_newwrite(d, PUEBLO_SEND, strlen(PUEBLO_SEND)); - do_log(LT_CONN, 0, 0, T("[%d/%s/%s] Switching to Pueblo mode."), - d->descriptor, d->addr, d->ip); - d->conn_flags |= CONN_HTML; - if (!d->connected) - welcome_user(d); - } } else { if (d->connected) { send_prefix(d); --- 3403,3408 ---- *************** *** 4251,4261 **** * BUT flags are not shown. Wizard/royal WHO does not show @doings. */ - if (SUPPORT_PUEBLO && (call_by->conn_flags & CONN_HTML)) { - queue_newwrite(call_by, "", 19); - queue_newwrite(call_by, "
", 5);
-   }
- 
    if ((doing == 1) || !call_by->player || !Priv_Who(call_by->player)) {
      if (poll_msg[0] == '\0')
        strcpy(poll_msg, "Doing");
--- 3992,3997 ----
***************
*** 4357,4366 ****
      break;
    }
    queue_string(call_by, tbuf1);
-   if (SUPPORT_PUEBLO && (call_by->conn_flags & CONN_HTML)) {
-     queue_newwrite(call_by, "\n
\n", 8); - queue_newwrite(call_by, "", 23); - } else queue_newwrite(call_by, "\r\n", 2); } --- 4093,4098 ---- *************** *** 4877,4915 **** strcpy(poll_msg, "Doing"); safe_str(poll_msg, buff, bp); - } - - FUNCTION(fun_pueblo) - { - /* Return the status of the pueblo flag on the least idle descriptor we - * find that matches the player's dbref. - */ - DESC *d; - dbref target; - DESC *match; - - target = lookup_player(args[0]); - if (target == NOTHING) { - target = match_result(executor, args[0], TYPE_PLAYER, - MAT_ABSOLUTE | MAT_PLAYER | MAT_ME); - } - /* non-connected players return error #-1 */ - if ((target == NOTHING) || !Connected(target)) { - safe_str(T("#-1 NOT CONNECTED"), buff, bp); - return; - } - /* else walk the descriptor list looking for a match */ - match = NULL; - DESC_ITER_CONN(d) { - if ((d->player == target) && - (!Hidden(d) || Priv_Who(executor)) && - (!match || (d->last_time > match->last_time))) - match = d; - } - if (match) - safe_boolean(match->conn_flags & CONN_HTML, buff, bp); - else - safe_str(T("#-1 NOT CONNECTED"), buff, bp); } /* ARGSUSED */ --- 4609,4614 ---- *** ../pennmush-clean/src/conf.c Sat Jun 8 18:06:15 2002 --- src/conf.c Sat Jun 8 21:21:44 2002 *************** *** 19,25 **** #include "conf.h" #include "externs.h" - #include "pueblo.h" #include "mushdb.h" #include "parse.h" #include "command.h" --- 19,24 ---- *************** *** 117,158 **** "messages"} , - {"connect_html_file", cf_str, options.connect_file[1], - sizeof options.connect_file[1], 0, - "messages"} - , - {"motd_html_file", cf_str, options.motd_file[1], - sizeof options.connect_file[1], 0, - "messages"} - , - {"wizmotd_html_file", cf_str, options.wizmotd_file[1], - sizeof options.wizmotd_file[1], 0, - "messages"} - , - {"newuser_html_file", cf_str, options.newuser_file[1], - sizeof options.newuser_file[1], 0, - "messages"} - , - {"register_create_html_file", cf_str, options.register_file[1], - sizeof options.register_file[1], 0, "messages"} - , - {"quit_html_file", cf_str, options.quit_file[1], sizeof options.quit_file[1], - 0, - "messages"} - , - {"down_html_file", cf_str, options.down_file[1], sizeof options.down_file[1], - 0, - "messages"} - , - {"full_html_file", cf_str, options.full_file[1], sizeof options.full_file[1], - 0, - "messages"} - , - {"guest_html_file", cf_str, options.guest_file[1], - sizeof options.guest_file[1], 0, - "messages"} - , - {"player_start", cf_dbref, &options.player_start, 100000, 0, "db"} , {"master_room", cf_dbref, &options.master_room, 100000, 0, "db"} --- 116,121 ---- *************** *** 182,189 **** , {"guests", cf_bool, &options.guest_allow, 2, 0, "net"} , - {"pueblo", cf_bool, &options.support_pueblo, 2, 0, "net"} - , {"forking_dump", cf_bool, &options.forking_dump, 2, 0, "dump"} , --- 145,150 ---- *************** *** 831,837 **** options.log_huhs = 0; options.log_forces = 1; options.log_walls = 0; - options.support_pueblo = 0; options.login_allow = 1; options.guest_allow = 1; options.create_allow = 1; --- 792,797 ---- *************** *** 1122,1129 **** CONFGROUP *cgp; CONF *cp; - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%cSAMP%c", TAG_START, TAG_END)); if (type && *type) { /* Look up the type in the group table */ int found = 0; --- 1082,1087 ---- *************** *** 1171,1178 **** notify_format(player, " %-15s %s", T(cgp->name), cgp->desc); } } - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%c/SAMP%c", TAG_START, TAG_END)); } #define MAYBE_LC(x) (lc ? strlower(x) : x) --- 1129,1134 ---- *** ../pennmush-clean/src/extchat.c Sat Jun 8 18:06:15 2002 --- src/extchat.c Sat Jun 8 21:12:59 2002 *************** *** 23,29 **** #include "ansi.h" #include "privtab.h" #include "mymalloc.h" - #include "pueblo.h" #include "parse.h" #include "lock.h" #include "log.h" --- 23,28 ---- *************** *** 1594,1614 **** char blanks[31]; int numblanks; - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%cSAMP%c", TAG_START, TAG_END)); notify_format(player, "%-30s %-5s %8s %-16s %-8s", "Name", "Users", "Msgs", T("Chan Type"), "Status"); for (c = channels; c; c = c->next) { strcpy(cleanname, remove_markup(ChanName(c), NULL)); if (Chan_Can_See(c, player) && string_prefix(cleanname, partname)) { u = onchannel(player, c); ! if (SUPPORT_PUEBLO) ! sprintf(numusers, ! "%cA XCH_CMD=\"@channel/who %s\" XCH_HINT=\"See who's on this channel now\"%c%5ld%c/A%c", ! TAG_START, cleanname, TAG_END, ChanNumUsers(c), ! TAG_START, TAG_END); ! else ! sprintf(numusers, "%5ld", ChanNumUsers(c)); numblanks = strlen(ChanName(c)) - strlen(cleanname); if (numblanks > 0 && numblanks < 31) { strcpy(blanks, thirtyblanks); --- 1593,1605 ---- char blanks[31]; int numblanks; notify_format(player, "%-30s %-5s %8s %-16s %-8s", "Name", "Users", "Msgs", T("Chan Type"), "Status"); for (c = channels; c; c = c->next) { strcpy(cleanname, remove_markup(ChanName(c), NULL)); if (Chan_Can_See(c, player) && string_prefix(cleanname, partname)) { u = onchannel(player, c); ! sprintf(numusers, "%5ld", ChanNumUsers(c)); numblanks = strlen(ChanName(c)) - strlen(cleanname); if (numblanks > 0 && numblanks < 31) { strcpy(blanks, thirtyblanks); *************** *** 1639,1646 **** (u &&Chanuser_Hide(u)) ? 'H' : ' '); } } - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%c/SAMP%c", TAG_START, TAG_END)); } static char * --- 1630,1635 ---- *** ../pennmush-clean/src/extmail.c Sat Jun 8 18:06:15 2002 --- src/extmail.c Sat Jun 8 21:11:21 2002 *************** *** 82,88 **** #include "attrib.h" #include "parse.h" #include "mymalloc.h" - #include "pueblo.h" #include "flags.h" #include "log.h" #include "lock.h" --- 82,87 ---- *************** *** 466,479 **** if (mail_match(player, mp, ms, i[Folder(mp)])) { /* Read it */ j++; ! if (SUPPORT_PUEBLO) { ! notify_noenter(player, tprintf("%cSAMP%c", TAG_START, TAG_END)); ! sprintf(folderheader, ! "%cA XCH_HINT=\"List messages in this folder\" XCH_CMD=\"@mail/list %d:1-\"%c%s%c/A%c", ! TAG_START, Folder(mp), TAG_END, T("Folder:"), TAG_START, ! TAG_END); ! } else ! strcpy(folderheader, T("Folder:")); notify(player, DASH_LINE); if (IsPlayer(mp->from)) sprintf(tbuf1, "%s", Name(mp->from)); --- 465,471 ---- if (mail_match(player, mp, ms, i[Folder(mp)])) { /* Read it */ j++; ! strcpy(folderheader, T("Folder:")); notify(player, DASH_LINE); if (IsPlayer(mp->from)) sprintf(tbuf1, "%s", Name(mp->from)); *************** *** 492,505 **** notify_format(player, T("Subject: %s"), get_subject(mp)); #endif notify(player, DASH_LINE); - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%c/SAMP%c", TAG_START, TAG_END)); strcpy(tbuf1, uncompress(mp->message)); notify(player, tbuf1); - if (SUPPORT_PUEBLO) - notify_format(player, "%cSAMP%c%s%c/SAMP%c", TAG_START, TAG_END, - DASH_LINE, TAG_START, TAG_END); - else notify(player, DASH_LINE); if (Unread(mp)) mp->read |= M_READ; /* mark message as read */ --- 484,491 ---- *************** *** 534,541 **** FA_Init(i, j); j = 0; folder = MSFolder(ms) ? MSFolder(ms) : player_folder(player); - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%cSAMP%c", TAG_START, TAG_END)); notify_format(player, T ("--------------------------- MAIL (folder %2d) ------------------------------"), --- 520,525 ---- *************** *** 546,557 **** i[Folder(mp)]++; if (mail_match(player, mp, ms, i[Folder(mp)])) { /* list it */ - if (SUPPORT_PUEBLO) - notify_noenter(player, - tprintf - ("%cA XCH_CMD=\"@mail/read %d:%d\" XCH_HINT=\"Read message %d in folder %d\"%c", - TAG_START, Folder(mp), i[Folder(mp)], - i[Folder(mp)], Folder(mp), TAG_END)); #ifdef MAIL_SUBJECTS strcpy(subj, chopstr(get_subject(mp), 28)); notify_format(player, "[%s] %2d:%-3d %c%-12s %-*s %s", --- 530,535 ---- *************** *** 572,585 **** || Hasprivs(player))) ? "Conn" : " ")); #endif - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%c/A%c", TAG_START, TAG_END)); } } } notify(player, DASH_LINE); - if (SUPPORT_PUEBLO) - notify_format(player, "%c/SAMP%c", TAG_START, TAG_END); return; } --- 550,559 ---- *** ../pennmush-clean/src/function.c Sat Jun 8 18:06:15 2002 --- src/function.c Sat Jun 8 21:02:32 2002 *************** *** 369,375 **** {"POS", fun_pos, 2, 2, FN_REG}, {"POSS", fun_poss, 1, 1, FN_REG}, {"POWERS", fun_powers, 1, 1, FN_REG}, - {"PUEBLO", fun_pueblo, 1, 1, FN_REG}, #ifdef QUOTA {"QUOTA", fun_quota, 1, 1, FN_REG}, #endif --- 369,374 ---- *************** *** 495,504 **** {"SQRT", fun_sqrt, 1, 1, FN_REG}, {"STDDEV", fun_stddev, 1, INT_MAX, FN_REG}, {"TAN", fun_tan, 1, 1, FN_REG}, - {"HTML", fun_html, 1, 1, FN_REG}, - {"TAG", fun_tag, 1, INT_MAX, FN_REG}, - {"ENDTAG", fun_endtag, 1, 1, FN_REG}, - {"TAGWRAP", fun_tagwrap, 2, 3, FN_REG}, {NULL, NULL, 0, 0, 0} }; --- 494,499 ---- *** ../pennmush-clean/src/funstr.c Sat Jun 8 18:06:15 2002 --- src/funstr.c Sat Jun 8 21:04:51 2002 *************** *** 10,16 **** #include "case.h" #include "match.h" #include "parse.h" - #include "pueblo.h" #include "attrib.h" #include "flags.h" #include "dbdefs.h" --- 10,15 ---- *************** *** 23,32 **** #pragma warning( disable : 4761) /* NJG: disable warning re conversion */ #endif - HASHTAB htab_tag; static int wraplen(char *str, int maxlen); - void init_tag_hashtab(void); int get_gender(dbref player) --- 22,29 ---- *************** *** 977,1007 **** safe_fill(BEEP_CHAR, k, buff, bp); } - /* All the safe tags from HTML 4.0 */ - void init_tag_hashtab _((void)); - void - init_tag_hashtab(void) - { - static char dummy = 1; - int i = 0; - static const char *safetags[] = { "A", "B", "I", "U", "STRONG", "EM", - "ADDRESS", "BLOCKQUOTE", "CENTER", "DEL", "DIV", - "H1", "H2", "H3", "H4", "H5", "H6", "HR", "INS", - "P", "PRE", "DIR", "DL", "DT", "DD", "LI", "MENU", "OL", "UL", - "TABLE", "CAPTION", "COLGROUP", "COL", "THEAD", "TFOOT", - "TBODY", "TR", "TD", "TH", - "BR", "FONT", "IMG", "SPAN", "SUB", "SUP", - "ABBR", "ACRONYM", "CITE", "CODE", "DFN", "KBD", "SAMP", "VAR", - "BIG", "S", "SMALL", "STRIKE", "TT", - NULL - }; - hashinit(&htab_tag, 64, 1); - while (safetags[i]) { - hashadd(safetags[i], (void *) &dummy, &htab_tag); - i++; - } - } - FUNCTION(fun_ord) { char *m; --- 974,979 ---- *************** *** 1052,1105 **** int n; for (n = 0; n < arglens[0]; n++) { safe_chr((char) accent_table[(unsigned char) args[0][n]].base, buff, bp); - } - } - - /* ARGSUSED */ - FUNCTION(fun_html) - { - if (!Wizard(executor)) - safe_str(T(e_perm), buff, bp); - else - safe_tag(args[0], buff, bp); - } - - /* ARGSUSED */ - FUNCTION(fun_tag) - { - int i; - if (!Wizard(executor) && !hash_find(&htab_tag, strupper(args[0]))) - safe_str("#-1", buff, bp); - else { - safe_chr(TAG_START, buff, bp); - safe_strl(args[0], arglens[0], buff, bp); - for (i = 1; i < nargs; i++) { - safe_chr(' ', buff, bp); - safe_strl(args[i], arglens[i], buff, bp); - } - safe_chr(TAG_END, buff, bp); - } - } - - /* ARGSUSED */ - FUNCTION(fun_endtag) - { - if (!Wizard(executor) && !hash_find(&htab_tag, strupper(args[0]))) - safe_str("#-1", buff, bp); - else - safe_tag_cancel(args[0], buff, bp); - } - - /* ARGSUSED */ - FUNCTION(fun_tagwrap) - { - if (!Wizard(executor) && !hash_find(&htab_tag, strupper(args[0]))) - safe_str("#-1", buff, bp); - else { - if (nargs == 2) - safe_tag_wrap(args[0], NULL, args[1], buff, bp); - else - safe_tag_wrap(args[0], args[1], args[2], buff, bp); } } --- 1024,1029 ---- *** ../pennmush-clean/src/game.c Sat Jun 8 18:06:16 2002 --- src/game.c Sat Jun 8 21:04:17 2002 *************** *** 685,691 **** init_flag_table(); init_func_hashtab(); init_math_hashtab(); - init_tag_hashtab(); init_aname_table(); init_atr_name_tree(); init_locks(); --- 685,690 ---- *************** *** 1910,1916 **** extern HASHTAB htab_function; extern HASHTAB htab_user_function; extern HASHTAB htab_math; - extern HASHTAB htab_tag; extern HASHTAB htab_player_list; extern HASHTAB htab_reserved_aliases; extern HASHTAB help_files; --- 1909,1914 ---- *************** *** 1929,1935 **** hash_stats(player, &htab_function, "Functions"); hash_stats(player, &htab_user_function, "@Functions"); hash_stats(player, &htab_math, "Math funs"); - hash_stats(player, &htab_tag, "HTML tags"); hash_stats(player, &htab_player_list, "Players"); hash_stats(player, &htab_reserved_aliases, "Aliases"); hash_stats(player, &help_files, "HelpFiles"); --- 1927,1932 ---- *** ../pennmush-clean/src/help.c Sat Jun 8 18:06:16 2002 --- src/help.c Sat Jun 8 21:08:54 2002 *************** *** 16,22 **** #include "log.h" #include "ansi.h" #include "parse.h" - #include "pueblo.h" #include "flags.h" #include "dbdefs.h" #include "mymalloc.h" --- 16,21 ---- *************** *** 248,255 **** } else notify(player, the_topic); - if (SUPPORT_PUEBLO) - notify_noenter(player, tprintf("%cSAMP%c", TAG_START, TAG_END)); for (n = 0; n < BUFFER_LEN; n++) { if (fgets(line, LINE_SIZE, fp) == NULL) break; --- 247,252 ---- *************** *** 264,271 **** notify(player, line); } } - if (SUPPORT_PUEBLO) - notify_format(player, "%c/SAMP%c", TAG_START, TAG_END); fclose(fp); if (n >= BUFFER_LEN) notify_format(player, T("%s output truncated."), help_dat->command); --- 261,266 ---- *** ../pennmush-clean/src/look.c Sat Jun 8 18:06:16 2002 --- src/look.c Sat Jun 8 22:38:15 2002 *************** *** 19,25 **** #include "match.h" #include "externs.h" #include "ansi.h" - #include "pueblo.h" #ifdef CHAT_SYSTEM #include "extchat.h" #endif --- 19,24 ---- *************** *** 61,67 **** int exit_count, this_exit, total_count; ATTR *a; int texits; ! PUEBLOBUFF; /* make sure location is a room */ if (!IsRoom(loc)) --- 60,67 ---- int exit_count, this_exit, total_count; ATTR *a; int texits; ! char lbuf[BUFFER_LEN]; ! char *lp; /* make sure location is a room */ if (!IsRoom(loc)) *************** *** 167,192 **** } } ! PUSE; ! tag_wrap("FONT", "SIZE=+1", exit_name); ! PEND; ! notify_by(loc, player, pbuff); for (; thing != NOTHING; thing = Next(thing)) { if (Name(thing) && !DarkLegal(thing) && (!Dark(loc) || Light(thing))) { ! strcpy(pbuff, Name(thing)); ! if ((p = strchr(pbuff, ';'))) *p = '\0'; p = nbuf; ! safe_tag_wrap("A", tprintf("XCH_CMD=\"go #%d\"", thing), pbuff, nbuf, &p); *p = '\0'; if (Transparented(loc) && !(Opaque(thing))) { - if (SUPPORT_PUEBLO && !texits) { - texits = 1; - notify_noenter_by(loc, player, tprintf("%cUL%c", TAG_START, TAG_END)); - } s1 = tbuf1; - safe_tag("LI", tbuf1, &s1); safe_chr(' ', tbuf1, &s1); if (Location(thing) == NOTHING) safe_format(tbuf1, &s1, T("%s leads nowhere."), nbuf); --- 167,187 ---- } } ! lp = lbuf; ! safe_str(exit_name, lbuf, &lp); ! *lp = '\0'; ! notify_by(loc, player, lbuf); for (; thing != NOTHING; thing = Next(thing)) { if (Name(thing) && !DarkLegal(thing) && (!Dark(loc) || Light(thing))) { ! strcpy(lbuf, Name(thing)); ! if ((p = strchr(lbuf, ';'))) *p = '\0'; p = nbuf; ! safe_str(lbuf, nbuf, &p); /* Unsure, possibly remove... for Pueblo */ *p = '\0'; if (Transparented(loc) && !(Opaque(thing))) { s1 = tbuf1; safe_chr(' ', tbuf1, &s1); if (Location(thing) == NOTHING) safe_format(tbuf1, &s1, T("%s leads nowhere."), nbuf); *************** *** 201,207 **** Name(Location(thing))); } *s1 = '\0'; ! notify_nopenter_by(loc, player, tbuf1); } else { safe_str(nbuf, tbuf2, &s2); if (COMMA_EXIT_LIST) { --- 196,202 ---- Name(Location(thing))); } *s1 = '\0'; ! notify_anything(loc, na_one, &player, NULL, NA_NOPENTER, tbuf1); } else { safe_str(nbuf, tbuf2, &s2); if (COMMA_EXIT_LIST) { *************** *** 222,233 **** } } } - if (SUPPORT_PUEBLO && texits) { - PUSE; - tag_cancel("UL"); - PEND; - notify_noenter_by(loc, player, pbuff); - } *s2 = '\0'; notify_by(loc, player, tbuf2); mush_free((Malloc_t) tbuf1, "string"); --- 217,222 ---- *************** *** 245,251 **** dbref thing; dbref can_see_loc; ATTR *a; ! PUEBLOBUFF; /* check to see if he can see the location */ /* * patched so that player can't see in dark rooms even if owned by that --- 234,242 ---- dbref thing; dbref can_see_loc; ATTR *a; ! char lbuf[BUFFER_LEN]; ! char *lp; ! /* check to see if he can see the location */ /* * patched so that player can't see in dark rooms even if owned by that *************** *** 300,324 **** DOLIST(thing, Contents(loc)) { if (can_see(player, thing, can_see_loc)) { /* something exists! show him everything */ ! PUSE; ! tag_wrap("FONT", "SIZE=+1", contents_name); ! tag("UL"); ! PEND; ! notify_nopenter_by(loc, player, pbuff); DOLIST(thing, Contents(loc)) { if (can_see(player, thing, can_see_loc)) { ! PUSE; ! tag("LI"); ! tag_wrap("A", tprintf("XCH_CMD=\"look #%d\"", thing), ! unparse_object_myopic(player, thing)); ! PEND; ! notify_by(loc, player, pbuff); } } - PUSE; - tag_cancel("UL"); - PEND; - notify_noenter_by(loc, player, pbuff); break; /* we're done */ } } --- 291,308 ---- DOLIST(thing, Contents(loc)) { if (can_see(player, thing, can_see_loc)) { /* something exists! show him everything */ ! lp = lbuf; ! safe_str(contents_name, lbuf, &lp); ! *lp = '\0'; ! notify_anything(loc, na_one, &player, NULL, NA_NOPENTER, lbuf); DOLIST(thing, Contents(loc)) { if (can_see(player, thing, can_see_loc)) { ! lp = lbuf; ! safe_str(unparse_object_myopic(player, thing), lbuf, &lp); ! *lp = '\0'; ! notify_by(loc, player, lbuf); } } break; /* we're done */ } } *************** *** 393,404 **** dbref thing; { int flag = 0; ! PUEBLOBUFF; ! PUSE; ! tag_wrap("FONT", "SIZE=+2", unparse_object_myopic(player, thing)); ! PEND; ! notify(player, pbuff); did_it(player, thing, "DESCRIBE", T("You see nothing special."), "ODESCRIBE", NULL, "ADESCRIBE", NOTHING); if (IsExit(thing) && Transparented(thing)) { --- 377,389 ---- dbref thing; { int flag = 0; ! char buff[BUFFER_LEN]; ! char *bp; ! bp = buff; ! safe_str(unparse_object_myopic(player, thing), buff, &bp); ! *bp = '\0'; ! notify(player, buff); did_it(player, thing, "DESCRIBE", T("You see nothing special."), "ODESCRIBE", NULL, "ADESCRIBE", NOTHING); if (IsExit(thing) && Transparented(thing)) { *************** *** 430,457 **** * 4 -- remote look, though a CLOUDY (!TRANS) exit: contents only */ ! PUEBLOBUFF; ! ATTR *a; if (loc == NOTHING) return; /* don't give the unparse if looking through Transparent exit */ if ((flag == 0) || (flag == 2)) { ! PUSE; ! tag("XCH_PAGE CLEAR=\"LINKS IMAGES PLUGINS\""); ! if (SUPPORT_PUEBLO && flag == 2) { ! a = atr_get(loc, "VRML_URL"); ! if (a) { ! tag(tprintf("IMG XCH_GRAPH=LOAD HREF=\"%s\"", uncompress(a->value))); ! } else { ! tag("IMG XCH_GRAPH=HIDE"); ! } ! } ! tag("HR"); ! tag_wrap("FONT", "SIZE=+3", unparse_room(player, loc)); ! PEND; ! notify_by(loc, player, pbuff); } if (!IsRoom(loc)) { if ((flag != 2) || !Terse(player)) { --- 415,432 ---- * 4 -- remote look, though a CLOUDY (!TRANS) exit: contents only */ ! char buff[BUFFER_LEN]; ! char *bp; if (loc == NOTHING) return; /* don't give the unparse if looking through Transparent exit */ if ((flag == 0) || (flag == 2)) { ! bp = buff; ! safe_str(unparse_room(player, loc), buff, &bp); ! *bp = '\0'; ! notify_by(loc, player, buff); } if (!IsRoom(loc)) { if ((flag != 2) || !Terse(player)) { *************** *** 633,639 **** char *tbuf; int ok = 0; int listed = 0; ! PUEBLOBUFF; if (*name == '\0') { if ((thing = Location(player)) == NOTHING) --- 608,615 ---- char *tbuf; int ok = 0; int listed = 0; ! char buff[BUFFER_LEN]; ! char *bp; if (*name == '\0') { if ((thing = Location(player)) == NOTHING) *************** *** 683,692 **** return; } if (ok) { ! PUSE; ! tag_wrap("FONT", "SIZE=+3", object_header(player, thing)); ! PEND; ! notify(player, pbuff); if (FLAGS_ON_EXAMINE) notify(player, flag_description(player, thing)); } --- 659,668 ---- return; } if (ok) { ! bp = buff; ! safe_str(object_header(player, thing), buff, &bp); ! *bp = '\0'; ! notify(player, buff); if (FLAGS_ON_EXAMINE) notify(player, flag_description(player, thing)); } *** ../pennmush-clean/src/malias.c Sat Jun 8 18:06:16 2002 --- src/malias.c Sat Jun 8 20:47:40 2002 *************** *** 56,62 **** #include "privtab.h" #include "mymalloc.h" #include "flags.h" - #include "pueblo.h" #include "log.h" #ifdef MEM_CHECK #include "memcheck.h" --- 56,61 ---- *** ../pennmush-clean/src/strutil.c Sat Jun 8 18:06:16 2002 --- src/strutil.c Sat Jun 8 21:37:34 2002 *************** *** 13,19 **** #include "conf.h" #include "case.h" #include "ansi.h" - #include "pueblo.h" #include "parse.h" #include "externs.h" #ifdef MEM_CHECK --- 13,18 ---- *************** *** 879,887 **** if (*p == ESC_CHAR) { while ((*p) && (*p != 'm')) p++; - } else if (*p == TAG_START) { - while ((*p) && (*p != TAG_END)) - p++; } else { i++; } --- 878,883 ---- *************** *** 906,916 **** p++; i++; } - } else if (*p == TAG_START) { - while ((*p) && (*p != TAG_END)) { - p++; - i++; - } } else numchars--; i++; --- 902,907 ---- *************** *** 999,1008 **** /* Skip over ansi */ while (*q && *q++ != 'm') ; break; - case TAG_START: - /* Skip over HTML */ - while (*q && *q++ != TAG_END) ; - break; default: safe_chr(*q++, buff, &bp); len++; --- 990,995 ---- *************** *** 1177,1190 **** char *p = (char *) s; if (!p) return NULL; ! while (*p == ESC_CHAR || *p == TAG_START) { ! if (*p == ESC_CHAR) { ! while (*p && *p != 'm') ! p++; ! } else { /* TAG_START */ ! while (*p && *p != TAG_END) ! p++; ! } if (*p) p++; } --- 1164,1172 ---- char *p = (char *) s; if (!p) return NULL; ! while (*p == ESC_CHAR) { ! while (*p && *p != 'm') ! p++; if (*p) p++; } *************** *** 1295,1302 **** } static int is_ansi_code(const char *s); - static int is_start_html_code(const char *s) __attribute__ ((__unused__)); - static int is_end_html_code(const char *s); static int is_ansi_code(const char *s) --- 1277,1282 ---- *************** *** 1304,1321 **** return s && *s == ESC_CHAR; } - static int - is_start_html_code(const char *s) - { - return s && *s == TAG_START && *(s + 1) != '/'; - } - - static int - is_end_html_code(const char *s) - { - return s && *s == TAG_START && *(s + 1) == '/'; - } - void free_ansi_string(ansi_string * as) { --- 1284,1289 ---- *************** *** 1349,1361 **** if (as->codes[start] == NULL) { for (p = start - 1; p >= 0; p--) { if (as->codes[p]) { ! if (!is_end_html_code(as->codes[p])) { ! if (strcmp(as->codes[p], ANSI_NORMAL) != 0) { ! if (safe_str(as->codes[p], buff, bp)) ! return 1; ! in_ansi = 1; ! } ! } break; } } --- 1317,1327 ---- if (as->codes[start] == NULL) { for (p = start - 1; p >= 0; p--) { if (as->codes[p]) { ! if (strcmp(as->codes[p], ANSI_NORMAL) != 0) { ! if (safe_str(as->codes[p], buff, bp)) ! return 1; ! in_ansi = 1; ! } break; } } *************** *** 1379,1387 **** if (in_ansi) { for (; p <= (int) as->len; p++) { if (as->codes[p]) { ! if ((is_ansi_code(as->codes[p]) ! && strcmp(ANSI_NORMAL, as->codes[p]) == 0) ! || is_end_html_code(as->codes[p])) { if (safe_str(as->codes[p], buff, bp)) return 1; } --- 1345,1352 ---- if (in_ansi) { for (; p <= (int) as->len; p++) { if (as->codes[p]) { ! if (is_ansi_code(as->codes[p]) ! && strcmp(ANSI_NORMAL, as->codes[p]) == 0) { if (safe_str(as->codes[p], buff, bp)) return 1; } *** ../pennmush-clean/src/unparse.c Sat Jun 8 18:06:16 2002 --- src/unparse.c Sat Jun 8 22:42:37 2002 *************** *** 15,43 **** #include "externs.h" #include "attrib.h" #include "ansi.h" - #include "pueblo.h" #include "parse.h" #include "confmagic.h" - /* Hack added by Thorvald for object_header Pueblo */ - static int couldunparse; - const char * unparse_object(player, loc) dbref player; dbref loc; { - static PUEBLOBUFF; const char *result; result = real_unparse(player, loc, 0, 0, 0); ! if (couldunparse) { ! PUSE; ! tag_wrap("A", tprintf("XCH_CMD=\"examine #%d\"", loc), result); ! PEND; ! return pbuff; ! } else { ! return result; ! } } const char * --- 15,31 ---- #include "externs.h" #include "attrib.h" #include "ansi.h" #include "parse.h" #include "confmagic.h" const char * unparse_object(player, loc) dbref player; dbref loc; { const char *result; result = real_unparse(player, loc, 0, 0, 0); ! return result; } const char * *************** *** 45,61 **** dbref player; dbref loc; { - static PUEBLOBUFF; const char *result; result = real_unparse(player, loc, 1, 0, 1); ! if (couldunparse) { ! PUSE; ! tag_wrap("A", tprintf("XCH_CMD=\"examine #%d\"", loc), result); ! PEND; ! return pbuff; ! } else { ! return result; ! } } /* Like unparse_object, but tell real_unparse to use @NAMEFORMAT if present --- 33,41 ---- dbref player; dbref loc; { const char *result; result = real_unparse(player, loc, 1, 0, 1); ! return result; } /* Like unparse_object, but tell real_unparse to use @NAMEFORMAT if present *************** *** 68,84 **** dbref player; dbref loc; { - static PUEBLOBUFF; const char *result; result = real_unparse(player, loc, 1, 1, 1); ! if (couldunparse) { ! PUSE; ! tag_wrap("A", tprintf("XCH_CMD=\"examine #%d\"", loc), result); ! PEND; ! return pbuff; ! } else { ! return result; ! } } const char *accented_name(dbref); --- 48,56 ---- dbref player; dbref loc; { const char *result; result = real_unparse(player, loc, 1, 1, 1); ! return result; } const char *accented_name(dbref); *************** *** 92,98 **** char *p; int got_nameformat = 0; - couldunparse = 0; if (!(GoodObject(loc) || (loc == NOTHING) || (loc == AMBIGUOUS) || (loc == HOME))) return T("*NOTHING*"); --- 64,69 ---- *************** *** 123,130 **** (!Myopic(player) || !obey_myopic) && !(use_nameformat && got_nameformat)) { /* show everything */ - if (SUPPORT_PUEBLO) - couldunparse = 1; if (ANSI_NAMES && ShowAnsi(player) && !got_nameformat) sprintf(buf, "%s%s%s(#%d%s)", ANSI_HILITE, tbuf1, ANSI_NORMAL, loc, unparse_flags(loc, player)); --- 94,99 ---- *** ../pennmush-clean/hdrs/conf.h Sat Jun 8 18:06:15 2002 --- hdrs/conf.h Sat Jun 8 21:41:14 2002 *************** *** 44,54 **** #define PREFIX_COMMAND "OUTPUTPREFIX" #define SUFFIX_COMMAND "OUTPUTSUFFIX" - #define PUEBLO_COMMAND "PUEBLOCLIENT " - - /* These CAN be modified, but it's heavily NOT suggested */ - #define PUEBLO_SEND "\n" - #define PUEBLO_HELLO "This world is Pueblo 1.10 Enhanced.\r\n" /*----- intrface.c stuff -----*/ --- 44,49 ---- *************** *** 115,134 **** int max_channels; int chan_cost; #endif ! char connect_file[2][256]; ! char motd_file[2][256]; ! char wizmotd_file[2][256]; ! char newuser_file[2][256]; ! char register_file[2][256]; ! char quit_file[2][256]; ! char down_file[2][256]; ! char full_file[2][256]; ! char guest_file[2][256]; int log_commands; int log_huhs; int log_forces; int log_walls; - int support_pueblo; int login_allow; int guest_allow; int create_allow; --- 110,128 ---- int max_channels; int chan_cost; #endif ! char connect_file[1][256]; ! char motd_file[1][256]; ! char wizmotd_file[1][256]; ! char newuser_file[1][256]; ! char register_file[1][256]; ! char quit_file[1][256]; ! char down_file[1][256]; ! char full_file[1][256]; ! char guest_file[1][256]; int log_commands; int log_huhs; int log_forces; int log_walls; int login_allow; int guest_allow; int create_allow; *************** *** 275,281 **** #define GUEST_PAY_CHECK (options.guest_paycheck) #define START_QUOTA (options.starting_quota) #define LOG_WIPE_PASSWD (options.log_wipe_passwd) - #define SUPPORT_PUEBLO (options.support_pueblo) #define QUEUE_QUOTA (options.player_queue_limit) --- 269,274 ---- *** ../pennmush-clean/game/mushcnf.dst Sat Jun 8 18:06:15 2002 --- game/mushcnf.dst Sat Jun 8 22:02:03 2002 *************** *** 307,323 **** guest_file txt/guest.txt full_file txt/full.txt - # The equivalent files in html, shown to Pueblo clients. - connect_html_file txt/connect.html - motd_html_file txt/motd.html - wizmotd_html_file txt/wizmotd.html - quit_html_file txt/quit.html - newuser_html_file txt/newuser.html - down_html_file txt/down.html - register_create_html_file txt/register.html - guest_html_file txt/guest.html - full_html_file txt/full.html - # The big text files. New ones can be added by setting up # a new subdirectory of game/txt as described in game/txt/README, # and adding a new help_command line below, or uncommenting one of --- 307,312 ---- *************** *** 363,371 **** ### ### Logins ### - - # Support the pueblo MUSH client and allow html to be sent to it - pueblo no # allow non-wizard/royalty logins logins yes --- 352,357 ----