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.96 by root, Sun Sep 20 00:38:55 2009 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,2009 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
… …
137 136
138 skill = find_skill_by_name_fuzzy (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} 147}
150 148
151/* 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
152 * as it includes the object to throw. 150 * as it includes the object to throw.
… …
155command_throw (object *op, char *params) 153command_throw (object *op, char *params)
156{ 154{
157 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]))
158 return do_skill (op, op, skop, op->facing, params); 156 return do_skill (op, op, skop, op->facing, params);
159 else 157 else
160 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.");
161 159
162 return 0; 160 return 0;
163} 161}
164 162
165int 163int
… …
191 189
192 while (*params == ' ') 190 while (*params == ' ')
193 params++; 191 params++;
194 192
195 if (object *inv = find_best_apply_object_match (op, params, aflag)) 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
196 player_apply (op, inv, aflag, 0); 194 op->apply (inv, aflag);
197 else 195 else
198 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);
199 } 197 }
200 198
201 return 0; 199 return 0;
202} 200}
203 201
… …
225 return 0; 223 return 0;
226 } 224 }
227 225
228 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)))
229 { 227 {
230 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));
231 return 0; 229 return 0;
232 } 230 }
233 231
234 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
235 { 233 {
… …
361 count = tmp->nrof; 359 count = tmp->nrof;
362 360
363 /* container is open, so use it */ 361 /* container is open, so use it */
364 if (tmp->flag [FLAG_STARTEQUIP]) 362 if (tmp->flag [FLAG_STARTEQUIP])
365 alt = op; 363 alt = op;
366 else if (op->container) 364 else if ((alt = op->container_ ()))
367 { 365 {
368 alt = op->container;
369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
370 goto leave; 367 goto leave;
371 } 368 }
372 else 369 else
373 { /* non container pickup */ 370 { /* non container pickup */
… …
427int 424int
428command_take (object *op, char *params) 425command_take (object *op, char *params)
429{ 426{
430 object *tmp, *next; 427 object *tmp, *next;
431 428
432 if (op->container) 429 if (op->container_ ())
433 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
434 else 431 else
435 { 432 {
436 tmp = op->above; 433 tmp = op->above;
437 if (tmp) 434 if (tmp)
438 while (tmp->above) 435 while (tmp->above)
… …
450 447
451 /* Makes processing easier */ 448 /* Makes processing easier */
452 if (params && *params == '\0') 449 if (params && *params == '\0')
453 params = 0; 450 params = 0;
454 451
455 int cnt = MAX_ITEM_PER_DROP; 452 int cnt = MAX_ITEM_PER_ACTION;
456 453
457 while (tmp) 454 while (tmp)
458 { 455 {
459 next = tmp->below; 456 next = tmp->below;
460 457
… …
520 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
521 518
522 if (sack == tmp) 519 if (sack == tmp)
523 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
524 521
525 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
526 { 523 {
527 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));
528 return; 525 return;
529 } 526 }
530 527
… …
539 536
540 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
541 { 538 {
542 tmp = tmp2->below; 539 tmp = tmp2->below;
543 540
544 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)))
545 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
546 else 543 else
547 { 544 {
548 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
549 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
559 */ 556 */
560 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)))
561 return; 558 return;
562 559
563 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
564 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
565 return; 562 return;
566 563
567 /* 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 */
568 if (!can_split (op, tmp, nrof)) 565 if (!can_split (op, tmp, nrof))
569 return; 566 return;
570 567
571 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));
572 sack->insert (tmp); 569 sack->insert (tmp);
573}
574
575/*
576 * This function was part of drop, now is own function.
577 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
578 * nrof objects is tried to dropped.
579 * This is used when dropping objects onto the floor.
580 */
581void
582drop_object (object *op, object *tmp, uint32 nrof)
583{
584 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
585 return;
586
587 if (QUERY_FLAG (tmp, FLAG_APPLIED))
588 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
589 return; /* can't unapply it */
590
591 /* We are only dropping some of the items. We split the current object
592 * off
593 */
594 if (!can_split (op, tmp, nrof))
595 return;
596
597 drop_object (op, tmp);
598
599 if (!tmp->destroyed () && !tmp->is_inserted ())
600 {
601 // if nothing happened with the object we give it back
602 op->insert (tmp);
603 }
604} 570}
605 571
606/* 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
607 * 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
608 * other magic with it. 574 * other magic with it.
… …
639 return; 605 return;
640 606
641 if (obj->destroyed () || obj->is_inserted ()) 607 if (obj->destroyed () || obj->is_inserted ())
642 return; 608 return;
643 609
644 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)
645 if (!sell_item (obj, dropper)) 611 if (!sell_item (obj, dropper))
646 return; 612 return;
613
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return;
647 616
648 /* 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
649 * insert it below the dropper: 618 * insert it below the dropper:
650 */ 619 */
651 620
652 obj->x = dropper->x; 621 obj->x = dropper->x;
653 obj->y = dropper->y; 622 obj->y = dropper->y;
654 623
655 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 }
656} 656}
657 657
658void 658void
659drop (object *op, object *tmp) 659drop (object *op, object *tmp)
660{ 660{
… …
673 */ 673 */
674 tmp->destroy (); 674 tmp->destroy ();
675 return; 675 return;
676 } 676 }
677 else 677 else
678 {
679 while (tmp && tmp->invisible) 678 while (tmp && tmp->invisible)
680 tmp = tmp->below; 679 tmp = tmp->below;
681 }
682 } 680 }
683 681
684 if (tmp == NULL) 682 if (!tmp)
685 { 683 {
686 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.");
687 return; 685 return;
688 } 686 }
689 687
… …
705 if (op->type == PLAYER && op->contr->last_used == tmp) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
706 op->contr->last_used = tmp->below ? tmp->below 704 op->contr->last_used = tmp->below ? tmp->below
707 : tmp->above ? tmp->above 705 : tmp->above ? tmp->above
708 : (object *)0; 706 : (object *)0;
709 707
710 if (op->container) 708 if (op->container_ ())
711 { 709 {
712 if (op->type == PLAYER) 710 if (op->type == PLAYER)
713 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
714 else 712 else
715 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
716 } 714 }
717 else 715 else
718 { 716 {
719 if (op->type == PLAYER) 717 if (op->type == PLAYER)
720 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
… …
747 /* 745 /*
748 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
749 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
750 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
751 */ 749 */
752
753 int cnt = MAX_ITEM_PER_DROP; 750 int cnt = MAX_ITEM_PER_ACTION;
754 751
755 if (!params) 752 if (!params)
756 { 753 {
757 while (curinv) 754 while (curinv)
758 { 755 {
759 nextinv = curinv->below; 756 nextinv = curinv->below;
760 757
761 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
762 nextinv = nextinv->below; 759 nextinv = nextinv->below;
763 760
764 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
765 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
766 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
767 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
768 { 769 {
769 drop (op, curinv); 770 drop (op, curinv);
770 if (--cnt <= 0) break; 771 if (--cnt <= 0) break;
771 } 772 }
772 773
… …
866 * <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
867 * drop operations to perform. 868 * drop operations to perform.
868 * 869 *
869 * Returns true if at least one item was dropped. 870 * Returns true if at least one item was dropped.
870 */ 871 */
871bool 872static bool
872drop_vector (object *dropper, vector<object *> &objs, int *cnt) 873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
873{ 874{
874 vector<object *>::iterator i; 875 vector<object *>::iterator i;
875 876
876 bool did_one = false; 877 bool did_one = false;
… …
911 912
912 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
913 matched_objs.push_back (tmp); 914 matched_objs.push_back (tmp);
914 } 915 }
915 916
916 int cnt = MAX_ITEM_PER_DROP; 917 int cnt = MAX_ITEM_PER_ACTION;
917 918
918 if (!drop_vector (op, matched_objs, &cnt)) 919 if (!drop_vector (op, matched_objs, &cnt))
919 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
920 921
921 if (cnt <= 0) 922 if (cnt <= 0)
… …
1101{ 1102{
1102 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 ());
1103} 1104}
1104 1105
1105static void 1106static void
1106describe_dump_object (dynbuf &buf, object *ob)
1107{
1108 char *txt = dump_object (ob);
1109 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1110 buf << "\n" << txt << "\n";
1111
1112 if (!ob->is_arch ())
1113 describe_dump_object (buf, ob->arch);
1114}
1115
1116std::string
1117object::describe (object *who)
1118{
1119 dynbuf_text buf (1024, 1024);
1120
1121 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1122
1123 if (custom_name)
1124 buf.printf ("You call it %s.\r", &custom_name);
1125
1126 switch (type)
1127 {
1128 case SPELLBOOK:
1129 if (flag [FLAG_IDENTIFIED] && inv)
1130 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1131 break;
1132
1133 case BOOK:
1134 if (msg)
1135 buf << "Something is written in it.\r";
1136 break;
1137
1138 case CONTAINER:
1139 if (race)
1140 {
1141 if (weight_limit && stats.Str < 100)
1142 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1143 &race, weight_limit / (10.0 * (100 - stats.Str)));
1144 else
1145 buf.printf ("It can hold only %s.\r", &race);
1146 }
1147 else if (weight_limit && stats.Str < 100)
1148 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1149 break;
1150
1151 case WAND:
1152 if (flag [FLAG_IDENTIFIED])
1153 buf.printf ("It has %d charges left.\r", stats.food);
1154 break;
1155 }
1156
1157 if (materialname && !msg)
1158 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1159 << materialname
1160 << '\r';
1161
1162 if (who)
1163 /* Where to wear this item */
1164 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1165 if (slot[i].info)
1166 {
1167 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1168
1169 if (slot[i].info < -1 && who->slot[i].info)
1170 buf.printf ("(%d)", -slot[i].info);
1171
1172 buf << ".\r";
1173 }
1174
1175 if (weight)
1176 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1177
1178 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1179 {
1180 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1181
1182 if (is_in_shop (who))
1183 {
1184 if (flag [FLAG_UNPAID])
1185 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1186 else
1187 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1188 }
1189 }
1190
1191 if (flag [FLAG_MONSTER])
1192 buf << describe_monster (who);
1193
1194 /* Is this item buildable? */
1195 if (flag [FLAG_IS_BUILDABLE])
1196 buf << "This is a buildable item.\r";
1197
1198 /* Does the object have a message? Don't show message for all object
1199 * types - especially if the first entry is a match
1200 */
1201 if (msg)
1202 {
1203 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1204 {
1205 buf << '\r';
1206
1207 /* This is just a hack so when identifying the items, we print
1208 * out the extra message
1209 */
1210 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1211 buf << "The object has a story:\r";
1212
1213 buf << msg << '\n';
1214 }
1215 }
1216 else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1217 && (type == SPELLBOOK || type == ROD || type == WAND
1218 || type == ROD || type == POTION || type == SCROLL))
1219 // for spellbooks and other stuff that contains spells, print the spell message,
1220 // unless the object has a custom message handled above.
1221 buf << '\r' << inv->msg << '\n';
1222
1223 // try to display the duration for some potions and scrolls
1224 // this includes change ability potions and group spells,
1225 // but does not handle protection potions
1226 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1227 && (type == POTION || type == SCROLL))
1228 {
1229 object *spell = inv;
1230
1231 if (spell->subtype == SP_PARTY_SPELL)
1232 spell = spell->other_arch;
1233
1234 if (spell->subtype == SP_CHANGE_ABILITY)
1235 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1236 TICK2TIME (change_ability_duration (spell, this)));
1237 }
1238
1239 buf << '\n';
1240
1241 // the dungeon master additionally gets a complete dump
1242 if (who && who->flag [FLAG_WIZLOOK])
1243 {
1244 buf << "\nT<Object>\n";
1245 describe_dump_object (buf, this);
1246
1247 if (inv)
1248 {
1249 buf << "\nT<Top Inventory>\n";
1250 describe_dump_object (buf, inv);
1251 }
1252 }
1253
1254 return std::string (buf.linearise (), buf.size ());
1255}
1256
1257static void
1258display_new_pickup (object *op) 1107display_new_pickup (object *op)
1259{ 1108{
1260 int i = op->contr->mode; 1109 int i = op->contr->mode;
1261 1110
1262 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);
… …
1365} 1214}
1366 1215
1367int 1216int
1368command_search_items (object *op, char *params) 1217command_search_items (object *op, char *params)
1369{ 1218{
1370 char buf[MAX_BUF];
1371
1372 if (params == NULL) 1219 if (params == NULL)
1373 { 1220 {
1374 if (op->contr->search_str[0] == '\0') 1221 if (op->contr->search_str[0] == '\0')
1375 { 1222 {
1376 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1"); 1223 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
… …
1379 return 1; 1226 return 1;
1380 } 1227 }
1381 1228
1382 op->contr->search_str[0] = '\0'; 1229 op->contr->search_str[0] = '\0';
1383 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1230 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1384 op->update_stats (); 1231 op->contr->queue_stats_update ();
1385 return 1; 1232 return 1;
1386 } 1233 }
1387 1234
1388 if (strlen (params) >= MAX_BUF) 1235 if (strlen (params) >= sizeof (op->contr->search_str))
1389 { 1236 {
1390 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1237 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1391 return 1; 1238 return 1;
1392 } 1239 }
1393 1240
1394 strcpy (op->contr->search_str, params); 1241 strcpy (op->contr->search_str, params);
1395 sprintf (buf, "Now searching for '%s'.", op->contr->search_str); 1242 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1396 new_draw_info (NDI_UNIQUE, 0, op, buf); 1243 op->contr->queue_stats_update ();
1397 op->update_stats ();
1398 1244
1399 return 1; 1245 return 1;
1400} 1246}
1401 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