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.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.129 by root, Mon Oct 29 23:55:55 2012 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,2011,2012 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
… …
68 67
69 int tmpmatch = item_matched_string (pl, tmp, params); 68 int tmpmatch = item_matched_string (pl, tmp, params);
70 69
71 if (tmpmatch > match_val) 70 if (tmpmatch > match_val)
72 { 71 {
73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 72 if ((aflag == AP_APPLY) && (tmp->flag [FLAG_APPLIED]))
74 continue; 73 continue;
75 74
76 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 75 if ((aflag == AP_UNAPPLY) && (!tmp->flag [FLAG_APPLIED]))
77 continue; 76 continue;
78 77
79 match_val = tmpmatch; 78 match_val = tmpmatch;
80 best = tmp; 79 best = tmp;
81 } 80 }
… …
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 */
170int 152int
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, shstr_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
… …
227 * not need to use split_ob and stuff. 209 * not need to use split_ob and stuff.
228 */ 210 */
229int 211int
230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
231{ 213{
232 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 if (!sack->flag [FLAG_APPLIED])
233 { 215 {
234 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 216 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
235 return 0; 217 return 0;
236 } 218 }
237 219
… …
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 {
… …
273 * pick up (0 means all of them) 255 * pick up (0 means all of them)
274 */ 256 */
275static void 257static void
276pick_up_object (object *pl, object *op, object *tmp, int nrof) 258pick_up_object (object *pl, object *op, object *tmp, int nrof)
277{ 259{
278 object *env = tmp->env;
279 uint32 weight, effective_weight_limit; 260 uint32 weight, effective_weight_limit;
280 int tmp_nrof = tmp->number_of (); 261 int tmp_nrof = tmp->number_of ();
281 262
282 /* IF the player is flying & trying to take the item out of a container 263 /* IF the player is flying & trying to take the item out of a container
283 * that is in his inventory, let him. tmp->env points to the container 264 * that is in his inventory, let him. tmp->env points to the container
284 * (sack, luggage, etc), tmp->env->env then points to the player (nested 265 * (sack, luggage, etc), tmp->env->env then points to the player (nested
285 * containers not allowed as of now) 266 * containers not allowed as of now)
286 */ 267 */
287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 268 if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl)
288 { 269 {
289 pl->failmsg ("You are levitating, you can't reach the ground! " 270 pl->failmsg ("You are levitating, you can't reach the ground! "
290 "H<You have to stop levitating first, if you can, either by using your levitation skill, " 271 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
291 "or waiting till the levitation effect wears off.>"); 272 "or waiting till the levitation effect wears off.>");
292 return; 273 return;
293 } 274 }
294 275
295 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 276 if (tmp->flag [FLAG_NO_DROP])
296 return; 277 return;
297 278
298 if (nrof > tmp_nrof || nrof <= 0) 279 if (nrof > tmp_nrof || nrof <= 0)
299 nrof = tmp_nrof; 280 nrof = tmp_nrof;
300 281
… …
312 } 293 }
313 294
314 if (!can_split (pl, tmp, nrof)) 295 if (!can_split (pl, tmp, nrof))
315 return; 296 return;
316 297
317 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 298 if (tmp->flag [FLAG_UNPAID])
318 { 299 {
319 tmp->flag.reset (FLAG_UNPAID); 300 tmp->flag.reset (FLAG_UNPAID);
320 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)); 301 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));
321 tmp->flag.set (FLAG_UNPAID); 302 tmp->flag.set (FLAG_UNPAID);
322 } 303 }
… …
377 count = tmp->nrof; 358 count = tmp->nrof;
378 359
379 /* container is open, so use it */ 360 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP]) 361 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op; 362 alt = op;
382 else if (op->container) 363 else if ((alt = op->container_ ()))
383 { 364 {
384 alt = op->container;
385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 365 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386 goto leave; 366 goto leave;
387 } 367 }
388 else 368 else
389 { /* non container pickup */ 369 { /* non container pickup */
390 for (alt = op->inv; alt; alt = alt->below) 370 for (alt = op->inv; alt; alt = alt->below)
391 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 371 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
392 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count)) 372 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
393 break; /* perfect match */ 373 break; /* perfect match */
394 374
395 if (!alt) 375 if (!alt)
396 for (alt = op->inv; alt; alt = alt->below) 376 for (alt = op->inv; alt; alt = alt->below)
397 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count)) 377 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] && sack_can_hold (NULL, alt, tmp, count))
398 break; /* General container comes next */ 378 break; /* General container comes next */
399 379
400 if (!alt) 380 if (!alt)
401 alt = op; /* No free containers */ 381 alt = op; /* No free containers */
402 } 382 }
… …
412#ifdef PICKUP_DEBUG 392#ifdef PICKUP_DEBUG
413 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 393 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
414#endif 394#endif
415 395
416 /* startequip items are not allowed to be put into containers: */ 396 /* startequip items are not allowed to be put into containers: */
417 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 397 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
418 { 398 {
419 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!"); 399 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
420 goto leave; 400 goto leave;
421 } 401 }
422 402
… …
443int 423int
444command_take (object *op, char *params) 424command_take (object *op, char *params)
445{ 425{
446 object *tmp, *next; 426 object *tmp, *next;
447 427
448 if (op->container) 428 if (op->container_ ())
449 tmp = op->container->inv; 429 tmp = op->container_ ()->inv;
450 else 430 else
451 { 431 {
452 tmp = op->above; 432 tmp = op->above;
453 if (tmp) 433 if (tmp)
454 while (tmp->above) 434 while (tmp->above)
… …
466 446
467 /* Makes processing easier */ 447 /* Makes processing easier */
468 if (params && *params == '\0') 448 if (params && *params == '\0')
469 params = 0; 449 params = 0;
470 450
471 int cnt = MAX_ITEM_PER_DROP; 451 int cnt = MAX_ITEM_PER_ACTION;
472 452
473 while (tmp) 453 while (tmp)
474 { 454 {
475 next = tmp->below; 455 next = tmp->below;
476 456
… …
520 500
521 return 0; 501 return 0;
522} 502}
523 503
524/* 504/*
525 * This function was part of drop, now is own function. 505 * This function was part of drop, now is own function.
526 * Player 'op' tries to put object 'tmp' into sack 'sack', 506 * Player 'op' tries to put object 'tmp' into sack 'sack',
527 * if nrof is non zero, then nrof objects is tried to put into sack. 507 * if nrof is non zero, then nrof objects is tried to put into sack.
508 *
528 * Note that the 'sack' in question can now be a transport, 509 * Note that the 'sack' in question can now be a transport,
529 * so this function isn't named very good anymore. 510 * so this function isn't named very good anymore.
530 */ 511 */
531void 512void
532put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 513put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
533{ 514{
534 object *tmp2, *sack2; 515 object *tmp2;
535 char buf[MAX_BUF]; 516 char buf[MAX_BUF];
536 517
537 if (sack == tmp) 518 if (sack == tmp)
538 return; /* Can't put an object in itself */ 519 return; /* Can't put an object in itself */
539 520
540 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 521 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
541 { 522 {
542 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 523 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
543 return; 524 return;
544 } 525 }
545 526
… …
547 { 528 {
548 /* Eneq(@csd.uu.se): If the object to be dropped is a container 529 /* Eneq(@csd.uu.se): If the object to be dropped is a container
549 * we instead move the contents of that container into the active 530 * we instead move the contents of that container into the active
550 * container, this is only done if the object has something in it. 531 * container, this is only done if the object has something in it.
551 */ 532 */
552 sack2 = tmp;
553 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack)); 533 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
554 534
555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 535 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
556 { 536 {
557 tmp = tmp2->below; 537 tmp = tmp2->below;
558 538
559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 539 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
560 put_object_in_sack (op, sack, tmp2, 0); 540 put_object_in_sack (op, sack, tmp2, 0);
561 else 541 else
562 { 542 {
563 sprintf (buf, "Your %s fills up.", query_name (sack)); 543 sprintf (buf, "Your %s fills up.", query_name (sack));
564 new_draw_info (NDI_UNIQUE, 0, op, buf); 544 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
573 * already checked this. 553 * already checked this.
574 */ 554 */
575 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 555 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
576 return; 556 return;
577 557
578 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 558 if (tmp->flag [FLAG_APPLIED])
579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 559 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
580 return; 560 return;
581 561
582 /* we want to put some portion of the item into the container */ 562 /* we want to put some portion of the item into the container */
583 if (!can_split (op, tmp, nrof)) 563 if (!can_split (op, tmp, nrof))
584 return; 564 return;
585 565
586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 566 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
587 sack->insert (tmp); 567 sack->insert (tmp);
588} 568}
589 569
570/* In contrast to drop_object (op, tmp, nrof) above this function takes the
571 * already split off object, and feeds it to the event handlers and does
572 * other magic with it.
573 *
574 * <droppper> is the object that dropped this object and <obj> is the
575 * object that was dropped.
576 *
577 * Make sure to check what happened with <obj> after this function returns!
578 * Otherwise you may leak this object.
579 */
580void
581drop_object (object *dropper, object *obj)
582{
583 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
584 return;
585
586 if (obj->destroyed () || obj->is_inserted ())
587 return;
588
589 if (obj->flag [FLAG_STARTEQUIP])
590 {
591 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
592 dropper->statusmsg ("The god who lent it to you retrieves it.");
593
594 obj->destroy ();
595 dropper->update_stats ();
596 return;
597 }
598
599 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
600 floor;
601 floor = floor->above)
602 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
603 return;
604
605 if (obj->destroyed () || obj->is_inserted ())
606 return;
607
608 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
609 if (!sell_item (obj, dropper))
610 return;
611
612 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
613 return;
614
615 /* If nothing special happened with this object, the default action is to
616 * insert it below the dropper:
617 */
618
619 obj->x = dropper->x;
620 obj->y = dropper->y;
621
622 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
623}
624
590/* 625/*
591 * This function was part of drop, now is own function. 626 * This function was part of drop, now is own function.
592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 627 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
593 * nrof objects is tried to dropped. 628 * nrof objects are tried to drop.
594 * This is used when dropping objects onto the floor. 629 * This is used when dropping objects onto the floor.
595 */ 630 */
596void 631void
597drop_object (object *op, object *tmp, uint32 nrof) 632drop_object (object *op, object *tmp, uint32 nrof)
598{ 633{
599 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 634 if (tmp->flag [FLAG_NO_DROP])
600 return; 635 return;
601 636
602 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 637 if (tmp->flag [FLAG_APPLIED])
603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 638 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
604 return; /* can't unapply it */ 639 return; /* can't unapply it */
605
606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
607 640
608 /* We are only dropping some of the items. We split the current object 641 /* We are only dropping some of the items. We split the current object
609 * off 642 * off
610 */ 643 */
611 if (!can_split (op, tmp, nrof)) 644 if (!can_split (op, tmp, nrof))
612
613 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
614 return; 645 return;
615 646
616 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 647 drop_object (op, tmp);
617 {
618 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
619 op->statusmsg ("The gods who lent it to you retrieves it.");
620 648
621 tmp->destroy (); 649 if (!tmp->destroyed () && !tmp->is_inserted ())
622 op->update_stats ();
623 return;
624 } 650 {
625 651 // if nothing happened with the object we give it back
626 /* Call this before we update the various windows/players. At least 652 op->insert (tmp);
627 * that we, we know the weight is correct.
628 */
629 // 2007-11-26: moved op->update_stats away and calling it later after
630 // all items of a drop command have been processed.
631
632 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
633 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
634 return;
635
636 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
637 { 653 }
638 if (!sell_item (tmp, op))
639 return; // if we can't sell it we don't drop it
640 }
641
642 tmp->x = op->x;
643 tmp->y = op->y;
644
645 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
646} 654}
647 655
648void 656void
649drop (object *op, object *tmp) 657drop (object *op, object *tmp)
650{ 658{
… …
659 if (tmp->env && tmp->env->type != PLAYER) 667 if (tmp->env && tmp->env->type != PLAYER)
660 { 668 {
661 /* Just toss the object - probably shouldn't be hanging 669 /* Just toss the object - probably shouldn't be hanging
662 * around anyways 670 * around anyways
663 */ 671 */
664 tmp->remove ();
665 tmp->destroy (); 672 tmp->destroy ();
666 return; 673 return;
667 } 674 }
668 else 675 else
669 {
670 while (tmp && tmp->invisible) 676 while (tmp && tmp->invisible)
671 tmp = tmp->below; 677 tmp = tmp->below;
672 }
673 } 678 }
674 679
675 if (tmp == NULL) 680 if (!tmp)
676 { 681 {
677 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 682 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
678 return; 683 return;
679 } 684 }
680 685
681 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 686 if (tmp->flag [FLAG_INV_LOCKED])
682 { 687 {
683 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 688 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
684 return; 689 return;
685 } 690 }
686 691
687 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 692 if (tmp->flag [FLAG_NO_DROP])
688 { 693 {
689#if 0 694#if 0
690 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 695 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
691 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 696 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
692#endif 697#endif
… …
694 } 699 }
695 700
696 if (op->type == PLAYER && op->contr->last_used == tmp) 701 if (op->type == PLAYER && op->contr->last_used == tmp)
697 op->contr->last_used = tmp->below ? tmp->below 702 op->contr->last_used = tmp->below ? tmp->below
698 : tmp->above ? tmp->above 703 : tmp->above ? tmp->above
699 : 0; 704 : (object *)0;
700 705
701 if (op->container) 706 if (op->container_ ())
702 { 707 {
703 if (op->type == PLAYER) 708 if (op->type == PLAYER)
704 put_object_in_sack (op, op->container, tmp, op->contr->count); 709 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
705 else 710 else
706 put_object_in_sack (op, op->container, tmp, 0); 711 put_object_in_sack (op, op->container_ (), tmp, 0);
707 } 712 }
708 else 713 else
709 { 714 {
710 if (op->type == PLAYER) 715 if (op->type == PLAYER)
711 drop_object (op, tmp, op->contr->count); 716 drop_object (op, tmp, op->contr->count);
… …
738 /* 743 /*
739 Care must be taken that the next item pointer is not to money as 744 Care must be taken that the next item pointer is not to money as
740 the drop() routine will do unknown things to it when dropping 745 the drop() routine will do unknown things to it when dropping
741 in a shop. --Tero.Pelander@utu.fi 746 in a shop. --Tero.Pelander@utu.fi
742 */ 747 */
743
744 int cnt = MAX_ITEM_PER_DROP; 748 int cnt = MAX_ITEM_PER_ACTION;
745 749
746 if (!params) 750 if (!params)
747 { 751 {
748 while (curinv) 752 while (curinv)
749 { 753 {
750 nextinv = curinv->below; 754 nextinv = curinv->below;
751 755
752 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
753 nextinv = nextinv->below; 757 nextinv = nextinv->below;
754 758
755 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!curinv->flag [FLAG_INV_LOCKED]
756 curinv->type != FOOD && curinv->type != KEY && 760 && !curinv->invisible
757 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 && curinv->type != MONEY
758 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 762 && curinv->type != FOOD
763 && curinv->type != KEY
764 && curinv->type != SPECIAL_KEY
765 && curinv->type != GEM
766 && curinv->type != CONTAINER)
759 { 767 {
760 drop (op, curinv); 768 drop (op, curinv);
761 if (--cnt <= 0) break; 769 if (--cnt <= 0) break;
762 } 770 }
763 771
… …
771 nextinv = curinv->below; 779 nextinv = curinv->below;
772 780
773 while (nextinv && nextinv->type == MONEY) 781 while (nextinv && nextinv->type == MONEY)
774 nextinv = nextinv->below; 782 nextinv = nextinv->below;
775 783
776 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 784 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
777 { 785 {
778 drop (op, curinv); 786 drop (op, curinv);
779 if (--cnt <= 0) break; 787 if (--cnt <= 0) break;
780 } 788 }
781 789
… …
789 nextinv = curinv->below; 797 nextinv = curinv->below;
790 798
791 while (nextinv && nextinv->type == MONEY) 799 while (nextinv && nextinv->type == MONEY)
792 nextinv = nextinv->below; 800 nextinv = nextinv->below;
793 801
794 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 802 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
795 { 803 {
796 drop (op, curinv); 804 drop (op, curinv);
797 if (--cnt <= 0) break; 805 if (--cnt <= 0) break;
798 } 806 }
799 807
… …
807 nextinv = curinv->below; 815 nextinv = curinv->below;
808 816
809 while (nextinv && nextinv->type == MONEY) 817 while (nextinv && nextinv->type == MONEY)
810 nextinv = nextinv->below; 818 nextinv = nextinv->below;
811 819
812 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 820 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
813 { 821 {
814 switch (curinv->type) 822 switch (curinv->type)
815 { 823 {
816 case HORN: 824 case HORN:
817 case BOOK: 825 case BOOK:
… …
849 857
850/* draw_look(op);*/ 858/* draw_look(op);*/
851 return 0; 859 return 0;
852} 860}
853 861
862
863/* This function tries to drop all objects in the <objs> vector.
864 * <dropper> is the object that wants to drop them.
865 * <cnt> can be a 0 pointer or a pointer to the maximum number of
866 * drop operations to perform.
867 *
868 * Returns true if at least one item was dropped.
869 */
870static bool
871drop_vector (object *dropper, vector<object *> &objs, int *cnt)
872{
873 vector<object *>::iterator i;
874
875 bool did_one = false;
876
877 for (i = objs.begin (); i != objs.end (); i++)
878 {
879 drop (dropper, *i);
880 if (cnt && --*cnt <= 0) break;
881 did_one = true;
882 }
883
884 return did_one;
885}
886
854/* Object op wants to drop object(s) params. params can be a 887/* Object op wants to drop object(s) params. params can be a
855 * comma seperated list. 888 * comma seperated list.
856 */ 889 */
857int 890int
858command_drop (object *op, char *params) 891command_drop (object *op, char *params)
859{ 892{
860 object *tmp, *next; 893 object *tmp, *next;
861 int did_one = 0;
862 894
863 if (!params) 895 if (!params)
864 { 896 {
865 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 897 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
866 return 0; 898 return 0;
867 } 899 }
868 else 900 else
869 { 901 {
870 int cnt = MAX_ITEM_PER_DROP; 902 vector<object *> matched_objs;
871 903
872 for (tmp = op->inv; tmp; tmp = next) 904 for (tmp = op->inv; tmp; tmp = next)
873 { 905 {
874 next = tmp->below; 906 next = tmp->below;
875 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 907 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
876 continue; 908 continue;
877 909
878 if (item_matched_string (op, tmp, params)) 910 if (item_matched_string (op, tmp, params))
879 { 911 matched_objs.push_back (tmp);
880 drop (op, tmp);
881 if (--cnt <= 0) break;
882 did_one = 1;
883 } 912 }
884 }
885 913
886 if (!did_one) 914 int cnt = MAX_ITEM_PER_ACTION;
915
916 if (!drop_vector (op, matched_objs, &cnt))
887 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 917 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
888 918
889 if (cnt <= 0) 919 if (cnt <= 0)
890 op->failmsg ("Only dropped some items, can't drop that many items at once."); 920 op->failmsg ("Only dropped some items, can't drop that many items at once.");
891 } 921 }
… …
917 } 947 }
918 948
919 return 0; 949 return 0;
920} 950}
921 951
922/* op should be a player.
923 * we return the object the player has marked with the 'mark' command
924 * below. If no match is found (or object has changed), we return
925 * NULL. We leave it up to the calling function to print messages if
926 * nothing is found.
927 */
928object *
929find_marked_object (object *op)
930{
931 object *tmp;
932
933 if (!op || !op->contr)
934 return NULL;
935
936 if (!op->contr->mark)
937 {
938/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
939 return 0;
940 }
941
942 /* This may seem like overkill, but we need to make sure that they
943 * player hasn't dropped the item. We use count on the off chance that
944 * an item got reincarnated at some point.
945 */
946 for (tmp = op->inv; tmp; tmp = tmp->below)
947 {
948 if (tmp->invisible)
949 continue;
950
951 if (tmp == op->contr->mark)
952 {
953 if (!tmp->destroyed ())
954 return tmp;
955 else
956 {
957 op->contr->mark = 0;
958/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
959 return 0;
960 }
961 }
962 }
963
964 return 0;
965}
966
967std::string 952std::string
968object::describe_monster (object *who) 953object::describe_monster (object *who)
969{ 954{
970 dynbuf_text buf (512, 512); 955 dynbuf_text buf (512, 512);
971 956
972 object *mon = head ? head : this; 957 object *mon = head ? head : this;
973 958
974 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 959 if (mon->flag [FLAG_UNDEAD])
975 buf << " - It is an undead force.\n"; 960 buf << "It is an undead force.\r";
976 961
977 if (mon->level > who->level) 962 if (mon->level > who->level)
978 buf << " - It is likely more powerful than you.\n"; 963 buf << "It is likely more powerful than you.\r";
979 else if (mon->level < who->level) 964 else if (mon->level < who->level)
980 buf << " - It is likely less powerful than you.\n"; 965 buf << "It is likely less powerful than you.\r";
981 else 966 else
982 buf << " - It is probably as powerful as you.\n"; 967 buf << "It is probably as powerful as you.\r";
983 968
984 if (mon->attacktype & AT_ACID) 969 if (mon->attacktype & AT_ACID)
985 buf << " - You seem to smell an acrid odor.\n"; 970 buf << "You seem to smell an acrid odor.\r";
986 971
987 /* Anyone know why this used to use the clone value instead of the 972 /* Anyone know why this used to use the clone value instead of the
988 * maxhp field? This seems that it should give more accurate results. 973 * maxhp field? This seems that it should give more accurate results.
989 */ 974 */
990 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 975 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
991 { /* From 1-4 */ 976 { /* From 1-4 */
992 case 1: 977 case 1:
993 buf << " - It is in a bad shape.\n"; 978 buf << "It is in a bad shape.\r";
994 break; 979 break;
995 case 2: 980 case 2:
996 buf << " - It is hurt.\n"; 981 buf << "It is hurt.\r";
997 break; 982 break;
998 case 3: 983 case 3:
999 buf << " - It is somewhat hurt.\n"; 984 buf << "It is somewhat hurt.\r";
1000 break; 985 break;
1001 case 4: 986 case 4:
1002 buf << " - It is in excellent shape.\n"; 987 buf << "It is in excellent shape.\r";
1003 break; 988 break;
1004 } 989 }
1005 990
1006 if (present_in_ob (POISONING, mon)) 991 if (present_in_ob (POISONING, mon))
1007 buf << " - It looks very ill.\n"; 992 buf << "It looks very ill.\r";
993
994 buf << '\n';
1008 995
1009 return buf; 996 return buf;
1010} 997}
1011 998
1012/* tmp is the object being described, pl is who is examing it. */ 999/* tmp is the object being described, pl is who is examing it. */
… …
1019} 1006}
1020 1007
1021std::string 1008std::string
1022object::long_desc (object *who) 1009object::long_desc (object *who)
1023{ 1010{
1024 std::string buf (query_name (this)); 1011 std::string buf (query_name ());
1025 1012
1026 switch (type) 1013 switch (type)
1027 { 1014 {
1028 case RING: 1015 case RING:
1029 case SKILL: 1016 case SKILL:
… …
1034 case SHIELD: 1021 case SHIELD:
1035 case BOOTS: 1022 case BOOTS:
1036 case GLOVES: 1023 case GLOVES:
1037 case AMULET: 1024 case AMULET:
1038 case GIRDLE: 1025 case GIRDLE:
1026 case RANGED:
1039 case BOW: 1027 case BOW:
1040 case ARROW: 1028 case ARROW:
1041 case CLOAK: 1029 case CLOAK:
1042 case FOOD: 1030 case FOOD:
1043 case DRINK: 1031 case DRINK:
1044 case FLESH: 1032 case FLESH:
1045 case SKILL_TOOL: 1033 case SKILL_TOOL:
1034 case LAMP:
1046 case POWER_CRYSTAL: 1035 case POWER_CRYSTAL:
1047 { 1036 {
1048 const char *cp = ::describe_item (this, who); 1037 const char *cp = ::describe_item (this, who);
1049 1038
1050 if (*cp) 1039 if (*cp)
… …
1065examine_monster (object *op, object *tmp) 1054examine_monster (object *op, object *tmp)
1066{ 1055{
1067 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1056 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1068} 1057}
1069 1058
1070std::string
1071object::describe (object *who)
1072{
1073 dynbuf_text buf (1024, 1024);
1074
1075 buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());
1076
1077 if (custom_name)
1078 buf.printf ("You call it %s.\n\n", &custom_name);
1079
1080 switch (type)
1081 {
1082 case SPELLBOOK:
1083 if (flag [FLAG_IDENTIFIED] && inv)
1084 buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1085 break;
1086
1087 case BOOK:
1088 if (msg)
1089 buf << "Something is written in it.\n";
1090 break;
1091
1092 case CONTAINER:
1093 if (race != NULL)
1094 {
1095 if (weight_limit && stats.Str < 100)
1096 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1097 &race, weight_limit / (10.0 * (100 - stats.Str)));
1098 else
1099 buf.printf ("It can hold only %s.\n", &race);
1100 }
1101 else if (weight_limit && stats.Str < 100)
1102 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1103 break;
1104
1105 case WAND:
1106 if (flag [FLAG_IDENTIFIED])
1107 buf.printf ("It has %d charges left.\n", stats.food);
1108 break;
1109 }
1110
1111 if (materialname && !msg)
1112 buf.printf ("It is made of: %s.\n", &materialname);
1113
1114 if (who)
1115 /* Where to wear this item */
1116 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1117 if (slot[i].info)
1118 {
1119 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1120
1121 if (slot[i].info < -1 && who->slot[i].info)
1122 buf.printf ("(%d)", -slot[i].info);
1123
1124 buf << ".\n";
1125 }
1126
1127 if (weight)
1128 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1129
1130 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1131 {
1132 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1133
1134 if (is_in_shop (who))
1135 {
1136 if (flag [FLAG_UNPAID])
1137 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1138 else
1139 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1140 }
1141 }
1142
1143 if (flag [FLAG_MONSTER])
1144 buf << describe_monster (who);
1145
1146 /* Is this item buildable? */
1147 if (flag [FLAG_IS_BUILDABLE])
1148 buf << "This is a buildable item.\n";
1149
1150 /* Does the object have a message? Don't show message for all object
1151 * types - especially if the first entry is a match
1152 */
1153 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1154 {
1155 /* This is just a hack so when identifying the items, we print
1156 * out the extra message
1157 */
1158 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1159 buf << "The object has a story:\n\n";
1160
1161 buf << msg << '\n';
1162 }
1163
1164 buf << '\n';
1165
1166 return std::string (buf.linearise (), buf.size ());
1167}
1168
1169static void 1059static void
1170display_new_pickup (object *op) 1060display_new_pickup (object *op)
1171{ 1061{
1172 int i = op->contr->mode; 1062 int i = op->contr->mode;
1173 1063
1174 if (!(i & PU_NEWMODE))
1175 return;
1176
1177 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1178 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1064 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1179 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1065 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1180 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1066 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1181 1067
1182 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1068 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1233 }; 1119 };
1234 1120
1235 if (!params) 1121 if (!params)
1236 { 1122 {
1237 /* if the new mode is used, just print the settings */ 1123 /* if the new mode is used, just print the settings */
1238 if (op->contr->mode & PU_NEWMODE)
1239 {
1240 display_new_pickup (op); 1124 display_new_pickup (op);
1241 return 1;
1242 }
1243 if (1)
1244 LOG (llevDebug, "command_pickup: !params\n");
1245 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1246 return 0; 1125 return 0;
1247 } 1126 }
1248 1127
1249 while (*params == ' ' && *params) 1128 while (*params == ' ' && *params)
1250 params++; 1129 params++;
… …
1256 for (mode = 0; names[mode]; mode++) 1135 for (mode = 0; names[mode]; mode++)
1257 { 1136 {
1258 if (!strcmp (names[mode], params + 1)) 1137 if (!strcmp (names[mode], params + 1))
1259 { 1138 {
1260 i = op->contr->mode; 1139 i = op->contr->mode;
1261 if (!(i & PU_NEWMODE)) 1140
1262 i = PU_NEWMODE;
1263 if (*params == '+') 1141 if (*params == '+')
1264 i = i | modes[mode]; 1142 i = i | modes[mode];
1265 else 1143 else
1266 i = i & ~modes[mode]; 1144 i = i & ~modes[mode];
1145
1267 op->contr->mode = i; 1146 op->contr->mode = i;
1268 display_new_pickup (op); 1147 display_new_pickup (op);
1269 return 1; 1148 return 1;
1270 } 1149 }
1271 } 1150 }
… …
1273 return 1; 1152 return 1;
1274 } 1153 }
1275 1154
1276 if (sscanf (params, "%u", &i) != 1) 1155 if (sscanf (params, "%u", &i) != 1)
1277 { 1156 {
1278 if (1)
1279 LOG (llevDebug, "command_pickup: params==NULL\n");
1280 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1157 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1281 return 1; 1158 return 1;
1282 } 1159 }
1283 set_pickup_mode (op, i); 1160
1161 if (i <= PU_RATIO)
1162 i |= op->contr->mode & ~PU_RATIO;
1163
1164 op->contr->mode = i;
1284 1165
1285 return 1; 1166 return 1;
1286} 1167}
1287 1168
1288void
1289set_pickup_mode (object *op, int i)
1290{
1291 switch (op->contr->mode = i)
1292 {
1293 case 0:
1294 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1295 break;
1296 case 1:
1297 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1298 break;
1299 case 2:
1300 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1301 break;
1302 case 3:
1303 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1304 break;
1305 case 4:
1306 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1307 break;
1308 case 5:
1309 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1310 break;
1311 case 6:
1312 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1313 break;
1314 case 7:
1315 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1316 break;
1317 }
1318}
1319
1320int 1169int
1321command_search_items (object *op, char *params) 1170command_search_items (object *op, char *params)
1322{ 1171{
1323 char buf[MAX_BUF];
1324
1325 if (settings.search_items == FALSE)
1326 return 1;
1327
1328 if (params == NULL) 1172 if (params == NULL)
1329 { 1173 {
1330 if (op->contr->search_str[0] == '\0') 1174 if (op->contr->search_str[0] == '\0')
1331 { 1175 {
1332 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1176 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1333 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1177 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1334 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1178 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1335 return 1; 1179 return 1;
1336 } 1180 }
1337 1181
1338 op->contr->search_str[0] = '\0'; 1182 op->contr->search_str[0] = '\0';
1339 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1183 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1340 op->update_stats (); 1184 op->contr->queue_stats_update ();
1341 return 1; 1185 return 1;
1342 } 1186 }
1343 1187
1344 if ((int) strlen (params) >= MAX_BUF) 1188 if (strlen (params) >= sizeof (op->contr->search_str))
1345 { 1189 {
1346 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1190 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1347 return 1; 1191 return 1;
1348 } 1192 }
1349 1193
1350 strcpy (op->contr->search_str, params); 1194 strcpy (op->contr->search_str, params);
1351 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1195 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1352 new_draw_info (NDI_UNIQUE, 0, op, buf); 1196 op->contr->queue_stats_update ();
1353 op->update_stats (); 1197
1354 return 1; 1198 return 1;
1355} 1199}
1356 1200
1201int
1202command_unlock (object *op, char *params)
1203{
1204 /* if the unlock command typed with nothing, unlock everything,
1205 * this might be bad
1206 */
1207 if (params == NULL)
1208 {
1209 for (object *item = op->inv; item; item = item->below)
1210 {
1211 item->clr_flag (FLAG_INV_LOCKED);
1212 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1213 esrv_update_item (UPD_FLAGS, op, item);
1214 }
1215 return 0;
1216 }
1217
1218 /* if the unlock command is used with a param,
1219 * unlock what matches. i.e. unlock material, should unlock all the materials
1220 */
1221 for (object *item = op->inv; item; item = item->below)
1222 if (item->name.contains (params))
1223 {
1224 item->clr_flag (FLAG_INV_LOCKED);
1225 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1226 esrv_update_item (UPD_FLAGS, op, item);
1227 }
1228
1229 return 0;
1230}
1231
1232int
1233command_lock (object *op, char *params)
1234{
1235 /* if the lock command is typed by itself, lock everything
1236 */
1237 if (params == NULL)
1238 {
1239 for (object *item = op->inv; item; item = item->below)
1240 {
1241 item->set_flag (FLAG_INV_LOCKED);
1242 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1243 esrv_update_item (UPD_FLAGS, op, item);
1244 }
1245 return 0;
1246 }
1247
1248 /* if the lock command is used with a param, lock what matches.
1249 * i.e. lock material, should lock all the materials
1250 */
1251 for (object *item = op->inv; item; item = item->below)
1252 if (item->name.contains (params))
1253 {
1254 item->set_flag (FLAG_INV_LOCKED);
1255 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1256 esrv_update_item (UPD_FLAGS, op, item);
1257 }
1258
1259 return 0;
1260}
1261
1262/* op should be a player, params is any params.
1263 * If no params given, we print out the currently marked object.
1264 * otherwise, try to find a matching object - try best match first.
1265 */
1266int
1267command_mark (object *op, char *params)
1268{
1269 if (!params)
1270 {
1271 if (object *mark = op->mark ())
1272 op->statusmsg (format ("%s is marked.", query_name (mark)));
1273 else
1274 op->failmsg ("You have no marked object.");
1275 }
1276 else
1277 {
1278 if (object *mark = find_best_object_match (op, params))
1279 {
1280 op->contr->mark = mark;
1281 op->statusmsg (format ("Marked item %s", query_name (mark)));
1282 }
1283 else
1284 op->failmsgf ("Could not find an object that matches %s", params);
1285 }
1286
1287 return 0; /*shouldnt get here */
1288}
1289

Diff Legend

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