From 76905e6910db7f2da8e2782ff02bc9cc3be037e5 Mon Sep 17 00:00:00 2001 From: Rumble Date: Thu, 17 Dec 2009 05:45:03 +0000 Subject: [PATCH] [Dec 17 2009] - Rumble standardized /n/r to /r/n in ibt.c Removed ability to set a modifier to obj apply NONE. --- changelog | 3 +++ lib/world/trg/0.trg | 1 + lib/world/trg/index | 1 + src/ibt.c | 62 ++++++++++++++++++++++----------------------- src/oedit.c | 2 +- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/changelog b/changelog index a77fda2..7c0b9c6 100644 --- a/changelog +++ b/changelog @@ -36,6 +36,9 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) (lots of major bugfixes too) @ tbaMUD 3.61 +[Dec 17 2009] - Rumble + standardized /n/r to /r/n in ibt.c + Removed ability to set a modifier to obj apply NONE. [Dec 16 2009] - Rumble Added some missing code for last_ibt in ibt.c. Fixed typos in ibt.c (thanks Elervan) diff --git a/lib/world/trg/0.trg b/lib/world/trg/0.trg index 8cb91ff..74ecf6d 100644 --- a/lib/world/trg/0.trg +++ b/lib/world/trg/0.trg @@ -449,6 +449,7 @@ Rumble's Spy~ * Arguments: * means all speech will trigger this. * This will echo all speech to Rumble. %at% rumble %echo% %actor.name% says, '%speech%' +%echo% firing ~ #21 Transform Example~ diff --git a/lib/world/trg/index b/lib/world/trg/index index f216557..aad515e 100644 --- a/lib/world/trg/index +++ b/lib/world/trg/index @@ -181,4 +181,5 @@ 345.trg 555.trg 556.trg + $ diff --git a/src/ibt.c b/src/ibt.c index f2180a1..8bef909 100755 --- a/src/ibt.c +++ b/src/ibt.c @@ -433,7 +433,7 @@ ACMD(do_ibt) " %s%s show %s\r\n" " %s%s remove %s\r\n" " %s%s edit %s\r\n" - " %s%s resolve %s\n\r", + " %s%s resolve %s\r\n", QYEL, CMD_NAME, QNRM, QYEL, CMD_NAME, QNRM, QYEL, CMD_NAME, QNRM, @@ -450,24 +450,24 @@ ACMD(do_ibt) QYEL, CMD_NAME, QNRM); return; } else { - send_to_char(ch, "Usage: %s%s submit
%s\n\r", QYEL, CMD_NAME, QNRM); + send_to_char(ch, "Usage: %s%s submit
%s\r\n", QYEL, CMD_NAME, QNRM); return; } } else if(is_abbrev(arg,"show")) { if (GET_LEVEL(ch) < LVL_IMMORT) { - send_to_char(ch, "%s what?\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s what?\r\n", ibt_types[subcmd]); return; } if (!is_number(arg2)) { - send_to_char(ch, "Show which %s?\n\r", CMD_NAME); + send_to_char(ch, "Show which %s?\r\n", CMD_NAME); return; } ano = atoi(arg2); if ((ibtData = get_ibt_by_num(subcmd, ano)) == NULL) { - send_to_char(ch, "That %s doesn't exist.\n\r", CMD_NAME); + send_to_char(ch, "That %s doesn't exist.\r\n", CMD_NAME); return; } else { send_to_char(ch, "%s%s Details%s\r\n%s\r\n",QCYN, ibt_types[subcmd], QYEL, ibtData->body); @@ -485,14 +485,14 @@ ACMD(do_ibt) else if(is_abbrev(arg,"list")) { if (GET_LEVEL(ch) < LVL_IMMORT) { - send_to_char(ch, "%s what?\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s what?\r\n", ibt_types[subcmd]); return; } if (first_ibt) { - send_to_char(ch,"%s No %s|%sName %s|%sRoom %s|%sLevel%s|%s Description\n\r", QCYN, QGRN, QCYN, QGRN, QCYN, QGRN, QCYN, QGRN, QCYN); - send_to_char(ch,"%s ---|------------|------|-----|--------------------------------------------------%s\n\r", QGRN, QNRM); + send_to_char(ch,"%s No %s|%sName %s|%sRoom %s|%sLevel%s|%s Description\r\n", QCYN, QGRN, QCYN, QGRN, QCYN, QGRN, QCYN, QGRN, QCYN); + send_to_char(ch,"%s ---|------------|------|-----|--------------------------------------------------%s\r\n", QGRN, QNRM); i=num_res=num_unres=0; for (ibtData=first_ibt;ibtData;ibtData = ibtData->next) { i++; @@ -522,23 +522,23 @@ ACMD(do_ibt) } } - send_to_char(ch,"\n\r%s%d %ss in file. %s%d%s resolved, %s%d%s unresolved%s\n\r",QCYN, i, CMD_NAME, QBGRN, num_res, QCYN, QBRED, num_unres, QCYN, QNRM); - send_to_char(ch,"%s%ss in %sRED%s are unresolved %ss.\n\r", QCYN, ibt_types[subcmd], QRED, QCYN, CMD_NAME); - send_to_char(ch,"%s%ss in %sGREEN%s are resolved %ss.\n\r", QCYN, ibt_types[subcmd], QGRN, QCYN, CMD_NAME); + send_to_char(ch,"\n\r%s%d %ss in file. %s%d%s resolved, %s%d%s unresolved%s\r\n",QCYN, i, CMD_NAME, QBGRN, num_res, QCYN, QBRED, num_unres, QCYN, QNRM); + send_to_char(ch,"%s%ss in %sRED%s are unresolved %ss.\r\n", QCYN, ibt_types[subcmd], QRED, QCYN, CMD_NAME); + send_to_char(ch,"%s%ss in %sGREEN%s are resolved %ss.\r\n", QCYN, ibt_types[subcmd], QGRN, QCYN, CMD_NAME); if (GET_LEVEL(ch) >= LVL_GRGOD) { - send_to_char(ch,"%sYou may use %s remove, resolve or edit to change the list..%s\n\r", QCYN, CMD_NAME, QNRM); + send_to_char(ch,"%sYou may use %s remove, resolve or edit to change the list..%s\r\n", QCYN, CMD_NAME, QNRM); } - send_to_char(ch,"%sYou may use %s%s show %s to see more indepth about the %s.%s\n\r", QCYN, QYEL, CMD_NAME, QCYN, CMD_NAME, QNRM); + send_to_char(ch,"%sYou may use %s%s show %s to see more indepth about the %s.%s\r\n", QCYN, QYEL, CMD_NAME, QCYN, CMD_NAME, QNRM); } else { - send_to_char(ch,"No %ss have been reported!\n\r", CMD_NAME); + send_to_char(ch,"No %ss have been reported!\r\n", CMD_NAME); } return; } else if (is_abbrev(arg,"submit")) { if (!*arg_text) { - send_to_char(ch, "You need to add a heading!\n\r"); + send_to_char(ch, "You need to add a heading!\r\n"); return; } switch (subcmd) { @@ -581,72 +581,72 @@ ACMD(do_ibt) else if (is_abbrev(arg,"resolve")) { if (GET_LEVEL(ch) < LVL_GRGOD){ - send_to_char(ch, "%s what?\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s what?\r\n", ibt_types[subcmd]); return; } if (!is_number(arg2)) { - send_to_char(ch, "Resolve which %s?\n\r", CMD_NAME); + send_to_char(ch, "Resolve which %s?\r\n", CMD_NAME); return; } ano = atoi(arg2); if ((ibtData = get_ibt_by_num(subcmd, ano)) == NULL) { - send_to_char(ch, "%s not found\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s not found\r\n", ibt_types[subcmd]); return; } else { if (IBT_FLAGGED(ibtData, IBT_RESOLVED)){ - send_to_char(ch, "That %s has already been resolved!\n\r", CMD_NAME); + send_to_char(ch, "That %s has already been resolved!\r\n", CMD_NAME); } else { - send_to_char(ch,"%s %d resolved!\n\r", ibt_types[subcmd], ano); + send_to_char(ch,"%s %d resolved!\r\n", ibt_types[subcmd], ano); SET_BIT_AR(IBT_FLAGS(ibtData), IBT_RESOLVED); } } return; } else if (is_abbrev(arg,"remove")) { if (GET_LEVEL(ch) < LVL_GRGOD){ - send_to_char(ch, "%s what?\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s what?\r\n", ibt_types[subcmd]); return; } if (!is_number(arg2)) { - send_to_char(ch, "Remove which %s?\n\r", CMD_NAME); + send_to_char(ch, "Remove which %s?\r\n", CMD_NAME); return; } ano = atoi(arg2); if ((ibtData = get_ibt_by_num(subcmd, ano)) == NULL) { - send_to_char(ch, "%s not found\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s not found\r\n", ibt_types[subcmd]); return; } else { if (free_ibt(subcmd, ibtData)) { - send_to_char(ch,"%s%s Number %d removed.%s\n\r", QCYN, ibt_types[subcmd], ano, QNRM); + send_to_char(ch,"%s%s Number %d removed.%s\r\n", QCYN, ibt_types[subcmd], ano, QNRM); } else { - send_to_char(ch,"%sUnable to remove %s %d!%s\n\r", QRED, CMD_NAME, ano, QNRM); + send_to_char(ch,"%sUnable to remove %s %d!%s\r\n", QRED, CMD_NAME, ano, QNRM); } } return; } else if (is_abbrev(arg,"save")) { if (GET_LEVEL(ch) < LVL_GRGOD){ - send_to_char(ch, "%s what?\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s what?\r\n", ibt_types[subcmd]); return; } save_ibt_file(subcmd); - send_to_char(ch,"%s list saved.\n\r", ibt_types[subcmd]); + send_to_char(ch,"%s list saved.\r\n", ibt_types[subcmd]); } else if (is_abbrev(arg,"edit")) { if (GET_LEVEL(ch) < LVL_GRGOD){ - send_to_char(ch, "%s what?\n\r", ibt_types[subcmd]); + send_to_char(ch, "%s what?\r\n", ibt_types[subcmd]); return; } /* Pass control to the OLC without the 'edit' arg */ do_oasis_ibtedit(ch, arg_text, cmd, subcmd); } else { if (GET_LEVEL(ch) < LVL_GRGOD){ - send_to_char(ch, "%s what?\n\r", ibt_types[subcmd]); - send_to_char(ch, "Usage: %s submit \n\r", ibt_types[subcmd]); + send_to_char(ch, "%s what?\r\n", ibt_types[subcmd]); + send_to_char(ch, "Usage: %s submit \r\n", ibt_types[subcmd]); return; } else { - send_to_char(ch, "Usage: %s (submit/list/show/remove/resolve)\n\r", CMD_NAME); + send_to_char(ch, "Usage: %s (submit/list/show/remove/resolve)\r\n", CMD_NAME); return; } } diff --git a/src/oedit.c b/src/oedit.c index 7838c5c..522273a 100644 --- a/src/oedit.c +++ b/src/oedit.c @@ -1081,7 +1081,7 @@ void oedit_parse(struct descriptor_data *d, char *arg) return; case OEDIT_APPLY: - if ((number = atoi(arg)) == 0) { + if (((number = atoi(arg)) == 0) || ((number = atoi(arg)) == 1)) { OLC_OBJ(d)->affected[OLC_VAL(d)].location = 0; OLC_OBJ(d)->affected[OLC_VAL(d)].modifier = 0; oedit_disp_prompt_apply_menu(d);