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.84 by root, Mon Dec 22 21:11:27 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
… …
536 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
537 518
538 if (sack == tmp) 519 if (sack == tmp)
539 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
540 521
541 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
542 { 523 {
543 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));
544 return; 525 return;
545 } 526 }
546 527
… …
555 536
556 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
557 { 538 {
558 tmp = tmp2->below; 539 tmp = tmp2->below;
559 540
560 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)))
561 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
562 else 543 else
563 { 544 {
564 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
565 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
575 */ 556 */
576 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)))
577 return; 558 return;
578 559
579 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
580 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
581 return; 562 return;
582 563
583 /* 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 */
584 if (!can_split (op, tmp, nrof)) 565 if (!can_split (op, tmp, nrof))
585 return; 566 return;
586 567
587 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));
588 sack->insert (tmp); 569 sack->insert (tmp);
589}
590
591/*
592 * This function was part of drop, now is own function.
593 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
594 * nrof objects is tried to dropped.
595 * This is used when dropping objects onto the floor.
596 */
597void
598drop_object (object *op, object *tmp, uint32 nrof)
599{
600 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
601 return;
602
603 if (QUERY_FLAG (tmp, FLAG_APPLIED))
604 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
605 return; /* can't unapply it */
606
607 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
608
609 /* We are only dropping some of the items. We split the current object
610 * off
611 */
612 if (!can_split (op, tmp, nrof))
613 return;
614
615 drop_object (op, tmp);
616
617 if (!tmp->destroyed () && !tmp->is_inserted ())
618 {
619 // if nothing happened with the object we give it back
620 op->insert (tmp);
621 }
622} 570}
623 571
624/* 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
625 * 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
626 * other magic with it. 574 * other magic with it.
… …
629 * object that was dropped. 577 * object that was dropped.
630 * 578 *
631 * 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!
632 * Otherwise you may leak this object. 580 * Otherwise you may leak this object.
633 */ 581 */
634
635void 582void
636drop_object (object *dropper, object *obj) 583drop_object (object *dropper, object *obj)
637{ 584{
638 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper))) 585 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
639 return; 586 return;
… …
658 return; 605 return;
659 606
660 if (obj->destroyed () || obj->is_inserted ()) 607 if (obj->destroyed () || obj->is_inserted ())
661 return; 608 return;
662 609
663 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)
664 if (!sell_item (obj, dropper)) 611 if (!sell_item (obj, dropper))
665 return; 612 return;
613
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return;
666 616
667 /* 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
668 * insert it below the dropper: 618 * insert it below the dropper:
669 */ 619 */
670 620
671 obj->x = dropper->x; 621 obj->x = dropper->x;
672 obj->y = dropper->y; 622 obj->y = dropper->y;
673 623
674 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 }
675} 656}
676 657
677void 658void
678drop (object *op, object *tmp) 659drop (object *op, object *tmp)
679{ 660{
… …
692 */ 673 */
693 tmp->destroy (); 674 tmp->destroy ();
694 return; 675 return;
695 } 676 }
696 else 677 else
697 {
698 while (tmp && tmp->invisible) 678 while (tmp && tmp->invisible)
699 tmp = tmp->below; 679 tmp = tmp->below;
700 }
701 } 680 }
702 681
703 if (tmp == NULL) 682 if (!tmp)
704 { 683 {
705 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.");
706 return; 685 return;
707 } 686 }
708 687
… …
722 } 701 }
723 702
724 if (op->type == PLAYER && op->contr->last_used == tmp) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
725 op->contr->last_used = tmp->below ? tmp->below 704 op->contr->last_used = tmp->below ? tmp->below
726 : tmp->above ? tmp->above 705 : tmp->above ? tmp->above
727 : 0; 706 : (object *)0;
728 707
729 if (op->container) 708 if (op->container_ ())
730 { 709 {
731 if (op->type == PLAYER) 710 if (op->type == PLAYER)
732 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
733 else 712 else
734 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
735 } 714 }
736 else 715 else
737 { 716 {
738 if (op->type == PLAYER) 717 if (op->type == PLAYER)
739 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
… …
766 /* 745 /*
767 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
768 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
769 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
770 */ 749 */
771
772 int cnt = MAX_ITEM_PER_DROP; 750 int cnt = MAX_ITEM_PER_ACTION;
773 751
774 if (!params) 752 if (!params)
775 { 753 {
776 while (curinv) 754 while (curinv)
777 { 755 {
778 nextinv = curinv->below; 756 nextinv = curinv->below;
779 757
780 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
781 nextinv = nextinv->below; 759 nextinv = nextinv->below;
782 760
783 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
784 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
785 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
786 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
787 { 769 {
788 drop (op, curinv); 770 drop (op, curinv);
789 if (--cnt <= 0) break; 771 if (--cnt <= 0) break;
790 } 772 }
791 773
… …
885 * <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
886 * drop operations to perform. 868 * drop operations to perform.
887 * 869 *
888 * Returns true if at least one item was dropped. 870 * Returns true if at least one item was dropped.
889 */ 871 */
890bool 872static bool
891drop_vector (object *dropper, vector<object *> &objs, int *cnt) 873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
892{ 874{
893 vector<object *>::iterator i; 875 vector<object *>::iterator i;
894 876
895 bool did_one = false; 877 bool did_one = false;
… …
930 912
931 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
932 matched_objs.push_back (tmp); 914 matched_objs.push_back (tmp);
933 } 915 }
934 916
935 int cnt = MAX_ITEM_PER_DROP; 917 int cnt = MAX_ITEM_PER_ACTION;
936 918
937 if (!drop_vector (op, matched_objs, &cnt)) 919 if (!drop_vector (op, matched_objs, &cnt))
938 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
939 921
940 if (cnt <= 0) 922 if (cnt <= 0)
… …
1072} 1054}
1073 1055
1074std::string 1056std::string
1075object::long_desc (object *who) 1057object::long_desc (object *who)
1076{ 1058{
1077 std::string buf (query_name (this)); 1059 std::string buf (query_name ());
1078 1060
1079 switch (type) 1061 switch (type)
1080 { 1062 {
1081 case RING: 1063 case RING:
1082 case SKILL: 1064 case SKILL:
… …
1094 case CLOAK: 1076 case CLOAK:
1095 case FOOD: 1077 case FOOD:
1096 case DRINK: 1078 case DRINK:
1097 case FLESH: 1079 case FLESH:
1098 case SKILL_TOOL: 1080 case SKILL_TOOL:
1081 case LAMP:
1099 case POWER_CRYSTAL: 1082 case POWER_CRYSTAL:
1100 { 1083 {
1101 const char *cp = ::describe_item (this, who); 1084 const char *cp = ::describe_item (this, who);
1102 1085
1103 if (*cp) 1086 if (*cp)
… …
1118examine_monster (object *op, object *tmp) 1101examine_monster (object *op, object *tmp)
1119{ 1102{
1120 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 ());
1121} 1104}
1122 1105
1123std::string
1124object::describe (object *who)
1125{
1126 dynbuf_text buf (1024, 1024);
1127
1128 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1129
1130 if (custom_name)
1131 buf.printf ("You call it %s.\r", &custom_name);
1132
1133 switch (type)
1134 {
1135 case SPELLBOOK:
1136 if (flag [FLAG_IDENTIFIED] && inv)
1137 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1138 break;
1139
1140 case BOOK:
1141 if (msg)
1142 buf << "Something is written in it.\r";
1143 break;
1144
1145 case CONTAINER:
1146 if (race)
1147 {
1148 if (weight_limit && stats.Str < 100)
1149 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1150 &race, weight_limit / (10.0 * (100 - stats.Str)));
1151 else
1152 buf.printf ("It can hold only %s.\r", &race);
1153 }
1154 else if (weight_limit && stats.Str < 100)
1155 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1156 break;
1157
1158 case WAND:
1159 if (flag [FLAG_IDENTIFIED])
1160 buf.printf ("It has %d charges left.\r", stats.food);
1161 break;
1162 }
1163
1164 if (materialname && !msg)
1165 buf.printf ("It is made of: %s.\r", &materialname);
1166
1167 if (who)
1168 /* Where to wear this item */
1169 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1170 if (slot[i].info)
1171 {
1172 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1173
1174 if (slot[i].info < -1 && who->slot[i].info)
1175 buf.printf ("(%d)", -slot[i].info);
1176
1177 buf << ".\r";
1178 }
1179
1180 if (weight)
1181 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1182
1183 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1184 {
1185 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1186
1187 if (is_in_shop (who))
1188 {
1189 if (flag [FLAG_UNPAID])
1190 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1191 else
1192 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1193 }
1194 }
1195
1196 if (flag [FLAG_MONSTER])
1197 buf << describe_monster (who);
1198
1199 /* Is this item buildable? */
1200 if (flag [FLAG_IS_BUILDABLE])
1201 buf << "This is a buildable item.\r";
1202
1203 /* Does the object have a message? Don't show message for all object
1204 * types - especially if the first entry is a match
1205 */
1206 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1207 {
1208 /* This is just a hack so when identifying the items, we print
1209 * out the extra message
1210 */
1211 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1212 buf << "The object has a story:\r";
1213
1214 buf << msg << '\n';
1215 }
1216
1217 buf << '\n';
1218
1219 return std::string (buf.linearise (), buf.size ());
1220}
1221
1222static void 1106static void
1223display_new_pickup (object *op) 1107display_new_pickup (object *op)
1224{ 1108{
1225 int i = op->contr->mode; 1109 int i = op->contr->mode;
1226 1110
1227 if (!(i & PU_NEWMODE))
1228 return;
1229
1230 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1231 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);
1232 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);
1233 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);
1234 1114
1235 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);
… …
1286 }; 1166 };
1287 1167
1288 if (!params) 1168 if (!params)
1289 { 1169 {
1290 /* if the new mode is used, just print the settings */ 1170 /* if the new mode is used, just print the settings */
1291 if (op->contr->mode & PU_NEWMODE)
1292 {
1293 display_new_pickup (op); 1171 display_new_pickup (op);
1294 return 1;
1295 }
1296 if (1)
1297 LOG (llevDebug, "command_pickup: !params\n");
1298 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1299 return 0; 1172 return 0;
1300 } 1173 }
1301 1174
1302 while (*params == ' ' && *params) 1175 while (*params == ' ' && *params)
1303 params++; 1176 params++;
… …
1309 for (mode = 0; names[mode]; mode++) 1182 for (mode = 0; names[mode]; mode++)
1310 { 1183 {
1311 if (!strcmp (names[mode], params + 1)) 1184 if (!strcmp (names[mode], params + 1))
1312 { 1185 {
1313 i = op->contr->mode; 1186 i = op->contr->mode;
1314 if (!(i & PU_NEWMODE)) 1187
1315 i = PU_NEWMODE;
1316 if (*params == '+') 1188 if (*params == '+')
1317 i = i | modes[mode]; 1189 i = i | modes[mode];
1318 else 1190 else
1319 i = i & ~modes[mode]; 1191 i = i & ~modes[mode];
1192
1320 op->contr->mode = i; 1193 op->contr->mode = i;
1321 display_new_pickup (op); 1194 display_new_pickup (op);
1322 return 1; 1195 return 1;
1323 } 1196 }
1324 } 1197 }
… …
1326 return 1; 1199 return 1;
1327 } 1200 }
1328 1201
1329 if (sscanf (params, "%u", &i) != 1) 1202 if (sscanf (params, "%u", &i) != 1)
1330 { 1203 {
1331 if (1)
1332 LOG (llevDebug, "command_pickup: params==NULL\n");
1333 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.");
1334 return 1; 1205 return 1;
1335 } 1206 }
1336 set_pickup_mode (op, i); 1207
1208 if (i <= PU_RATIO)
1209 i |= op->contr->mode & ~PU_RATIO;
1210
1211 op->contr->mode = i;
1337 1212
1338 return 1; 1213 return 1;
1339}
1340
1341void
1342set_pickup_mode (object *op, int i)
1343{
1344 switch (op->contr->mode = i)
1345 {
1346 case 0:
1347 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1348 break;
1349 case 1:
1350 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1351 break;
1352 case 2:
1353 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1354 break;
1355 case 3:
1356 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1357 break;
1358 case 4:
1359 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1360 break;
1361 case 5:
1362 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1363 break;
1364 case 6:
1365 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1366 break;
1367 case 7:
1368 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1369 break;
1370 }
1371} 1214}
1372 1215
1373int 1216int
1374command_search_items (object *op, char *params) 1217command_search_items (object *op, char *params)
1375{ 1218{
1376 char buf[MAX_BUF];
1377
1378 if (settings.search_items == FALSE)
1379 return 1;
1380
1381 if (params == NULL) 1219 if (params == NULL)
1382 { 1220 {
1383 if (op->contr->search_str[0] == '\0') 1221 if (op->contr->search_str[0] == '\0')
1384 { 1222 {
1385 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1223 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1386 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");
1387 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'.");
1388 return 1; 1226 return 1;
1389 } 1227 }
1390 1228
1391 op->contr->search_str[0] = '\0'; 1229 op->contr->search_str[0] = '\0';
1392 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1230 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1393 op->update_stats (); 1231 op->contr->queue_stats_update ();
1394 return 1; 1232 return 1;
1395 } 1233 }
1396 1234
1397 if ((int) strlen (params) >= MAX_BUF) 1235 if (strlen (params) >= sizeof (op->contr->search_str))
1398 { 1236 {
1399 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1237 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1400 return 1; 1238 return 1;
1401 } 1239 }
1402 1240
1403 strcpy (op->contr->search_str, params); 1241 strcpy (op->contr->search_str, params);
1404 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));
1405 new_draw_info (NDI_UNIQUE, 0, op, buf); 1243 op->contr->queue_stats_update ();
1406 op->update_stats (); 1244
1407 return 1; 1245 return 1;
1408} 1246}
1409 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