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.67 by root, Mon Apr 21 23:35:24 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 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
… …
94} 93}
95 94
96static bool 95static bool
97can_split (object *pl, object *&op, sint32 nrof) 96can_split (object *pl, object *&op, sint32 nrof)
98{ 97{
99 if (object *tmp = op->split (nrof)) 98 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100 { 99 {
101 op = tmp; 100 op = tmp;
102 return true; 101 return true;
103 } 102 }
104 else 103 else
… …
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 {
… …
284 * (sack, luggage, etc), tmp->env->env then points to the player (nested 266 * (sack, luggage, etc), tmp->env->env then points to the player (nested
285 * containers not allowed as of now) 267 * containers not allowed as of now)
286 */ 268 */
287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
288 { 270 {
289 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 271 pl->failmsg ("You are levitating, you can't reach the ground! "
272 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
273 "or waiting till the levitation effect wears off.>");
290 return; 274 return;
291 } 275 }
292 276
293 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 277 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
294 return; 278 return;
… …
311 295
312 if (!can_split (pl, tmp, nrof)) 296 if (!can_split (pl, tmp, nrof))
313 return; 297 return;
314 298
315 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 299 if (QUERY_FLAG (tmp, FLAG_UNPAID))
300 {
301 tmp->flag.reset (FLAG_UNPAID);
316 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); 302 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
303 tmp->flag.set (FLAG_UNPAID);
304 }
317 else 305 else
318 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp)); 306 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
319 307
320 tmp = insert_ob_in_ob (tmp, op); 308 op->insert (tmp);
321
322 /* All the stuff below deals with client/server code, and is only
323 * usable by players
324 */
325 if (pl->contr)
326 {
327 esrv_send_item (pl, tmp);
328
329 /* These are needed to update the weight for the container we
330 * are putting the object in.
331 */
332 if (op != pl)
333 {
334 esrv_update_item (UPD_WEIGHT, pl, op);
335 esrv_send_item (pl, pl);
336 }
337
338 /* Update the container the object was in */
339 if (env && env != pl && env != op)
340 esrv_update_item (UPD_WEIGHT, pl, env);
341 }
342} 309}
343 310
344/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 311/* modified slightly to allow monsters use this -b.t. 5-31-95 */
345void 312void
346pick_up (object *op, object *alt) 313pick_up (object *op, object *alt)
… …
392 count = tmp->nrof; 359 count = tmp->nrof;
393 360
394 /* container is open, so use it */ 361 /* container is open, so use it */
395 if (tmp->flag [FLAG_STARTEQUIP]) 362 if (tmp->flag [FLAG_STARTEQUIP])
396 alt = op; 363 alt = op;
397 else if (op->container) 364 else if ((alt = op->container_ ()))
398 { 365 {
399 alt = op->container;
400 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
401 goto leave; 367 goto leave;
402 } 368 }
403 else 369 else
404 { /* non container pickup */ 370 { /* non container pickup */
… …
458int 424int
459command_take (object *op, char *params) 425command_take (object *op, char *params)
460{ 426{
461 object *tmp, *next; 427 object *tmp, *next;
462 428
463 if (op->container) 429 if (op->container_ ())
464 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
465 else 431 else
466 { 432 {
467 tmp = op->above; 433 tmp = op->above;
468 if (tmp) 434 if (tmp)
469 while (tmp->above) 435 while (tmp->above)
… …
481 447
482 /* Makes processing easier */ 448 /* Makes processing easier */
483 if (params && *params == '\0') 449 if (params && *params == '\0')
484 params = 0; 450 params = 0;
485 451
486 int cnt = MAX_ITEM_PER_DROP; 452 int cnt = MAX_ITEM_PER_ACTION;
487 453
488 while (tmp) 454 while (tmp)
489 { 455 {
490 next = tmp->below; 456 next = tmp->below;
491 457
… …
499 * but that probably will make it more difficult to read, and 465 * but that probably will make it more difficult to read, and
500 * not make it any more efficient 466 * not make it any more efficient
501 */ 467 */
502 if (params && item_matched_string (op, tmp, params)) 468 if (params && item_matched_string (op, tmp, params))
503 { 469 {
470 if (--cnt < 0) break;
504 pick_up (op, tmp); 471 pick_up (op, tmp);
505 if (--cnt <= 0) break;
506 } 472 }
507 else if (can_pick (op, tmp) && !params) 473 else if (can_pick (op, tmp) && !params)
508 { 474 {
475 if (--cnt < 0) break;
509 pick_up (op, tmp); 476 pick_up (op, tmp);
510 break; 477 break;
511 } 478 }
512 479
513 tmp = next; 480 tmp = next;
514 } 481 }
515 482
516 if (cnt <= 0) 483 if (cnt < 0)
517 { 484 {
518 op->failmsg ("Couldn't pick up so many items at once."); 485 op->failmsg ("Couldn't pick up so many items at once.");
519 return 0; 486 return 0;
520 } 487 }
521 488
… …
534 501
535 return 0; 502 return 0;
536} 503}
537 504
538/* 505/*
539 * This function was part of drop, now is own function. 506 * This function was part of drop, now is own function.
540 * Player 'op' tries to put object 'tmp' into sack 'sack', 507 * Player 'op' tries to put object 'tmp' into sack 'sack',
541 * 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 *
542 * Note that the 'sack' in question can now be a transport, 510 * Note that the 'sack' in question can now be a transport,
543 * so this function isn't named very good anymore. 511 * so this function isn't named very good anymore.
544 */ 512 */
545void 513void
546put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
549 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
550 518
551 if (sack == tmp) 519 if (sack == tmp)
552 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
553 521
554 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
555 { 523 {
556 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));
557 return; 525 return;
558 } 526 }
559 527
… …
568 536
569 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
570 { 538 {
571 tmp = tmp2->below; 539 tmp = tmp2->below;
572 540
573 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)))
574 {
575 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
576 }
577 else 543 else
578 { 544 {
579 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
580 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
581 break; 547 break;
582 } 548 }
583 } 549 }
584 550
585 esrv_update_item (UPD_WEIGHT, op, sack2);
586 return; 551 return;
587 } 552 }
588 553
589 /* Don't worry about this for containers - our caller should have 554 /* Don't worry about this for containers - our caller should have
590 * already checked this. 555 * already checked this.
591 */ 556 */
592 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)))
593 return; 558 return;
594 559
595 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
596 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
597 return; 562 return;
598 563
599 /* 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 */
600 if (nrof && tmp->nrof != nrof)
601 {
602 if (!can_split (op, tmp, nrof)) 565 if (!can_split (op, tmp, nrof))
603 return; 566 return;
604 }
605 else
606 tmp->remove ();
607 567
608 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));
609 tmp2 = insert_ob_in_ob (tmp, sack); 569 sack->insert (tmp);
570}
610 571
611 // elmex: 2007-11-26: removed update_stats and replaced 572/* In contrast to drop_object (op, tmp, nrof) above this function takes the
612 // it by update_after_inventory_change () in the caller 573 * already split off object, and feeds it to the event handlers and does
613 // of this function 574 * other magic with it.
575 *
576 * <droppper> is the object that dropped this object and <obj> is the
577 * object that was dropped.
578 *
579 * Make sure to check what happened with <obj> after this function returns!
580 * Otherwise you may leak this object.
581 */
582void
583drop_object (object *dropper, object *obj)
584{
585 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
586 return;
587
588 if (obj->destroyed () || obj->is_inserted ())
589 return;
614 590
615 /* If an object merged (and thus, different object), we need to 591 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
616 * delete the original. 592 {
593 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
594 dropper->statusmsg ("The god who lent it to you retrieves it.");
595
596 obj->destroy ();
597 dropper->update_stats ();
598 return;
599 }
600
601 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
602 floor;
603 floor = floor->above)
604 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
605 return;
606
607 if (obj->destroyed () || obj->is_inserted ())
608 return;
609
610 if (dropper->is_in_shop () && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
611 if (!sell_item (obj, dropper))
612 return;
613
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return;
616
617 /* If nothing special happened with this object, the default action is to
618 * insert it below the dropper:
617 */ 619 */
618 if (tmp2 != tmp)
619 esrv_del_item (op->contr, tmp->count);
620 620
621 esrv_send_item (op, tmp2); 621 obj->x = dropper->x;
622 obj->y = dropper->y;
622 623
623 /* update the sacks weight */ 624 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
624 esrv_update_item (UPD_WEIGHT, op, sack);
625} 625}
626 626
627/* 627/*
628 * This function was part of drop, now is own function. 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 629 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
630 * nrof objects is tried to dropped. 630 * nrof objects are tried to drop.
631 * This is used when dropping objects onto the floor. 631 * This is used when dropping objects onto the floor.
632 */ 632 */
633void 633void
634drop_object (object *op, object *tmp, uint32 nrof) 634drop_object (object *op, object *tmp, uint32 nrof)
635{ 635{
636 object *floor;
637
638 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 636 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
639 return; 637 return;
640 638
641 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 639 if (QUERY_FLAG (tmp, FLAG_APPLIED))
642 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 640 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
643 return; /* can't unapply it */ 641 return; /* can't unapply it */
644
645 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
646 642
647 /* We are only dropping some of the items. We split the current object 643 /* We are only dropping some of the items. We split the current object
648 * off 644 * off
649 */ 645 */
650 if (nrof && tmp->nrof != nrof)
651 {
652 if (!can_split (op, tmp, nrof)) 646 if (!can_split (op, tmp, nrof))
653 return;
654 }
655 else
656 tmp->remove ();
657
658 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
659 return; 647 return;
660 648
661 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 649 drop_object (op, tmp);
662 {
663 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
664 op->statusmsg ("The gods who lent it to you retrieves it.");
665 650
666 if (op->type == PLAYER) 651 if (!tmp->destroyed () && !tmp->is_inserted ())
667 esrv_del_item (op->contr, tmp->count);
668
669 tmp->destroy ();
670 op->update_stats ();
671 return;
672 } 652 {
673 653 // if nothing happened with the object we give it back
674 if (op->type == PLAYER) 654 op->insert (tmp);
675 esrv_del_item (op->contr, tmp->count);
676
677 /* Call this before we update the various windows/players. At least
678 * that we, we know the weight is correct.
679 */
680 // 2007-11-26: moved op->update_stats away and calling it later after
681 // all items of a drop command have been processed.
682
683 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
684 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
685 return;
686
687 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
688 sell_item (tmp, op);
689
690 tmp->x = op->x;
691 tmp->y = op->y;
692
693 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
694}
695
696void update_after_inventory_change (object *op)
697{
698 /* Call this before we update the various windows/players. At least
699 * that we, we know the weight is correct.
700 */
701 op->update_stats ();
702
703 // elmex: kept this for now, i have no idea what happens when i remove it:
704 if (op->type == PLAYER)
705 {
706 /* Need to update the weight for the player */
707 esrv_send_item (op, op);
708 op->contr->ns->floorbox_update ();
709 } 655 }
710} 656}
711 657
712void 658void
713drop (object *op, object *tmp) 659drop (object *op, object *tmp)
… …
723 if (tmp->env && tmp->env->type != PLAYER) 669 if (tmp->env && tmp->env->type != PLAYER)
724 { 670 {
725 /* Just toss the object - probably shouldn't be hanging 671 /* Just toss the object - probably shouldn't be hanging
726 * around anyways 672 * around anyways
727 */ 673 */
728 tmp->remove ();
729 tmp->destroy (); 674 tmp->destroy ();
730 return; 675 return;
731 } 676 }
732 else 677 else
733 {
734 while (tmp != NULL && tmp->invisible) 678 while (tmp && tmp->invisible)
735 tmp = tmp->below; 679 tmp = tmp->below;
736 }
737 } 680 }
738 681
739 if (tmp == NULL) 682 if (!tmp)
740 { 683 {
741 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.");
742 return; 685 return;
743 } 686 }
687
744 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
745 { 689 {
746 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 690 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
747 return; 691 return;
748 } 692 }
693
749 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
750 { 695 {
751#if 0 696#if 0
752 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 697 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
753 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 698 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
756 } 701 }
757 702
758 if (op->type == PLAYER && op->contr->last_used == tmp) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
759 op->contr->last_used = tmp->below ? tmp->below 704 op->contr->last_used = tmp->below ? tmp->below
760 : tmp->above ? tmp->above 705 : tmp->above ? tmp->above
761 : 0; 706 : (object *)0;
762 707
763 if (op->container) 708 if (op->container_ ())
764 { 709 {
765 if (op->type == PLAYER) 710 if (op->type == PLAYER)
766 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
767 else 712 else
768 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
769 } 714 }
770 else 715 else
771 { 716 {
772 if (op->type == PLAYER) 717 if (op->type == PLAYER)
773 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
… …
777 722
778 if (op->type == PLAYER) 723 if (op->type == PLAYER)
779 op->contr->count = 0; 724 op->contr->count = 0;
780} 725}
781 726
782
783
784/* Command will drop all items that have not been locked */ 727/* Command will drop all items that have not been locked */
785int 728int
786command_dropall (object *op, char *params) 729command_dropall (object *op, char *params)
787{ 730{
788 731
789 object *curinv, *nextinv;
790
791 if (op->inv == NULL) 732 if (op->inv == NULL)
792 { 733 {
793 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 734 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
794 return 0; 735 return 0;
795 } 736 }
796 737
797 curinv = op->inv; 738 object *curinv = op->inv;
739 object *nextinv;
798 740
799 /* 741 /*
800 This is the default. Drops everything not locked or considered 742 This is the default. Drops everything not locked or considered
801 not something that should be dropped. 743 not something that should be dropped.
802 */ 744 */
803 /* 745 /*
804 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
805 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
806 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
807 */ 749 */
808
809 int cnt = MAX_ITEM_PER_DROP; 750 int cnt = MAX_ITEM_PER_ACTION;
810 751
811 if (params == NULL) 752 if (!params)
812 { 753 {
813 while (curinv != NULL) 754 while (curinv)
814 { 755 {
815 nextinv = curinv->below; 756 nextinv = curinv->below;
757
816 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
817 nextinv = nextinv->below; 759 nextinv = nextinv->below;
760
818 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
819 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
820 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
821 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
822 { 769 {
823 drop (op, curinv); 770 drop (op, curinv);
824 if (--cnt <= 0) break; 771 if (--cnt <= 0) break;
825 } 772 }
773
826 curinv = nextinv; 774 curinv = nextinv;
827 } 775 }
828 } 776 }
829
830 else if (strcmp (params, "weapons") == 0) 777 else if (strcmp (params, "weapons") == 0)
831 { 778 {
832 while (curinv != NULL) 779 while (curinv)
833 { 780 {
834 nextinv = curinv->below; 781 nextinv = curinv->below;
782
835 while (nextinv && nextinv->type == MONEY) 783 while (nextinv && nextinv->type == MONEY)
836 nextinv = nextinv->below; 784 nextinv = nextinv->below;
785
837 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 786 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
838 { 787 {
839 drop (op, curinv); 788 drop (op, curinv);
840 if (--cnt <= 0) break; 789 if (--cnt <= 0) break;
841 } 790 }
791
842 curinv = nextinv; 792 curinv = nextinv;
843 } 793 }
844 } 794 }
845
846 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 795 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
847 { 796 {
848 while (curinv != NULL) 797 while (curinv)
849 { 798 {
850 nextinv = curinv->below; 799 nextinv = curinv->below;
800
851 while (nextinv && nextinv->type == MONEY) 801 while (nextinv && nextinv->type == MONEY)
852 nextinv = nextinv->below; 802 nextinv = nextinv->below;
803
853 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 804 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
854 { 805 {
855 drop (op, curinv); 806 drop (op, curinv);
856 if (--cnt <= 0) break; 807 if (--cnt <= 0) break;
857 } 808 }
809
858 curinv = nextinv; 810 curinv = nextinv;
859 } 811 }
860 } 812 }
861
862 else if (strcmp (params, "misc") == 0) 813 else if (strcmp (params, "misc") == 0)
863 { 814 {
864 while (curinv != NULL) 815 while (curinv)
865 { 816 {
866 nextinv = curinv->below; 817 nextinv = curinv->below;
818
867 while (nextinv && nextinv->type == MONEY) 819 while (nextinv && nextinv->type == MONEY)
868 nextinv = nextinv->below; 820 nextinv = nextinv->below;
821
869 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 822 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
870 { 823 {
871 switch (curinv->type) 824 switch (curinv->type)
872 { 825 {
873 case HORN: 826 case HORN:
… …
891 break; 844 break;
892 default: 845 default:
893 curinv = nextinv; 846 curinv = nextinv;
894 break; 847 break;
895 } 848 }
849
896 if (--cnt <= 0) break; 850 if (--cnt <= 0) break;
897 } 851 }
852
898 curinv = nextinv; 853 curinv = nextinv;
899 } 854 }
900 } 855 }
901 856
902 if (cnt <= 0) 857 if (cnt <= 0)
903 op->failmsg ("Only dropped some items, can't drop that many items at once."); 858 op->failmsg ("Only dropped some items, can't drop that many items at once.");
904 859
905 update_after_inventory_change (op);
906
907/* draw_look(op);*/ 860/* draw_look(op);*/
908 return 0; 861 return 0;
909} 862}
910 863
864
865/* This function tries to drop all objects in the <objs> vector.
866 * <dropper> is the object that wants to drop them.
867 * <cnt> can be a 0 pointer or a pointer to the maximum number of
868 * drop operations to perform.
869 *
870 * Returns true if at least one item was dropped.
871 */
872static bool
873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
874{
875 vector<object *>::iterator i;
876
877 bool did_one = false;
878
879 for (i = objs.begin (); i != objs.end (); i++)
880 {
881 drop (dropper, *i);
882 if (cnt && --*cnt <= 0) break;
883 did_one = true;
884 }
885
886 return did_one;
887}
888
911/* Object op wants to drop object(s) params. params can be a 889/* Object op wants to drop object(s) params. params can be a
912 * comma seperated list. 890 * comma seperated list.
913 */ 891 */
914
915int 892int
916command_drop (object *op, char *params) 893command_drop (object *op, char *params)
917{ 894{
918 object *tmp, *next; 895 object *tmp, *next;
919 int did_one = 0; 896 int did_one = 0;
… …
923 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
924 return 0; 901 return 0;
925 } 902 }
926 else 903 else
927 { 904 {
928 int cnt = MAX_ITEM_PER_DROP; 905 vector<object *> matched_objs;
929 906
930 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
931 { 908 {
932 next = tmp->below; 909 next = tmp->below;
933 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
934 continue; 911 continue;
935 912
936 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
937 { 914 matched_objs.push_back (tmp);
938 drop (op, tmp);
939 if (--cnt <= 0) break;
940 did_one = 1;
941 } 915 }
942 }
943 916
944 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
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)
948 op->failmsg ("Only dropped some items, can't drop that many items at once."); 923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
949
950 update_after_inventory_change (op);
951 } 924 }
952 925
953 return 0; 926 return 0;
954} 927}
955 928
… …
1030 dynbuf_text buf (512, 512); 1003 dynbuf_text buf (512, 512);
1031 1004
1032 object *mon = head ? head : this; 1005 object *mon = head ? head : this;
1033 1006
1034 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 1007 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1035 buf << "It is an undead force.\n"; 1008 buf << "It is an undead force.\r";
1036 1009
1037 if (mon->level > who->level) 1010 if (mon->level > who->level)
1038 buf << "It is likely more powerful than you.\n"; 1011 buf << "It is likely more powerful than you.\r";
1039 else if (mon->level < who->level) 1012 else if (mon->level < who->level)
1040 buf << "It is likely less powerful than you.\n"; 1013 buf << "It is likely less powerful than you.\r";
1041 else 1014 else
1042 buf << "It is probably as powerful as you.\n"; 1015 buf << "It is probably as powerful as you.\r";
1043 1016
1044 if (mon->attacktype & AT_ACID) 1017 if (mon->attacktype & AT_ACID)
1045 buf << "You seem to smell an acrid odor.\n"; 1018 buf << "You seem to smell an acrid odor.\r";
1046 1019
1047 /* Anyone know why this used to use the clone value instead of the 1020 /* Anyone know why this used to use the clone value instead of the
1048 * maxhp field? This seems that it should give more accurate results. 1021 * maxhp field? This seems that it should give more accurate results.
1049 */ 1022 */
1050 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1023 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1051 { /* From 1-4 */ 1024 { /* From 1-4 */
1052 case 1: 1025 case 1:
1053 buf << "It is in a bad shape.\n"; 1026 buf << "It is in a bad shape.\r";
1054 break; 1027 break;
1055 case 2: 1028 case 2:
1056 buf << "It is hurt.\n"; 1029 buf << "It is hurt.\r";
1057 break; 1030 break;
1058 case 3: 1031 case 3:
1059 buf << "It is somewhat hurt.\n"; 1032 buf << "It is somewhat hurt.\r";
1060 break; 1033 break;
1061 case 4: 1034 case 4:
1062 buf << "It is in excellent shape.\n"; 1035 buf << "It is in excellent shape.\r";
1063 break; 1036 break;
1064 } 1037 }
1065 1038
1066 if (present_in_ob (POISONING, mon)) 1039 if (present_in_ob (POISONING, mon))
1067 buf << "It looks very ill.\n"; 1040 buf << "It looks very ill.\r";
1041
1042 buf << '\n';
1068 1043
1069 return buf; 1044 return buf;
1070} 1045}
1071 1046
1072/* tmp is the object being described, pl is who is examing it. */ 1047/* tmp is the object being described, pl is who is examing it. */
… …
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.\n", long_desc (who).c_str ());
1136
1137 if (custom_name)
1138 buf.printf ("You call it %s\n", &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\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1145 break;
1146
1147 case BOOK:
1148 if (msg)
1149 buf << "Something is written in it.\n";
1150 break;
1151
1152 case CONTAINER:
1153 if (race != NULL)
1154 {
1155 if (weight_limit && stats.Str < 100)
1156 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1157 &race, weight_limit / (10.0 * (100 - stats.Str)));
1158 else
1159 buf.printf ("It can hold only %s.\n", &race);
1160 }
1161 else if (weight_limit && stats.Str < 100)
1162 buf.printf ("Its weight limit is %.1f kg.\n", 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.\n", stats.food);
1168 break;
1169 }
1170
1171 if (materialname && !msg)
1172 buf.printf ("It is made of: %s.\n", &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 << ".\n";
1185 }
1186
1187 if (weight)
1188 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", 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.\n", 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.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1198 else
1199 buf.printf ("You are offered %s for %s.\n", 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.\n";
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 && *msg != '@')
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:\n";
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