diff -uprN ./pure/src/act.informative.c ./mod/src/act.informative.c --- ./pure/src/act.informative.c Sun Apr 14 01:08:31 1996 +++ ./mod/src/act.informative.c Fri Oct 3 19:24:38 1997 @@ -1277,25 +1277,25 @@ void print_object_location(int num, stru sprintf(buf, "%33s", " - "); if (obj->in_room > NOWHERE) { - sprintf(buf + strlen(buf), "[%5d] %s\n\r", + sprintf(buf + strlen(buf), "[%5d] %s\r\n", world[obj->in_room].number, world[obj->in_room].name); send_to_char(buf, ch); } else if (obj->carried_by) { - sprintf(buf + strlen(buf), "carried by %s\n\r", + sprintf(buf + strlen(buf), "carried by %s\r\n", PERS(obj->carried_by, ch)); send_to_char(buf, ch); } else if (obj->worn_by) { - sprintf(buf + strlen(buf), "worn by %s\n\r", + sprintf(buf + strlen(buf), "worn by %s\r\n", PERS(obj->worn_by, ch)); send_to_char(buf, ch); } else if (obj->in_obj) { - sprintf(buf + strlen(buf), "inside %s%s\n\r", + sprintf(buf + strlen(buf), "inside %s%s\r\n", obj->in_obj->short_description, (recur ? ", which is" : " ")); send_to_char(buf, ch); if (recur) print_object_location(0, obj->in_obj, ch, recur); } else { - sprintf(buf + strlen(buf), "in an unknown location\n\r"); + sprintf(buf + strlen(buf), "in an unknown location\r\n"); send_to_char(buf, ch); } } diff -uprN ./pure/src/interpreter.c ./mod/src/interpreter.c --- ./pure/src/interpreter.c Fri Apr 12 21:39:21 1996 +++ ./mod/src/interpreter.c Fri Oct 3 19:25:16 1997 @@ -1461,7 +1461,7 @@ void nanny(struct descriptor_data *d, ch } else { save_char(d->character, NOWHERE); echo_on(d); - SEND_TO_Q("\r\nDone.\n\r", d); + SEND_TO_Q("\r\nDone.\r\n", d); SEND_TO_Q(MENU, d); STATE(d) = CON_MENU; } diff -uprN ./pure/src/modify.c ./mod/src/modify.c --- ./pure/src/modify.c Fri Apr 12 21:39:21 1996 +++ ./mod/src/modify.c Fri Oct 3 19:25:50 1997 @@ -131,7 +131,7 @@ ACMD(do_skillset) if (!*name) { /* no arguments. print an informative text */ send_to_char("Syntax: skillset '' \r\n", ch); - strcpy(help, "Skill being one of the following:\n\r"); + strcpy(help, "Skill being one of the following:\r\n"); for (i = 0; *spells[i] != '\n'; i++) { if (*spells[i] == '!') continue; @@ -144,7 +144,7 @@ ACMD(do_skillset) } if (*help) send_to_char(help, ch); - send_to_char("\n\r", ch); + send_to_char("\r\n", ch); return; } if (!(vict = get_char_vis(ch, name))) { @@ -155,11 +155,11 @@ ACMD(do_skillset) /* If there is no chars in argument */ if (!*argument) { - send_to_char("Skill name expected.\n\r", ch); + send_to_char("Skill name expected.\r\n", ch); return; } if (*argument != '\'') { - send_to_char("Skill must be enclosed in: ''\n\r", ch); + send_to_char("Skill must be enclosed in: ''\r\n", ch); return; } /* Locate the last quote && lowercase the magic words (if any) */ @@ -168,33 +168,33 @@ ACMD(do_skillset) *(argument + qend) = LOWER(*(argument + qend)); if (*(argument + qend) != '\'') { - send_to_char("Skill must be enclosed in: ''\n\r", ch); + send_to_char("Skill must be enclosed in: ''\r\n", ch); return; } strcpy(help, (argument + 1)); help[qend - 1] = '\0'; if ((skill = find_skill_num(help)) <= 0) { - send_to_char("Unrecognized skill.\n\r", ch); + send_to_char("Unrecognized skill.\r\n", ch); return; } argument += qend + 1; /* skip to next parameter */ argument = one_argument(argument, buf); if (!*buf) { - send_to_char("Learned value expected.\n\r", ch); + send_to_char("Learned value expected.\r\n", ch); return; } value = atoi(buf); if (value < 0) { - send_to_char("Minimum value for learned is 0.\n\r", ch); + send_to_char("Minimum value for learned is 0.\r\n", ch); return; } if (value > 100) { - send_to_char("Max value for learned is 100.\n\r", ch); + send_to_char("Max value for learned is 100.\r\n", ch); return; } if (IS_NPC(vict)) { - send_to_char("You can't set NPC skills.\n\r", ch); + send_to_char("You can't set NPC skills.\r\n", ch); return; } sprintf(buf2, "%s changed %s's %s to %d.", GET_NAME(ch), GET_NAME(vict), @@ -203,7 +203,7 @@ ACMD(do_skillset) SET_SKILL(vict, skill, value); - sprintf(buf2, "You change %s's %s to %d.\n\r", GET_NAME(vict), + sprintf(buf2, "You change %s's %s to %d.\r\n", GET_NAME(vict), spells[skill], value); send_to_char(buf2, ch); } diff -uprN ./pure/src/shop.c ./mod/src/shop.c --- ./pure/src/shop.c Fri Apr 12 21:39:21 1996 +++ ./mod/src/shop.c Fri Oct 3 19:27:49 1997 @@ -442,13 +442,13 @@ void shopping_buy(char *arg, struct char } } if ((IS_CARRYING_N(ch) + 1 > CAN_CARRY_N(ch))) { - sprintf(buf, "%s: You can't carry any more items.\n\r", + sprintf(buf, "%s: You can't carry any more items.\r\n", fname(obj->name)); send_to_char(buf, ch); return; } if ((IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj)) > CAN_CARRY_W(ch)) { - sprintf(buf, "%s: You can't carry that much weight.\n\r", + sprintf(buf, "%s: You can't carry that much weight.\r\n", fname(obj->name)); send_to_char(buf, ch); return; @@ -499,7 +499,7 @@ void shopping_buy(char *arg, struct char sprintf(buf, shop_index[shop_nr].message_buy, GET_NAME(ch), goldamt); do_tell(keeper, buf, cmd_tell, 0); - sprintf(buf, "You now have %s.\n\r", tempstr); + sprintf(buf, "You now have %s.\r\n", tempstr); send_to_char(buf, ch); if (SHOP_USES_BANK(shop_nr)) @@ -679,7 +679,7 @@ void shopping_sell(char *arg, struct cha sprintf(buf, shop_index[shop_nr].message_sell, GET_NAME(ch), goldamt); do_tell(keeper, buf, cmd_tell, 0); - sprintf(buf, "The shopkeeper now has %s.\n\r", tempstr); + sprintf(buf, "The shopkeeper now has %s.\r\n", tempstr); send_to_char(buf, ch); if (GET_GOLD(keeper) < MIN_OUTSIDE_BANK) { @@ -741,7 +741,7 @@ char *list_object(struct obj_data * obj, if (GET_OBJ_VAL(obj, 2) < GET_OBJ_VAL(obj, 1)) strcat(buf3, " (partially used)"); - sprintf(buf2, "%-48s %6d\n\r", buf3, buy_price(obj, shop_nr)); + sprintf(buf2, "%-48s %6d\r\n", buf3, buy_price(obj, shop_nr)); strcat(buf, CAP(buf2)); return (buf); } @@ -761,8 +761,8 @@ void shopping_list(char *arg, struct cha sort_keeper_objs(keeper, shop_nr); one_argument(arg, name); - strcpy(buf, " ## Available Item Cost\n\r"); - strcat(buf, "-------------------------------------------------------------------------\n\r"); + strcpy(buf, " ## Available Item Cost\r\n"); + strcat(buf, "-------------------------------------------------------------------------\r\n"); if (keeper->carrying) for (obj = keeper->carrying; obj; obj = obj->next_content) if (CAN_SEE_OBJ(ch, obj) && (obj->obj_flags.cost > 0)) { @@ -782,9 +782,9 @@ void shopping_list(char *arg, struct cha index++; if (!last_obj) if (*name) - strcpy(buf, "Presently, none of those are for sale.\n\r"); + strcpy(buf, "Presently, none of those are for sale.\r\n"); else - strcpy(buf, "Currently, there is nothing for sale.\n\r"); + strcpy(buf, "Currently, there is nothing for sale.\r\n"); else if (!(*name) || isname(name, last_obj->name)) strcat(buf, list_object(last_obj, cnt, index, shop_nr)); @@ -1085,11 +1085,11 @@ void list_all_shops(struct char_data * c { int shop_nr; - strcpy(buf, "\n\r"); + strcpy(buf, "\r\n"); for (shop_nr = 0; shop_nr < top_shop; shop_nr++) { if (!(shop_nr % 19)) { - strcat(buf, " ## Virtual Where Keeper Buy Sell Customers\n\r"); - strcat(buf, "---------------------------------------------------------\n\r"); + strcat(buf, " ## Virtual Where Keeper Buy Sell Customers\r\n"); + strcat(buf, "---------------------------------------------------------\r\n"); } sprintf(buf2, "%3d %6d %6d ", shop_nr + 1, SHOP_NUM(shop_nr), SHOP_ROOM(shop_nr, 0)); @@ -1100,7 +1100,7 @@ void list_all_shops(struct char_data * c sprintf(END_OF(buf2), "%s %3.2f %3.2f ", buf1, SHOP_SELLPROFIT(shop_nr), SHOP_BUYPROFIT(shop_nr)); strcat(buf2, customer_string(shop_nr, FALSE)); - sprintf(END_OF(buf), "%s\n\r", buf2); + sprintf(END_OF(buf), "%s\r\n", buf2); } page_string(ch->desc, buf, 1); @@ -1112,7 +1112,7 @@ void handle_detailed_list(char *buf, cha if ((strlen(buf1) + strlen(buf) < 78) || (strlen(buf) < 20)) strcat(buf, buf1); else { - strcat(buf, "\n\r"); + strcat(buf, "\r\n"); send_to_char(buf, ch); sprintf(buf, " %s", buf1); } @@ -1125,7 +1125,7 @@ void list_detailed_shop(struct char_data struct char_data *k; int index, temp; - sprintf(buf, "Vnum: [%5d], Rnum: [%5d]\n\r", SHOP_NUM(shop_nr), + sprintf(buf, "Vnum: [%5d], Rnum: [%5d]\r\n", SHOP_NUM(shop_nr), shop_nr + 1); send_to_char(buf, ch); @@ -1140,28 +1140,28 @@ void list_detailed_shop(struct char_data handle_detailed_list(buf, buf1, ch); } if (!index) - send_to_char("Rooms: None!\n\r", ch); + send_to_char("Rooms: None!\r\n", ch); else { - strcat(buf, "\n\r"); + strcat(buf, "\r\n"); send_to_char(buf, ch); } strcpy(buf, "Shopkeeper: "); if (SHOP_KEEPER(shop_nr) >= 0) { - sprintf(END_OF(buf), "%s (#%d), Special Function: %s\n\r", + sprintf(END_OF(buf), "%s (#%d), Special Function: %s\r\n", GET_NAME(&mob_proto[SHOP_KEEPER(shop_nr)]), mob_index[SHOP_KEEPER(shop_nr)].virtual, YESNO(SHOP_FUNC(shop_nr))); if ((k = get_char_num(SHOP_KEEPER(shop_nr)))) { send_to_char(buf, ch); - sprintf(buf, "Coins: [%9d], Bank: [%9d] (Total: %d)\n\r", + sprintf(buf, "Coins: [%9d], Bank: [%9d] (Total: %d)\r\n", GET_GOLD(k), SHOP_BANK(shop_nr), GET_GOLD(k) + SHOP_BANK(shop_nr)); } } else - strcat(buf, "\n\r"); + strcat(buf, "\r\n"); send_to_char(buf, ch); strcpy(buf1, customer_string(shop_nr, TRUE)); - sprintf(buf, "Customers: %s\n\r", (*buf1) ? buf1 : "None"); + sprintf(buf, "Customers: %s\r\n", (*buf1) ? buf1 : "None"); send_to_char(buf, ch); strcpy(buf, "Produces: "); @@ -1174,9 +1174,9 @@ void list_detailed_shop(struct char_data handle_detailed_list(buf, buf1, ch); } if (!index) - send_to_char("Produces: Nothing!\n\r", ch); + send_to_char("Produces: Nothing!\r\n", ch); else { - strcat(buf, "\n\r"); + strcat(buf, "\r\n"); send_to_char(buf, ch); } @@ -1193,20 +1193,20 @@ void list_detailed_shop(struct char_data handle_detailed_list(buf, buf1, ch); } if (!index) - send_to_char("Buys: Nothing!\n\r", ch); + send_to_char("Buys: Nothing!\r\n", ch); else { - strcat(buf, "\n\r"); + strcat(buf, "\r\n"); send_to_char(buf, ch); } sprintf(buf, "Buy at: [%4.2f], Sell at: [%4.2f], Open: [%d-%d, %d-%d]%s", SHOP_SELLPROFIT(shop_nr), SHOP_BUYPROFIT(shop_nr), SHOP_OPEN1(shop_nr), - SHOP_CLOSE1(shop_nr), SHOP_OPEN2(shop_nr), SHOP_CLOSE2(shop_nr), "\n\r"); + SHOP_CLOSE1(shop_nr), SHOP_OPEN2(shop_nr), SHOP_CLOSE2(shop_nr), "\r\n"); send_to_char(buf, ch); sprintbit((long) SHOP_BITVECTOR(shop_nr), shop_bits, buf1); - sprintf(buf, "Bits: %s\n\r", buf1); + sprintf(buf, "Bits: %s\r\n", buf1); send_to_char(buf, ch); } @@ -1224,7 +1224,7 @@ void show_shops(struct char_data * ch, c break; if (shop_nr == top_shop) { - send_to_char("This isn't a shop!\n\r", ch); + send_to_char("This isn't a shop!\r\n", ch); return; } } else if (is_number(arg)) @@ -1233,7 +1233,7 @@ void show_shops(struct char_data * ch, c shop_nr = -1; if ((shop_nr < 0) || (shop_nr >= top_shop)) { - send_to_char("Illegal shop number.\n\r", ch); + send_to_char("Illegal shop number.\r\n", ch); return; } list_detailed_shop(ch, shop_nr); diff -uprN ./pure/src/spells.c ./mod/src/spells.c --- ./pure/src/spells.c Fri Apr 12 21:39:22 1996 +++ ./mod/src/spells.c Fri Oct 3 19:26:15 1997 @@ -192,19 +192,19 @@ ASPELL(spell_locate_object) continue; if (i->carried_by) - sprintf(buf, "%s is being carried by %s.\n\r", + sprintf(buf, "%s is being carried by %s.\r\n", i->short_description, PERS(i->carried_by, ch)); else if (i->in_room != NOWHERE) - sprintf(buf, "%s is in %s.\n\r", i->short_description, + sprintf(buf, "%s is in %s.\r\n", i->short_description, world[i->in_room].name); else if (i->in_obj) - sprintf(buf, "%s is in %s.\n\r", i->short_description, + sprintf(buf, "%s is in %s.\r\n", i->short_description, i->in_obj->short_description); else if (i->worn_by) - sprintf(buf, "%s is being worn by %s.\n\r", + sprintf(buf, "%s is being worn by %s.\r\n", i->short_description, PERS(i->worn_by, ch)); else - sprintf(buf, "%s's location is uncertain.\n\r", + sprintf(buf, "%s's location is uncertain.\r\n", i->short_description); CAP(buf); @@ -213,7 +213,7 @@ ASPELL(spell_locate_object) } if (j == level >> 1) - send_to_char("You sense nothing.\n\r", ch); + send_to_char("You sense nothing.\r\n", ch); }