ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.81 by elmex, Mon Oct 6 18:26:35 2008 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
25 * Object (handling) commands 26 * Object (handling) commands
26 */ 27 */
27 28
28#include <global.h> 29#include <global.h>
29#include <loader.h>
30#include <skills.h> 30#include <skills.h>
31#include <sproto.h> 31#include <sproto.h>
32#include <living.h> 32#include <living.h>
33#include <math.h>
34 33
35/* 34/*
36 * Object id parsing functions 35 * Object id parsing functions
37 */ 36 */
38 37
… …
133 { 132 {
134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 133 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135 return 0; 134 return 0;
136 } 135 }
137 136
138 skill = find_skill_by_name (pl, params); 137 skill = find_skill_by_name_fuzzy (pl, params);
139 138
140 if (!skill) 139 if (!skill)
141 { 140 {
142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 141 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the %s skill.", params);
143 return 0; 142 return 0;
144 } 143 }
145 144
146 pl->change_skill (0); 145 pl->apply (skill);
147 apply_special (pl, skill, AP_APPLY);
148 return 1; 146 return 1;
149}
150
151/* These functions (command_search, command_disarm) are really just wrappers for
152 * things like 'use_skill ...'). In fact, they should really be obsoleted
153 * and replaced with those.
154 */
155int
156command_search (object *op, char *params)
157{
158 return use_skill (op, skill_names[SK_FIND_TRAPS]);
159}
160
161int
162command_disarm (object *op, char *params)
163{
164 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
165} 147}
166 148
167/* A little special because we do want to pass the full params along 149/* A little special because we do want to pass the full params along
168 * as it includes the object to throw. 150 * as it includes the object to throw.
169 */ 151 */
… …
171command_throw (object *op, char *params) 153command_throw (object *op, char *params)
172{ 154{
173 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) 155 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
174 return do_skill (op, op, skop, op->facing, params); 156 return do_skill (op, op, skop, op->facing, params);
175 else 157 else
176 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 158 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
177 159
178 return 0; 160 return 0;
179} 161}
180 162
181int 163int
… …
207 189
208 while (*params == ' ') 190 while (*params == ' ')
209 params++; 191 params++;
210 192
211 if (object *inv = find_best_apply_object_match (op, params, aflag)) 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
212 player_apply (op, inv, aflag, 0); 194 op->apply (inv, aflag);
213 else 195 else
214 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 196 op->failmsgf ("Could not find any match to the %s.", params);
215 } 197 }
216 198
217 return 0; 199 return 0;
218} 200}
219 201
… …
241 return 0; 223 return 0;
242 } 224 }
243 225
244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 226 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
245 { 227 {
246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 228 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
247 return 0; 229 return 0;
248 } 230 }
249 231
250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251 { 233 {
… …
377 count = tmp->nrof; 359 count = tmp->nrof;
378 360
379 /* container is open, so use it */ 361 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP]) 362 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op; 363 alt = op;
382 else if (op->container) 364 else if ((alt = op->container_ ()))
383 { 365 {
384 alt = op->container;
385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386 goto leave; 367 goto leave;
387 } 368 }
388 else 369 else
389 { /* non container pickup */ 370 { /* non container pickup */
… …
443int 424int
444command_take (object *op, char *params) 425command_take (object *op, char *params)
445{ 426{
446 object *tmp, *next; 427 object *tmp, *next;
447 428
448 if (op->container) 429 if (op->container_ ())
449 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
450 else 431 else
451 { 432 {
452 tmp = op->above; 433 tmp = op->above;
453 if (tmp) 434 if (tmp)
454 while (tmp->above) 435 while (tmp->above)
… …
466 447
467 /* Makes processing easier */ 448 /* Makes processing easier */
468 if (params && *params == '\0') 449 if (params && *params == '\0')
469 params = 0; 450 params = 0;
470 451
471 int cnt = MAX_ITEM_PER_DROP; 452 int cnt = MAX_ITEM_PER_ACTION;
472 453
473 while (tmp) 454 while (tmp)
474 { 455 {
475 next = tmp->below; 456 next = tmp->below;
476 457
… …
520 501
521 return 0; 502 return 0;
522} 503}
523 504
524/* 505/*
525 * This function was part of drop, now is own function. 506 * This function was part of drop, now is own function.
526 * Player 'op' tries to put object 'tmp' into sack 'sack', 507 * Player 'op' tries to put object 'tmp' into sack 'sack',
527 * if nrof is non zero, then nrof objects is tried to put into sack. 508 * if nrof is non zero, then nrof objects is tried to put into sack.
509 *
528 * Note that the 'sack' in question can now be a transport, 510 * Note that the 'sack' in question can now be a transport,
529 * so this function isn't named very good anymore. 511 * so this function isn't named very good anymore.
530 */ 512 */
531void 513void
532put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
535 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
536 518
537 if (sack == tmp) 519 if (sack == tmp)
538 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
539 521
540 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
541 { 523 {
542 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 524 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
543 return; 525 return;
544 } 526 }
545 527
… …
554 536
555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
556 { 538 {
557 tmp = tmp2->below; 539 tmp = tmp2->below;
558 540
559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 541 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
560 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
561 else 543 else
562 { 544 {
563 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
564 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
574 */ 556 */
575 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 557 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
576 return; 558 return;
577 559
578 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
580 return; 562 return;
581 563
582 /* we want to put some portion of the item into the container */ 564 /* we want to put some portion of the item into the container */
583 if (!can_split (op, tmp, nrof)) 565 if (!can_split (op, tmp, nrof))
584 return; 566 return;
585 567
586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 568 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
587 sack->insert (tmp); 569 sack->insert (tmp);
588}
589
590/*
591 * This function was part of drop, now is own function.
592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
593 * nrof objects is tried to dropped.
594 * This is used when dropping objects onto the floor.
595 */
596void
597drop_object (object *op, object *tmp, uint32 nrof)
598{
599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
600 return;
601
602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
604 return; /* can't unapply it */
605
606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
607
608 /* We are only dropping some of the items. We split the current object
609 * off
610 */
611 if (!can_split (op, tmp, nrof))
612 return;
613
614 drop_object (op, tmp);
615
616 if (!tmp->destroyed () && !tmp->is_in_map_or_inv ())
617 {
618 // if nothing happened with the object we give it back
619 op->insert (tmp);
620 }
621} 570}
622 571
623/* In contrast to drop_object (op, tmp, nrof) above this function takes the 572/* In contrast to drop_object (op, tmp, nrof) above this function takes the
624 * already split off object, and feeds it to the event handlers and does 573 * already split off object, and feeds it to the event handlers and does
625 * other magic with it. 574 * other magic with it.
… …
628 * object that was dropped. 577 * object that was dropped.
629 * 578 *
630 * Make sure to check what happened with <obj> after this function returns! 579 * Make sure to check what happened with <obj> after this function returns!
631 * Otherwise you may leak this object. 580 * Otherwise you may leak this object.
632 */ 581 */
633
634void 582void
635drop_object (object *dropper, object *obj) 583drop_object (object *dropper, object *obj)
636{ 584{
637 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper))) 585 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
638 return; 586 return;
639 587
640 // safe guard for programming errors:
641 if (obj->destroyed () || obj->is_in_map_or_inv ()) 588 if (obj->destroyed () || obj->is_inserted ())
642 {
643 LOG (llevError, "BUG: A plugin destroyed or put the object somewhere without overriding the DROP event (%s)!", obj->debug_desc ());
644 return; 589 return;
645 }
646 590
647 if (QUERY_FLAG (obj, FLAG_STARTEQUIP)) 591 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
648 { 592 {
649 dropper->statusmsg (format ("You drop the %s.", query_name (obj))); 593 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
650 dropper->statusmsg ("The god who lent it to you retrieves it."); 594 dropper->statusmsg ("The god who lent it to you retrieves it.");
… …
658 floor; 602 floor;
659 floor = floor->above) 603 floor = floor->above)
660 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper))) 604 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
661 return; 605 return;
662 606
663 // safe guard for programming errors:
664 if (obj->destroyed () || obj->is_in_map_or_inv ()) 607 if (obj->destroyed () || obj->is_inserted ())
665 {
666 LOG (llevError, "BUG: A plugin destroyed or put the object somewhere without overriding the DROP_ON event (%s)!", obj->debug_desc ());
667 return; 608 return;
668 }
669 609
670 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY) 610 if (dropper->is_in_shop () && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
671 if (!sell_item (obj, dropper)) 611 if (!sell_item (obj, dropper))
672 return; 612 return;
613
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return;
673 616
674 /* If nothing special happened with this object, the default action is to 617 /* If nothing special happened with this object, the default action is to
675 * insert it below the dropper: 618 * insert it below the dropper:
676 */ 619 */
677 620
678 obj->x = dropper->x; 621 obj->x = dropper->x;
679 obj->y = dropper->y; 622 obj->y = dropper->y;
680 623
681 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR); 624 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
625}
626
627/*
628 * This function was part of drop, now is own function.
629 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
630 * nrof objects are tried to drop.
631 * This is used when dropping objects onto the floor.
632 */
633void
634drop_object (object *op, object *tmp, uint32 nrof)
635{
636 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
637 return;
638
639 if (QUERY_FLAG (tmp, FLAG_APPLIED))
640 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
641 return; /* can't unapply it */
642
643 /* We are only dropping some of the items. We split the current object
644 * off
645 */
646 if (!can_split (op, tmp, nrof))
647 return;
648
649 drop_object (op, tmp);
650
651 if (!tmp->destroyed () && !tmp->is_inserted ())
652 {
653 // if nothing happened with the object we give it back
654 op->insert (tmp);
655 }
682} 656}
683 657
684void 658void
685drop (object *op, object *tmp) 659drop (object *op, object *tmp)
686{ 660{
… …
699 */ 673 */
700 tmp->destroy (); 674 tmp->destroy ();
701 return; 675 return;
702 } 676 }
703 else 677 else
704 {
705 while (tmp && tmp->invisible) 678 while (tmp && tmp->invisible)
706 tmp = tmp->below; 679 tmp = tmp->below;
707 }
708 } 680 }
709 681
710 if (tmp == NULL) 682 if (!tmp)
711 { 683 {
712 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 684 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
713 return; 685 return;
714 } 686 }
715 687
… …
729 } 701 }
730 702
731 if (op->type == PLAYER && op->contr->last_used == tmp) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
732 op->contr->last_used = tmp->below ? tmp->below 704 op->contr->last_used = tmp->below ? tmp->below
733 : tmp->above ? tmp->above 705 : tmp->above ? tmp->above
734 : 0; 706 : (object *)0;
735 707
736 if (op->container) 708 if (op->container_ ())
737 { 709 {
738 if (op->type == PLAYER) 710 if (op->type == PLAYER)
739 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
740 else 712 else
741 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
742 } 714 }
743 else 715 else
744 { 716 {
745 if (op->type == PLAYER) 717 if (op->type == PLAYER)
746 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
… …
773 /* 745 /*
774 Care must be taken that the next item pointer is not to money as 746 Care must be taken that the next item pointer is not to money as
775 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
776 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
777 */ 749 */
778
779 int cnt = MAX_ITEM_PER_DROP; 750 int cnt = MAX_ITEM_PER_ACTION;
780 751
781 if (!params) 752 if (!params)
782 { 753 {
783 while (curinv) 754 while (curinv)
784 { 755 {
785 nextinv = curinv->below; 756 nextinv = curinv->below;
786 757
787 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
788 nextinv = nextinv->below; 759 nextinv = nextinv->below;
789 760
790 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
791 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
792 curinv->type != SPECIAL_KEY && curinv->type != GEM && 763 && curinv->type != FOOD
764 && curinv->type != KEY
765 && curinv->type != SPECIAL_KEY
766 && curinv->type != GEM
767 && !curinv->invisible
793 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
794 { 769 {
795 drop (op, curinv); 770 drop (op, curinv);
796 if (--cnt <= 0) break; 771 if (--cnt <= 0) break;
797 } 772 }
798 773
… …
892 * <cnt> can be a 0 pointer or a pointer to the maximum number of 867 * <cnt> can be a 0 pointer or a pointer to the maximum number of
893 * drop operations to perform. 868 * drop operations to perform.
894 * 869 *
895 * Returns true if at least one item was dropped. 870 * Returns true if at least one item was dropped.
896 */ 871 */
897bool 872static bool
898drop_vector (object *dropper, vector<object *> &objs, int *cnt) 873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
899{ 874{
900 vector<object *>::iterator i; 875 vector<object *>::iterator i;
901 876
902 bool did_one = false; 877 bool did_one = false;
… …
937 912
938 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
939 matched_objs.push_back (tmp); 914 matched_objs.push_back (tmp);
940 } 915 }
941 916
942 int cnt = MAX_ITEM_PER_DROP; 917 int cnt = MAX_ITEM_PER_ACTION;
943 918
944 if (!drop_vector (op, matched_objs, &cnt)) 919 if (!drop_vector (op, matched_objs, &cnt))
945 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
946 921
947 if (cnt <= 0) 922 if (cnt <= 0)
… …
1079} 1054}
1080 1055
1081std::string 1056std::string
1082object::long_desc (object *who) 1057object::long_desc (object *who)
1083{ 1058{
1084 std::string buf (query_name (this)); 1059 std::string buf (query_name ());
1085 1060
1086 switch (type) 1061 switch (type)
1087 { 1062 {
1088 case RING: 1063 case RING:
1089 case SKILL: 1064 case SKILL:
… …
1101 case CLOAK: 1076 case CLOAK:
1102 case FOOD: 1077 case FOOD:
1103 case DRINK: 1078 case DRINK:
1104 case FLESH: 1079 case FLESH:
1105 case SKILL_TOOL: 1080 case SKILL_TOOL:
1081 case LAMP:
1106 case POWER_CRYSTAL: 1082 case POWER_CRYSTAL:
1107 { 1083 {
1108 const char *cp = ::describe_item (this, who); 1084 const char *cp = ::describe_item (this, who);
1109 1085
1110 if (*cp) 1086 if (*cp)
… …
1125examine_monster (object *op, object *tmp) 1101examine_monster (object *op, object *tmp)
1126{ 1102{
1127 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1103 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1128} 1104}
1129 1105
1130std::string
1131object::describe (object *who)
1132{
1133 dynbuf_text buf (1024, 1024);
1134
1135 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1136
1137 if (custom_name)
1138 buf.printf ("You call it %s.\r", &custom_name);
1139
1140 switch (type)
1141 {
1142 case SPELLBOOK:
1143 if (flag [FLAG_IDENTIFIED] && inv)
1144 buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1145 break;
1146
1147 case BOOK:
1148 if (msg)
1149 buf << "Something is written in it.\r";
1150 break;
1151
1152 case CONTAINER:
1153 if (race)
1154 {
1155 if (weight_limit && stats.Str < 100)
1156 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1157 &race, weight_limit / (10.0 * (100 - stats.Str)));
1158 else
1159 buf.printf ("It can hold only %s.\r", &race);
1160 }
1161 else if (weight_limit && stats.Str < 100)
1162 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1163 break;
1164
1165 case WAND:
1166 if (flag [FLAG_IDENTIFIED])
1167 buf.printf ("It has %d charges left.\r", stats.food);
1168 break;
1169 }
1170
1171 if (materialname && !msg)
1172 buf.printf ("It is made of: %s.\r", &materialname);
1173
1174 if (who)
1175 /* Where to wear this item */
1176 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1177 if (slot[i].info)
1178 {
1179 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1180
1181 if (slot[i].info < -1 && who->slot[i].info)
1182 buf.printf ("(%d)", -slot[i].info);
1183
1184 buf << ".\r";
1185 }
1186
1187 if (weight)
1188 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1189
1190 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1191 {
1192 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1193
1194 if (is_in_shop (who))
1195 {
1196 if (flag [FLAG_UNPAID])
1197 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1198 else
1199 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1200 }
1201 }
1202
1203 if (flag [FLAG_MONSTER])
1204 buf << describe_monster (who);
1205
1206 /* Is this item buildable? */
1207 if (flag [FLAG_IS_BUILDABLE])
1208 buf << "This is a buildable item.\r";
1209
1210 /* Does the object have a message? Don't show message for all object
1211 * types - especially if the first entry is a match
1212 */
1213 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1214 {
1215 /* This is just a hack so when identifying the items, we print
1216 * out the extra message
1217 */
1218 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1219 buf << "The object has a story:\r";
1220
1221 buf << msg << '\n';
1222 }
1223
1224 buf << '\n';
1225
1226 return std::string (buf.linearise (), buf.size ());
1227}
1228
1229static void 1106static void
1230display_new_pickup (object *op) 1107display_new_pickup (object *op)
1231{ 1108{
1232 int i = op->contr->mode; 1109 int i = op->contr->mode;
1233 1110
1234 if (!(i & PU_NEWMODE))
1235 return;
1236
1237 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1238 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1111 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1239 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1112 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1240 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1113 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1241 1114
1242 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1115 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1293 }; 1166 };
1294 1167
1295 if (!params) 1168 if (!params)
1296 { 1169 {
1297 /* if the new mode is used, just print the settings */ 1170 /* if the new mode is used, just print the settings */
1298 if (op->contr->mode & PU_NEWMODE)
1299 {
1300 display_new_pickup (op); 1171 display_new_pickup (op);
1301 return 1;
1302 }
1303 if (1)
1304 LOG (llevDebug, "command_pickup: !params\n");
1305 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1306 return 0; 1172 return 0;
1307 } 1173 }
1308 1174
1309 while (*params == ' ' && *params) 1175 while (*params == ' ' && *params)
1310 params++; 1176 params++;
… …
1316 for (mode = 0; names[mode]; mode++) 1182 for (mode = 0; names[mode]; mode++)
1317 { 1183 {
1318 if (!strcmp (names[mode], params + 1)) 1184 if (!strcmp (names[mode], params + 1))
1319 { 1185 {
1320 i = op->contr->mode; 1186 i = op->contr->mode;
1321 if (!(i & PU_NEWMODE)) 1187
1322 i = PU_NEWMODE;
1323 if (*params == '+') 1188 if (*params == '+')
1324 i = i | modes[mode]; 1189 i = i | modes[mode];
1325 else 1190 else
1326 i = i & ~modes[mode]; 1191 i = i & ~modes[mode];
1192
1327 op->contr->mode = i; 1193 op->contr->mode = i;
1328 display_new_pickup (op); 1194 display_new_pickup (op);
1329 return 1; 1195 return 1;
1330 } 1196 }
1331 } 1197 }
… …
1333 return 1; 1199 return 1;
1334 } 1200 }
1335 1201
1336 if (sscanf (params, "%u", &i) != 1) 1202 if (sscanf (params, "%u", &i) != 1)
1337 { 1203 {
1338 if (1)
1339 LOG (llevDebug, "command_pickup: params==NULL\n");
1340 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1204 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1341 return 1; 1205 return 1;
1342 } 1206 }
1343 set_pickup_mode (op, i); 1207
1208 if (i <= PU_RATIO)
1209 i |= op->contr->mode & ~PU_RATIO;
1210
1211 op->contr->mode = i;
1344 1212
1345 return 1; 1213 return 1;
1346}
1347
1348void
1349set_pickup_mode (object *op, int i)
1350{
1351 switch (op->contr->mode = i)
1352 {
1353 case 0:
1354 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1355 break;
1356 case 1:
1357 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1358 break;
1359 case 2:
1360 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1361 break;
1362 case 3:
1363 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1364 break;
1365 case 4:
1366 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1367 break;
1368 case 5:
1369 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1370 break;
1371 case 6:
1372 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1373 break;
1374 case 7:
1375 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1376 break;
1377 }
1378} 1214}
1379 1215
1380int 1216int
1381command_search_items (object *op, char *params) 1217command_search_items (object *op, char *params)
1382{ 1218{
1383 char buf[MAX_BUF];
1384
1385 if (settings.search_items == FALSE)
1386 return 1;
1387
1388 if (params == NULL) 1219 if (params == NULL)
1389 { 1220 {
1390 if (op->contr->search_str[0] == '\0') 1221 if (op->contr->search_str[0] == '\0')
1391 { 1222 {
1392 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1223 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1393 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1224 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1394 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1225 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1395 return 1; 1226 return 1;
1396 } 1227 }
1397 1228
1398 op->contr->search_str[0] = '\0'; 1229 op->contr->search_str[0] = '\0';
1399 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1230 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1400 op->update_stats (); 1231 op->contr->queue_stats_update ();
1401 return 1; 1232 return 1;
1402 } 1233 }
1403 1234
1404 if ((int) strlen (params) >= MAX_BUF) 1235 if (strlen (params) >= sizeof (op->contr->search_str))
1405 { 1236 {
1406 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1237 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1407 return 1; 1238 return 1;
1408 } 1239 }
1409 1240
1410 strcpy (op->contr->search_str, params); 1241 strcpy (op->contr->search_str, params);
1411 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1242 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1412 new_draw_info (NDI_UNIQUE, 0, op, buf); 1243 op->contr->queue_stats_update ();
1413 op->update_stats (); 1244
1414 return 1; 1245 return 1;
1415} 1246}
1416 1247
1248int
1249command_unlock (object *op, char *params)
1250{
1251 /* if the unlock command typed with nothing, unlock everything,
1252 * this might be bad
1253 */
1254 if (params == NULL)
1255 {
1256 for (object *item = op->inv; item; item = item->below)
1257 {
1258 CLEAR_FLAG(item, FLAG_INV_LOCKED);
1259 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1260 esrv_update_item (UPD_FLAGS, op, item);
1261 }
1262 return 0;
1263 }
1264
1265 /* if the unlock command is used with a param,
1266 * unlock what matches. i.e. unlock material, should unlock all the materials
1267 */
1268 for (object *item = op->inv; item; item = item->below)
1269 if (item->name.contains (params))
1270 {
1271 CLEAR_FLAG (item, FLAG_INV_LOCKED);
1272 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1273 esrv_update_item (UPD_FLAGS, op, item);
1274 }
1275
1276 return 0;
1277}
1278
1279int
1280command_lock (object *op, char *params)
1281{
1282 /* if the lock command is typed by itself, lock everything
1283 */
1284 if (params == NULL)
1285 {
1286 for (object *item = op->inv; item; item = item->below)
1287 {
1288 SET_FLAG (item, FLAG_INV_LOCKED);
1289 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1290 esrv_update_item (UPD_FLAGS, op, item);
1291 }
1292 return 0;
1293 }
1294
1295 /* if the lock command is used with a param, lock what matches.
1296 * i.e. lock material, should lock all the materials
1297 */
1298 for (object *item = op->inv; item; item = item->below)
1299 if (item->name.contains (params))
1300 {
1301 SET_FLAG (item, FLAG_INV_LOCKED);
1302 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1303 esrv_update_item (UPD_FLAGS, op, item);
1304 }
1305
1306 return 0;
1307}
1308
1309/* op should be a player, params is any params.
1310 * If no params given, we print out the currently marked object.
1311 * otherwise, try to find a matching object - try best match first.
1312 */
1313int
1314command_mark (object *op, char *params)
1315{
1316 if (!params)
1317 {
1318 if (object *mark = find_marked_object (op))
1319 op->statusmsg (format ("%s is marked.", query_name (mark)));
1320 else
1321 op->failmsg ("You have no marked object.");
1322 }
1323 else
1324 {
1325 if (object *mark = find_best_object_match (op, params))
1326 {
1327 op->contr->mark = mark;
1328 op->statusmsg (format ("Marked item %s", query_name (mark)));
1329 }
1330 else
1331 op->failmsgf ("Could not find an object that matches %s", params);
1332 }
1333
1334 return 0; /*shouldnt get here */
1335}
1336

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines