Only in ../../../muddy/src: .depend Only in .: CHANGES Common subdirectories: ./CVS and ../../../muddy/src/CVS diff ./act_comm.c ../../../muddy/src/act_comm.c 143c143 < --- > 156c156 < --- > 182c182 < --- > 185c185 < if (victim->reply == ch) --- > if (victim->reply == ch) 187c187 < victim->reply = NULL; --- > victim->reply = NULL; 234c234 < act("You should be free for charm to become peacefull!", --- > act("You should be free from charm to become peacefull!", 241c241 < act("You are already the most peace player in the world.", ch, NULL, NULL, TO_CHAR); --- > act("You are already the most peaceful player in the world.", ch, NULL, NULL, TO_CHAR); 247,248c247,248 < info(ch, 0, "{r[{RINFO{r]{W : %s activate {GPeaceful{z mode.{x\n", ch->name); < // wiznet_printf (ch, NULL, WIZ_PENALTIES, WIZ_SECURE, 0, "%s установил режим {MPEACEFUL{z.\n", ch->name); --- > info(ch, 0, "{r[{RINFO{r]{W : %s activates {GPeaceful{z mode.{x\n", ch->name); > // wiznet_printf (ch, NULL, WIZ_PENALTIES, WIZ_SECURE, 0, "%s has set {MPEACEFUL{z.\n", ch->name); 268c268 < char_act("С этого дня только implementor имеет право на суицид.\nНу, и мелкие всякие, но они не в счет :)", ch); --- > char_act("If the IMP suicides, who will control all the peons? :)", ch); 301c301 < --- > 305c305 < --- > 308c308 < --- > 310c310 < --- > 331c331 < char_act("Набери 'delete' еще раз для потверждения.\n{RВНИМАНИЕ!{x Это действие не имеет обратного хода!\nНабери '{Cdelete{x' с любым параметром, чтобы отменить удаление персонажа.", ch); --- > char_act("Type 'delete' again to delete. \n {R[ATTENTION]!{x this action is nonreversible! \nType '{Cdelete {x' with any parameter, in order to cancel the removal of the character.", ch); 335c335 < --- > 344,345c344,345 < < act_puts("music $t", ch, --- > > act_puts("music $t", ch, 348c348 < --- > 352c352 < --- > 392c392 < char_act("{RООС information :{x", ch); --- > char_act("{ROOC information :{x", ch); 402,403c402,403 < < act_puts("Тебе выводится $j $qj{строк} на экран.", ch, (const void*) (ch->lines+2), NULL, TO_CHAR, POS_DEAD); --- > > act_puts("Your client accepts $j $qj lines of text.", ch, (const void*) (ch->lines+2), NULL, TO_CHAR, POS_DEAD); 406,407c406,407 < char_act("Ты не можешь использовать 'tell'.", ch); < --- > char_act("You cannot use 'tell'.", ch); > 409c409 < char_act("Боги закрыли тебе доступ к каналам.", ch); --- > char_act("The gods have forbidden you the use of channels.", ch); 412c412 < char_act("Ты не можешь использовать 'emotions'.", ch); --- > char_act("You cannot use 'emotions'.", ch); 475,476c475,476 < < if (argument[0] == '\0') --- > > if (argument[0] == '\0') 483c483 < for (obj = ch->in_room->contents; obj != NULL; obj = obj->next_content) --- > for (obj = ch->in_room->contents; obj != NULL; obj = obj->next_content) 510,511c510,511 < < if (victim == NULL --- > > if (victim == NULL 532c532 < if (arg[0] == '\0' || argument[0] == '\0') --- > if (arg[0] == '\0' || argument[0] == '\0') 556c556 < char arg[MAX_INPUT_LENGTH]; --- > char arg[MAX_INPUT_LENGTH]; 571c571 < if (is_same_group(gch, ch)) --- > if (is_same_group(gch, ch)) 583c583 < (IS_AFFECTED(gch,AFF_CHARM)) && --- > (IS_AFFECTED(gch,AFF_CHARM)) && 590c590 < else --- > else 651c651 < --- > 656c656 < --- > 675c675 < --- > 680c680 < --- > 699,700c699,700 < < for (; *letter != '\0'; letter++) { --- > > for (; *letter != '\0'; letter++) { 710c710 < --- > 755c755 < --- > 840c840 < --- > 859c859 < && d->character != ch) --- > && d->character != ch) 884c884 < else --- > else 893c893 < --- > 910c910 < --- > 940c940 < else --- > else 949c949 < --- > 993c993 < else --- > else 1037c1037 < else --- > else 1046c1046 < --- > 1081c1081 < else --- > else 1090c1090 < --- > 1125c1125 < else --- > else 1134c1134 < --- > 1169c1169 < else --- > else 1178c1178 < --- > 1205c1205 < --- > 1213c1213 < else --- > else 1261c1261 < else --- > else 1268c1268 < --- > 1273c1273 < --- > 1280c1280 < && !IS_SET(vch->comm, COMM_NORTALK)) --- > && !IS_SET(vch->comm, COMM_NORTALK)) 1286c1286 < --- > 1293c1293 < if (argument[0] == '\0') --- > if (argument[0] == '\0') 1298c1298 < else --- > else 1311c1311 < if (argument[0] == '\0') --- > if (argument[0] == '\0') 1316c1316 < else --- > else 1334c1334 < if (IS_SET(ch->comm, COMM_NOCHANNELS)) --- > if (IS_SET(ch->comm, COMM_NOCHANNELS)) 1339c1339 < --- > 1345c1345 < for (d = descriptor_list; d; d = d->next) --- > for (d = descriptor_list; d; d = d->next) 1367,1368c1367,1368 < < if ((IS_NPC(ch) || IS_NPC(victim)) && (condition != ANET_WANTED_FOUND)) --- > > if ((IS_NPC(ch) || IS_NPC(victim)) && (condition != ANET_WANTED_FOUND)) 1370c1370 < if (ch == victim) --- > if (ch == victim) 1372c1372 < if (IS_IMMORTAL(ch) || IS_IMMORTAL(victim)) --- > if (IS_IMMORTAL(ch) || IS_IMMORTAL(victim)) 1375c1375 < if (is_affected(victim, gsn_doppelganger)) --- > if (is_affected(victim, gsn_doppelganger)) 1378,1379c1378,1379 < for (d = descriptor_list; d; d = d->next) < if ((d->connected == CON_PLAYING) --- > for (d = descriptor_list; d; d = d->next) > if ((d->connected == CON_PLAYING) 1381c1381 < if (ch == d->character) --- > if (ch == d->character) 1389c1389 < if (IS_NPC(agent) --- > if (IS_NPC(agent) 1419c1419 < else --- > else 1451c1451 < else --- > else 1460,1461c1460,1461 < < if (!anet_work) --- > > if (!anet_work) 1463c1463 < } --- > } 1741c1741 < --- > 1806c1806 < if (obj->pIndexData->limit != -1 --- > if (obj->pIndexData->limit != -1 1906c1906 < } --- > } 1915c1915 < if (ch->level < 1) --- > if (ch->level < 1) 1917c1917 < act("Тебе нужно достичь минимум 1 уровня для того, чтобы записаться.", --- > act("Тебе нужно достичь минимум 1 уровня для того, чтобы записаться.", 1933c1933 < if (arg[0] == '\0') --- > if (arg[0] == '\0') 1939c1939 < if ((victim = get_char_room(ch, arg)) == NULL) --- > if ((victim = get_char_room(ch, arg)) == NULL) 1945c1945 < if (IS_AFFECTED(ch, AFF_CHARM) && ch->master != NULL && !IS_NPC(ch)) --- > if (IS_AFFECTED(ch, AFF_CHARM) && ch->master != NULL && !IS_NPC(ch)) 1951c1951 < if (victim == ch) --- > if (victim == ch) 1953c1953 < if (ch->master == NULL) --- > if (ch->master == NULL) 1964c1964 < && !IS_IMMORTAL(ch)) --- > && !IS_IMMORTAL(ch)) 1971c1971 < --- > 1980c1980 < if (ch->master != NULL) --- > if (ch->master != NULL) 1996c1996 < if (ch->master == NULL) --- > if (ch->master == NULL) 2002c2002 < if (IS_AFFECTED(ch, AFF_CHARM)) --- > if (IS_AFFECTED(ch, AFF_CHARM)) 2008c2008 < if (can_see(ch->master, ch) && ch->in_room != NULL) --- > if (can_see(ch->master, ch) && ch->in_room != NULL) 2025c2025 < { --- > { 2082c2082 < if (arg[0] == '\0' || argument[0] == '\0') --- > if (arg[0] == '\0' || argument[0] == '\0') 2088c2088 < if (IS_AFFECTED(ch, AFF_CHARM)) --- > if (IS_AFFECTED(ch, AFF_CHARM)) 2094c2094 < if (!str_cmp(arg, "all") || !str_cmp(argument, "все")) --- > if (!str_cmp(arg, "all") || !str_cmp(argument, "все")) 2100c2100 < if ((victim = get_char_room(ch, arg)) == NULL) --- > if ((victim = get_char_room(ch, arg)) == NULL) 2106c2106 < if (victim == ch) --- > if (victim == ch) 2112,2113c2112,2113 < if (!IS_AFFECTED(victim, AFF_CHARM) || victim->master != ch < || (IS_IMMORTAL(victim) && victim->level >= ch->level)) --- > if (!IS_AFFECTED(victim, AFF_CHARM) || victim->master != ch > || (IS_IMMORTAL(victim) && victim->level >= ch->level)) 2121c2121 < for (och = ch->in_room->people; och != NULL; och = och_next) --- > for (och = ch->in_room->people; och != NULL; och = och_next) 2127c2127 < && (fAll || och == victim)) --- > && (fAll || och == victim)) 2138,2139c2138,2139 < act("Ты больше не хочешь выполнять эти идиотские приказы!", och, NULL, NULL, TO_CHAR); < }*/ --- > act("Ты больше не хочешь выполнять эти идиотские приказы!", och, NULL, NULL, TO_CHAR); > }*/ 2143c2143 < if (found) --- > if (found) 2218c2218 < if ((victim = get_char_room(ch, arg)) == NULL) --- > if ((victim = get_char_room(ch, arg)) == NULL) 2224c2224 < if (victim == ch) --- > if (victim == ch) 2230c2230 < if (ch->master != NULL || ch->leader != NULL) --- > if (ch->master != NULL || ch->leader != NULL) 2236c2236 < if (victim->master != ch && ch != victim) --- > if (victim->master != ch && ch != victim) 2241,2242c2241,2242 < < if (IS_AFFECTED(victim, AFF_CHARM)) --- > > if (IS_AFFECTED(victim, AFF_CHARM)) 2244c2244 < act("Ты не можешь исключить очарованных существ из своей группы.", --- > act("Ты не можешь исключить очарованных существ из своей группы.", 2248,2249c2248,2249 < < if (IS_AFFECTED(ch, AFF_CHARM)) --- > > if (IS_AFFECTED(ch, AFF_CHARM)) 2257c2257 < if (is_same_group(victim, ch) && ch != victim) --- > if (is_same_group(victim, ch) && ch != victim) 2259c2259 < if (ch->guarding == victim || victim->guarded_by == ch) --- > if (ch->guarding == victim || victim->guarded_by == ch) 2276c2276 < && !is_same_group(victim,victim->guarded_by)) --- > && !is_same_group(victim,victim->guarded_by)) 2287c2287 < if (ch->level - victim->level < -8 || ch->level - victim->level > 8) --- > if (ch->level - victim->level < -8 || ch->level - victim->level > 8) 2289c2289 < act_puts("$N не может присоединиться к группе $n.", --- > act_puts("$N не может присоединиться к группе $n.", 2291c2291 < act_puts("Ты не можешь присоединиться к группе $n.", --- > act_puts("Ты не можешь присоединиться к группе $n.", 2293c2293 < act_puts("$N не может присоединиться к твоей группе.", --- > act_puts("$N не может присоединиться к твоей группе.", 2298c2298 < if (IS_GOOD(ch) && IS_EVIL(victim)) --- > if (IS_GOOD(ch) && IS_EVIL(victim)) 2300c2300 < act_puts("Ты недостачно добр для группы $n!", --- > act_puts("Ты недостачно добр для группы $n!", 2302c2302 < act_puts("$N недостаточно добр для твоей группы!", --- > act_puts("$N недостаточно добр для твоей группы!", 2307c2307 < if (IS_GOOD(victim) && IS_EVIL(ch)) --- > if (IS_GOOD(victim) && IS_EVIL(ch)) 2309c2309 < act_puts("Ты слишком добр для группы $n!", --- > act_puts("Ты слишком добр для группы $n!", 2311c2311 < act_puts("$N слишком добр для твоей группы!", --- > act_puts("$N слишком добр для твоей группы!", 2317c2317 < || (ch->ethos == ETHOS_LAWFUL && victim->ethos == ETHOS_CHAOTIC)) --- > || (ch->ethos == ETHOS_LAWFUL && victim->ethos == ETHOS_CHAOTIC)) 2319c2319 < act_puts("Ничего не получится. Слишком разные жизненные позиции у вас...", --- > act_puts("Ничего не получится. Слишком разные жизненные позиции у вас...", 2321c2321 < act_puts("Ничего не получится. Слишком разные жизненные позиции у вас...", --- > act_puts("Ничего не получится. Слишком разные жизненные позиции у вас...", 2329c2329 < || (HAS_SKILL(ch, gsn_mastering_spell) --- > || (HAS_SKILL(ch, gsn_mastering_spell) 2331,2332c2331,2332 < || (HAS_SKILL(ch, gsn_spellbane) < && HAS_SKILL(victim, gsn_mastering_spell))) --- > || (HAS_SKILL(ch, gsn_spellbane) > && HAS_SKILL(victim, gsn_mastering_spell))) 2334c2334 < act_puts("Ты ненавидишь религию $n, как ты можешь вступить в $gn{его} группу?", --- > act_puts("Ты ненавидишь религию $n, как ты можешь вступить в $gn{его} группу?", 2336c2336 < act_puts("Ты ненавидишь религию $N, как ты можешь принять $N в свою группу?", --- > act_puts("Ты ненавидишь религию $N, как ты можешь принять $N в свою группу?", 2370c2370 < --- > 2393c2393 < --- > 2406c2406 < --- > 2477c2477 < --- > 2502,2503c2502,2503 < return is_name_raw(ch->name, < vch->pcdata->linked_list, --- > return is_name_raw(ch->name, > vch->pcdata->linked_list, 2509c2509 < return (!IS_NULLSTR(ch->pcdata->linked_list) --- > return (!IS_NULLSTR(ch->pcdata->linked_list) 2522c2522 < --- > 2589c2589 < strnzcpy(buf, sizeof(buf), capitalize(ch->name)); --- > strnzcpy(buf, sizeof(buf), capitalize(ch->name)); 2649c2649 < if (is_linked(vch1, vch2) && is_linked(vch2, vch1)) --- > if (is_linked(vch1, vch2) && is_linked(vch2, vch1)) 2659c2659 < if (strlen(vch1->pcdata->linked_list) + --- > if (strlen(vch1->pcdata->linked_list) + 2669c2669 < --- > 2687c2687 < --- > 2698c2698 < { --- > { 2736c2736 < --- > 2745c2745 < --- > 2757c2757 < --- > 2759c2759 < { --- > { 2768c2768 < --- > 2777c2777 < if (supervisor && (!str_cmp(command, "remove") --- > if (supervisor && (!str_cmp(command, "remove") 2795c2795 < --- > 2803c2803 < log_printf("Links: passwords of %s and %s@%s doesn't compare.", --- > log_printf("Links: passwords of %s and %s@%s doesn't compare.", 2835c2835 < { --- > { 2855c2855 < */ --- > */ 2870c2870 < --- > 2979c2979 < { --- > { 2981c2981 < --- > 2988c2988 < if (arg[0] == '\0') --- > if (arg[0] == '\0') 2990c2990 < if (!ch->pcdata->trust) --- > if (!ch->pcdata->trust) 2996c2996 < if (IS_SET(ch->pcdata->trust, TRUST_ALL)) --- > if (IS_SET(ch->pcdata->trust, TRUST_ALL)) 3001c3001 < if (IS_SET(ch->pcdata->trust, TRUST_CLAN)) --- > if (IS_SET(ch->pcdata->trust, TRUST_CLAN)) 3010c3010 < if (!str_cmp(arg, "clan") || !str_cmp(argument, "клан")) --- > if (!str_cmp(arg, "clan") || !str_cmp(argument, "клан")) 3012c3012 < if (ch->clan == 0) --- > if (ch->clan == 0) 3019c3019 < if (IS_SET(ch->pcdata->trust, TRUST_CLAN)) --- > if (IS_SET(ch->pcdata->trust, TRUST_CLAN)) 3024c3024 < else --- > else 3029c3029 < if (!str_cmp(arg, "group") || !str_prefix(argument, "группа")) --- > if (!str_cmp(arg, "group") || !str_prefix(argument, "группа")) 3032c3032 < if (IS_SET(ch->pcdata->trust, TRUST_GROUP)) --- > if (IS_SET(ch->pcdata->trust, TRUST_GROUP)) 3042c3042 < if (!str_cmp(arg, "align") || !str_prefix(argument, "алигн")) --- > if (!str_cmp(arg, "align") || !str_prefix(argument, "алигн")) 3045c3045 < if (IS_SET(ch->pcdata->trust, TRUST_ALIGN)) --- > if (IS_SET(ch->pcdata->trust, TRUST_ALIGN)) 3055c3055 < if (!str_cmp(arg, "all") || !str_cmp(argument, "все")) --- > if (!str_cmp(arg, "all") || !str_cmp(argument, "все")) 3062c3062 < if (!str_cmp(arg, "none") || !str_prefix(argument, "никому")) --- > if (!str_cmp(arg, "none") || !str_prefix(argument, "никому")) 3078c3078 < --- > 3107c3107 < --- > 3117,3118c3117,3118 < < --- > > 3120,3121c3120,3121 < < if (!IS_SET(clan->flags, CLAN_RULERS) || (!IS_IMMORTAL(ch))) --- > > if (!IS_SET(clan->flags, CLAN_RULERS) || (!IS_IMMORTAL(ch))) 3126c3126 < --- > 3128,3129c3128,3129 < if (arg[0] == '\0') < { --- > if (arg[0] == '\0') > { 3136,3137c3136,3137 < < if (((victim = get_char_world(ch, arg)) == NULL) || IS_NPC(victim)) --- > > if (((victim = get_char_world(ch, arg)) == NULL) || IS_NPC(victim)) 3142,3143c3142,3143 < < if (!is_affected(victim, gsn_arrest)) --- > > if (!is_affected(victim, gsn_arrest)) 3150,3151c3150,3151 < < if (arg[0] == '\0') --- > > if (arg[0] == '\0') 3156c3156 < --- > 3175c3175 < else --- > else 3177c3177 < if (!is_number(arg)) --- > if (!is_number(arg)) 3184,3185c3184,3185 < < if (tic < 0) --- > > if (tic < 0) 3191c3191 < if (tic > victim->level * 4) --- > if (tic > victim->level * 4) 3197c3197 < --- > 3208c3208 < agent_net_printf(ch, victim, ANET_CONDEMN); --- > agent_net_printf(ch, victim, ANET_CONDEMN); 3218c3218 < --- > 3220,3221c3220,3221 < < if (!IS_SET(clan->flags, CLAN_RULERS) && !IS_IMMORTAL(ch)) --- > > if (!IS_SET(clan->flags, CLAN_RULERS) && !IS_IMMORTAL(ch)) 3229,3230c3229,3230 < < if (arg[0] == '\0') --- > > if (arg[0] == '\0') 3236c3236 < if (arg2[0] == '\0') --- > if (arg2[0] == '\0') 3248c3248 < if ((victim = get_char_world(ch, arg)) == NULL) --- > if ((victim = get_char_world(ch, arg)) == NULL) 3254c3254 < if (IS_NPC(victim)) --- > if (IS_NPC(victim)) 3260c3260 < if (IS_IMMORTAL(victim) && ch->level < victim->level) --- > if (IS_IMMORTAL(victim) && ch->level < victim->level) 3266c3266 < if (ch->pcdata->clan_status == CLAN_NEWBIE) --- > if (ch->pcdata->clan_status == CLAN_NEWBIE) 3272c3272 < if (victim == ch) --- > if (victim == ch) 3289c3289 < if (is_affected(ch, gsn_arrest)) --- > if (is_affected(ch, gsn_arrest)) 3344c3344 < --- > 3350c3350 < --- > 3356c3356 < --- > 3443c3443 < ch, (const void *) amount, victim, TO_CHAR); //T --- > ch, (const void *) amount, victim, TO_CHAR); //T 3447c3447 < act("The head {C$N {x now costs {Y$j gold {x.", --- > act("The head {C$N {x now costs {Y$j gold {x.", 3462c3462 < --- > 3543c3543 < --- > 3569c3569 < struct toggle_t --- > struct toggle_t 3606c3606 < #define MSG_TOGGLE_MEMO_ON "Now you will set memorials on kill." --- > #define MSG_TOGGLE_MEMO_ON "Now you will set memorials on kill." 3609c3609 < #define MSG_TOGGLE_AGENT_OFF "Now you will not see agentnet info." --- > #define MSG_TOGGLE_AGENT_OFF "Now you will not see agentnet info." 3611c3611 < #define MSG_TOGGLE_WAR_OFF "Now you will not see war info." --- > #define MSG_TOGGLE_WAR_OFF "Now you will not see war info." 3704,3705c3704,3705 < { "agentnet", MSG_TOGGLE_AGENTNET, comm_flags, COMM_AGENTNET, MSG_TOGGLE_AGENT_ON, MSG_TOGGLE_AGENT_OFF, 1 }, < { "warinfo", MSG_TOGGLE_WARINFO, comm_flags, COMM_WARINFO, MSG_TOGGLE_WAR_ON, MSG_TOGGLE_WAR_OFF, 1 }, --- > { "agentnet", MSG_TOGGLE_AGENTNET, comm_flags, COMM_AGENTNET, MSG_TOGGLE_AGENT_ON, MSG_TOGGLE_AGENT_OFF, 1 }, > { "warinfo", MSG_TOGGLE_WARINFO, comm_flags, COMM_WARINFO, MSG_TOGGLE_WAR_ON, MSG_TOGGLE_WAR_OFF, 1 }, 3733c3733 < if (arg[0] == '\0') --- > if (arg[0] == '\0') 3742c3742 < for (; arg[0]; argument = one_argument(argument, arg, sizeof(arg))) --- > for (; arg[0]; argument = one_argument(argument, arg, sizeof(arg))) 3782c3782 < --- > 3788c3788 < --- > 3946c3946 < if (arg[0] == '\0') --- > if (arg[0] == '\0') 3952c3952 < if ((victim = get_char_room(ch, arg)) == NULL) --- > if ((victim = get_char_room(ch, arg)) == NULL) Only in ../../../muddy/src: act_comm.o Only in ../../../muddy/src: act_comm.txt Only in ../../../muddy/src: act_info.o Only in ../../../muddy/src: act_move.o Only in ../../../muddy/src: act_obj.o Only in ../../../muddy/src: act_wiz.o Only in ../../../muddy/src: align.o diff ./argument.h ../../../muddy/src/argument.h 45,46c45,46 < #define GET_F_CHECK_FORM (W) // if argument is a name of form, < // we'll search for victim with this form --- > #define GET_F_CHECK_FORM (W) // if argument is a name of form, > // we'll search for victim with this form 50,51c50,51 < #define GET_F_WEAR (Z) // obj->wear_loc != WEAR_NONE (worn) < --- > #define GET_F_WEAR (Z) // obj->wear_loc != WEAR_NONE (worn) > 60,65c60,65 < CHAR_DATA * get_char_room_ext (CHAR_DATA *ch, const char *argument, int flags); < CHAR_DATA * get_char_area_ext (CHAR_DATA *ch, const char *argument, int flags); < CHAR_DATA * get_char_world_ext (CHAR_DATA *ch, const char *argument, int flags); < < CHAR_DATA * find_char_ext (CHAR_DATA *ch, const char *argument, int door, int range, int flags); < CHAR_DATA * get_char_spell_ext (CHAR_DATA *ch, const char *argument, int *door, int range, int flags); --- > CHAR_DATA *get_char_room_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); > CHAR_DATA *get_char_area_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); > CHAR_DATA *get_char_world_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); > > CHAR_DATA *find_char_ext (CHAR_DATA *ch, const char *argument, int door, int range, flag32_t flags); > CHAR_DATA *get_char_spell_ext (CHAR_DATA *ch, const char *argument, int *door, int range, flag32_t flags); 70,76c70,76 < < OBJ_DATA * get_obj_list_ext (CHAR_DATA *ch, const char *argument, OBJ_DATA *list, int flags); < OBJ_DATA * get_obj_carry_ext (CHAR_DATA *ch, const char *argument, int flags); < OBJ_DATA * get_obj_wear_ext (CHAR_DATA *ch, const char *argument, int flags); < OBJ_DATA * get_obj_here_ext (CHAR_DATA *ch, const char *argument, int flags); < OBJ_DATA * get_obj_room_ext (CHAR_DATA *ch, const char *argument, int flags); < OBJ_DATA * get_obj_world_ext (CHAR_DATA *ch, const char *argument, int flags); --- > > OBJ_DATA *get_obj_list_ext (CHAR_DATA *ch, const char *argument, OBJ_DATA *list, flag32_t flags); > OBJ_DATA *get_obj_carry_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); > OBJ_DATA *get_obj_wear_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); > OBJ_DATA *get_obj_here_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); > OBJ_DATA *get_obj_room_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); > OBJ_DATA *get_obj_world_ext (CHAR_DATA *ch, const char *argument, flag32_t flags); Only in ../../../muddy/src: argument.o Only in ../../../muddy/src: auction.o Only in ../../../muddy/src: buffer.o Only in ../../../muddy/src: callback.o Only in ../../../muddy/src: casino.o Only in ../../../muddy/src: clan.o Only in ../../../muddy/src: class.o Common subdirectories: ./comm and ../../../muddy/src/comm Only in ../../../muddy/src: conquer.o Only in ../../../muddy/src: crash.o Only in ../../../muddy/src: cyborg.o Common subdirectories: ./db and ../../../muddy/src/db Only in ../../../muddy/src: effects.o Only in ../../../muddy/src: event.o Only in ../../../muddy/src: ext_flags.o Only in ../../../muddy/src: fight.o Only in ../../../muddy/src: fighters.o Only in ../../../muddy/src: flag.o Only in ../../../muddy/src: force.o Only in ../../../muddy/src: gambling.o Only in ../../../muddy/src: gquest.o Only in ../../../muddy/src: handler.o Only in ../../../muddy/src: healer.o Only in ../../../muddy/src: help.o Only in ../../../muddy/src: hunt.o Only in ../../../muddy/src: immortal.o Common subdirectories: ./intermud and ../../../muddy/src/intermud Only in ../../../muddy/src: interp.o Common subdirectories: ./irc and ../../../muddy/src/irc Only in ../../../muddy/src: keyring.o Only in ../../../muddy/src: limited.o Only in ../../../muddy/src: log.o Only in ../../../muddy/src: lookup.o Only in ../../../muddy/src: magic.o Only in ../../../muddy/src: magic2.o Only in ../../../muddy/src: magic3.o Only in ../../../muddy/src: magic_gm.o Only in ../../../muddy/src: marry.o Only in ../../../muddy/src: martial_art.o Only in ../../../muddy/src: material.o Only in ../../../muddy/src: mccp.o Only in ../../../muddy/src: mem.o Only in ../../../muddy/src: memento.o Only in ../../../muddy/src: meteor.o Only in ../../../muddy/src: mgrep.o Only in ../../../muddy/src: mining.o Only in ../../../muddy/src: mlstring.o Only in ../../../muddy/src: mob_cmds.o Only in ../../../muddy/src: mob_prog.o Only in ../../../muddy/src: muddy.exe Only in ../../../muddy/src: namedp.o Only in ../../../muddy/src: note.o Only in ../../../muddy/src: obj_cmds.o Only in ../../../muddy/src: obj_prog.o Only in ../../../muddy/src: ogrep.o Common subdirectories: ./olc and ../../../muddy/src/olc Only in ../../../muddy/src: planets.o Only in ../../../muddy/src: price.o Only in ../../../muddy/src: psionics.o Only in ../../../muddy/src: quest.o Only in ../../../muddy/src: race.o Only in ../../../muddy/src: raffects.o Only in ../../../muddy/src: rating.o Only in ../../../muddy/src: recycle.o Only in ../../../muddy/src: religion.o Only in ../../../muddy/src: repair.o Only in ../../../muddy/src: rgrep.o Only in ../../../muddy/src: riddle.o Only in ../../../muddy/src: room_cmds.o diff ./save.c ../../../muddy/src/save.c 1154c1154 < ch->lang = lang_lookup ("rus") ; --- > ch->lang = lang_lookup ("eng") ; 2898c2898 < // load an undead from pfile --- > // load an undead from pfile Only in ../../../muddy/src: save.o Only in ../../../muddy/src: security.o Only in ../../../muddy/src: set.o Only in ../../../muddy/src: shamans.o Only in ../../../muddy/src: skills.o Only in ../../../muddy/src: special.o Only in ../../../muddy/src: stock.o diff ./str.c ../../../muddy/src/str.c 114c114 < --- > 168c168 < char *strlwr(const char *s) --- > char *_EXFUN(strlwr,(char *s)) 283c283 < 170, 7, 115, 167, 241, 206, 3, 150, 55, 59, 151, 220, 90, 53, 23, 131, --- > 170, 7, 115, 167, 241, 206, 3, 150, 55, 59, 151, 220, 90, 53, 23, 131, 346c346 < s->ref = 0; --- > s->ref = 0; 391c391 < --- > 640c640 < #endif --- > #endif 645c645 < int toupper1 (int c) --- > int toupper1 (int c) 651c651 < int tolower1 (int c) --- > int tolower1 (int c) 657c657 < int isupper1 (int c) --- > int isupper1 (int c) 662c662 < int islower1 (int c) --- > int islower1 (int c) diff ./str.h ../../../muddy/src/str.h 36c36 < --- > 47c47,48 < char * strlwr(const char *s); --- > char *_EXFUN(strlwr,(char *)); > //char * strlwr(const char *s); Only in ../../../muddy/src: str.o diff ./string_edit.c ../../../muddy/src/string_edit.c 19c19 < --- > 24c24 < * around, comes around. * --- > * around, comes around. * 82c82 < --- > 89c89 < --- > 174c174 < --- > 196c196 < --- > 222c222 < --- > 256c256 < *ch->desc->pString = str_printf("%s%s", --- > *ch->desc->pString = str_printf("%s%s", 259,261c259,261 < else < *ch->desc->pString = str_printf("%s%s\n", < *ch->desc->pString, argument); --- > else > *ch->desc->pString = str_printf("%s%s\n", > *ch->desc->pString, argument); 281c281 < --- > 286c286 < --- > 288c288 < --- > 310c310 < if (xbuf[i-1]==' ' && xbuf[i-2]==' ' && --- > if (xbuf[i-1]==' ' && xbuf[i-2]==' ' && 325c325 < if (xbuf[i-1]==' ' && xbuf[i-2]==' ' && --- > if (xbuf[i-1]==' ' && xbuf[i-2]==' ' && 376c376 < --- > 378c378 < --- > 380c380 < --- > 480c480 < /* --- > /* 483c483 < const char *getline(const char *str, char *buf, size_t len) --- > const char *mgetline(const char *str, char *buf, size_t len) 492c492 < --- > 498c498 < --- > 511c511 < string = getline(string, tmpb, sizeof(tmpb)); --- > string = mgetline(string, tmpb, sizeof(tmpb)); Only in ../../../muddy/src: string_edit.o Only in ../../../muddy/src: tables.o Only in ../../../muddy/src: todo.o Only in ../../../muddy/src: update.o Only in ../../../muddy/src: util.o Only in ../../../muddy/src: varr.o Only in ../../../muddy/src: wanderers.o Only in ../../../muddy/src: war.o Only in ../../../muddy/src: weather.o Only in ../../../muddy/src: wquest.o Only in ../../../muddy/src: ~$t_comm.txt