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.89 by elmex, Mon Jan 12 00:17:23 2009 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,2009 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 }
… …
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.
153 */ 151 */
154int 152int
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, shstr_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
… …
211 * not need to use split_ob and stuff. 209 * not need to use split_ob and stuff.
212 */ 210 */
213int 211int
214sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
215{ 213{
216 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 if (!sack->flag [FLAG_APPLIED])
217 { 215 {
218 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));
219 return 0; 217 return 0;
220 } 218 }
221 219
… …
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 {
… …
257 * pick up (0 means all of them) 255 * pick up (0 means all of them)
258 */ 256 */
259static void 257static void
260pick_up_object (object *pl, object *op, object *tmp, int nrof) 258pick_up_object (object *pl, object *op, object *tmp, int nrof)
261{ 259{
262 object *env = tmp->env;
263 uint32 weight, effective_weight_limit; 260 uint32 weight, effective_weight_limit;
264 int tmp_nrof = tmp->number_of (); 261 int tmp_nrof = tmp->number_of ();
265 262
266 /* 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
267 * 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
268 * (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
269 * containers not allowed as of now) 266 * containers not allowed as of now)
270 */ 267 */
271 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)
272 { 269 {
273 pl->failmsg ("You are levitating, you can't reach the ground! " 270 pl->failmsg ("You are levitating, you can't reach the ground! "
274 "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, "
275 "or waiting till the levitation effect wears off.>"); 272 "or waiting till the levitation effect wears off.>");
276 return; 273 return;
277 } 274 }
278 275
279 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 276 if (tmp->flag [FLAG_NO_DROP])
280 return; 277 return;
281 278
282 if (nrof > tmp_nrof || nrof <= 0) 279 if (nrof > tmp_nrof || nrof <= 0)
283 nrof = tmp_nrof; 280 nrof = tmp_nrof;
284 281
… …
296 } 293 }
297 294
298 if (!can_split (pl, tmp, nrof)) 295 if (!can_split (pl, tmp, nrof))
299 return; 296 return;
300 297
301 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 298 if (tmp->flag [FLAG_UNPAID])
302 { 299 {
303 tmp->flag.reset (FLAG_UNPAID); 300 tmp->flag.reset (FLAG_UNPAID);
304 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));
305 tmp->flag.set (FLAG_UNPAID); 302 tmp->flag.set (FLAG_UNPAID);
306 } 303 }
… …
361 count = tmp->nrof; 358 count = tmp->nrof;
362 359
363 /* container is open, so use it */ 360 /* container is open, so use it */
364 if (tmp->flag [FLAG_STARTEQUIP]) 361 if (tmp->flag [FLAG_STARTEQUIP])
365 alt = op; 362 alt = op;
366 else if (op->container) 363 else if ((alt = op->container_ ()))
367 { 364 {
368 alt = op->container;
369 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 365 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
370 goto leave; 366 goto leave;
371 } 367 }
372 else 368 else
373 { /* non container pickup */ 369 { /* non container pickup */
374 for (alt = op->inv; alt; alt = alt->below) 370 for (alt = op->inv; alt; alt = alt->below)
375 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 371 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
376 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))
377 break; /* perfect match */ 373 break; /* perfect match */
378 374
379 if (!alt) 375 if (!alt)
380 for (alt = op->inv; alt; alt = alt->below) 376 for (alt = op->inv; alt; alt = alt->below)
381 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))
382 break; /* General container comes next */ 378 break; /* General container comes next */
383 379
384 if (!alt) 380 if (!alt)
385 alt = op; /* No free containers */ 381 alt = op; /* No free containers */
386 } 382 }
… …
396#ifdef PICKUP_DEBUG 392#ifdef PICKUP_DEBUG
397 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);
398#endif 394#endif
399 395
400 /* startequip items are not allowed to be put into containers: */ 396 /* startequip items are not allowed to be put into containers: */
401 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 397 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
402 { 398 {
403 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!");
404 goto leave; 400 goto leave;
405 } 401 }
406 402
… …
427int 423int
428command_take (object *op, char *params) 424command_take (object *op, char *params)
429{ 425{
430 object *tmp, *next; 426 object *tmp, *next;
431 427
432 if (op->container) 428 if (op->container_ ())
433 tmp = op->container->inv; 429 tmp = op->container_ ()->inv;
434 else 430 else
435 { 431 {
436 tmp = op->above; 432 tmp = op->above;
437 if (tmp) 433 if (tmp)
438 while (tmp->above) 434 while (tmp->above)
… …
450 446
451 /* Makes processing easier */ 447 /* Makes processing easier */
452 if (params && *params == '\0') 448 if (params && *params == '\0')
453 params = 0; 449 params = 0;
454 450
455 int cnt = MAX_ITEM_PER_DROP; 451 int cnt = MAX_ITEM_PER_ACTION;
456 452
457 while (tmp) 453 while (tmp)
458 { 454 {
459 next = tmp->below; 455 next = tmp->below;
460 456
… …
514 * so this function isn't named very good anymore. 510 * so this function isn't named very good anymore.
515 */ 511 */
516void 512void
517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 513put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
518{ 514{
519 object *tmp2, *sack2; 515 object *tmp2;
520 char buf[MAX_BUF]; 516 char buf[MAX_BUF];
521 517
522 if (sack == tmp) 518 if (sack == tmp)
523 return; /* Can't put an object in itself */ 519 return; /* Can't put an object in itself */
524 520
525 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 521 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
526 { 522 {
527 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));
528 return; 524 return;
529 } 525 }
530 526
… …
532 { 528 {
533 /* 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
534 * we instead move the contents of that container into the active 530 * we instead move the contents of that container into the active
535 * 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.
536 */ 532 */
537 sack2 = tmp;
538 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));
539 534
540 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 535 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
541 { 536 {
542 tmp = tmp2->below; 537 tmp = tmp2->below;
543 538
544 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)))
545 put_object_in_sack (op, sack, tmp2, 0); 540 put_object_in_sack (op, sack, tmp2, 0);
546 else 541 else
547 { 542 {
548 sprintf (buf, "Your %s fills up.", query_name (sack)); 543 sprintf (buf, "Your %s fills up.", query_name (sack));
549 new_draw_info (NDI_UNIQUE, 0, op, buf); 544 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
558 * already checked this. 553 * already checked this.
559 */ 554 */
560 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)))
561 return; 556 return;
562 557
563 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 558 if (tmp->flag [FLAG_APPLIED])
564 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 559 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
565 return; 560 return;
566 561
567 /* 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 */
568 if (!can_split (op, tmp, nrof)) 563 if (!can_split (op, tmp, nrof))
569 return; 564 return;
570 565
571 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));
572 sack->insert (tmp); 567 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 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
592
593 /* We are only dropping some of the items. We split the current object
594 * off
595 */
596 if (!can_split (op, tmp, nrof))
597 return;
598
599 drop_object (op, tmp);
600
601 if (!tmp->destroyed () && !tmp->is_inserted ())
602 {
603 // if nothing happened with the object we give it back
604 op->insert (tmp);
605 }
606} 568}
607 569
608/* In contrast to drop_object (op, tmp, nrof) above this function takes the 570/* In contrast to drop_object (op, tmp, nrof) above this function takes the
609 * already split off object, and feeds it to the event handlers and does 571 * already split off object, and feeds it to the event handlers and does
610 * other magic with it. 572 * other magic with it.
… …
613 * object that was dropped. 575 * object that was dropped.
614 * 576 *
615 * Make sure to check what happened with <obj> after this function returns! 577 * Make sure to check what happened with <obj> after this function returns!
616 * Otherwise you may leak this object. 578 * Otherwise you may leak this object.
617 */ 579 */
618
619void 580void
620drop_object (object *dropper, object *obj) 581drop_object (object *dropper, object *obj)
621{ 582{
622 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper))) 583 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
623 return; 584 return;
624 585
625 if (obj->destroyed () || obj->is_inserted ()) 586 if (obj->destroyed () || obj->is_inserted ())
626 return; 587 return;
627 588
628 if (QUERY_FLAG (obj, FLAG_STARTEQUIP)) 589 if (obj->flag [FLAG_STARTEQUIP])
629 { 590 {
630 dropper->statusmsg (format ("You drop the %s.", query_name (obj))); 591 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
631 dropper->statusmsg ("The god who lent it to you retrieves it."); 592 dropper->statusmsg ("The god who lent it to you retrieves it.");
632 593
633 obj->destroy (); 594 obj->destroy ();
… …
642 return; 603 return;
643 604
644 if (obj->destroyed () || obj->is_inserted ()) 605 if (obj->destroyed () || obj->is_inserted ())
645 return; 606 return;
646 607
647 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY) 608 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
648 if (!sell_item (obj, dropper)) 609 if (!sell_item (obj, dropper))
649 return; 610 return;
611
612 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
613 return;
650 614
651 /* If nothing special happened with this object, the default action is to 615 /* If nothing special happened with this object, the default action is to
652 * insert it below the dropper: 616 * insert it below the dropper:
653 */ 617 */
654 618
655 obj->x = dropper->x; 619 obj->x = dropper->x;
656 obj->y = dropper->y; 620 obj->y = dropper->y;
657 621
658 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR); 622 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
623}
624
625/*
626 * This function was part of drop, now is own function.
627 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
628 * nrof objects are tried to drop.
629 * This is used when dropping objects onto the floor.
630 */
631void
632drop_object (object *op, object *tmp, uint32 nrof)
633{
634 if (tmp->flag [FLAG_NO_DROP])
635 return;
636
637 if (tmp->flag [FLAG_APPLIED])
638 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
639 return; /* can't unapply it */
640
641 /* We are only dropping some of the items. We split the current object
642 * off
643 */
644 if (!can_split (op, tmp, nrof))
645 return;
646
647 drop_object (op, tmp);
648
649 if (!tmp->destroyed () && !tmp->is_inserted ())
650 {
651 // if nothing happened with the object we give it back
652 op->insert (tmp);
653 }
659} 654}
660 655
661void 656void
662drop (object *op, object *tmp) 657drop (object *op, object *tmp)
663{ 658{
… …
676 */ 671 */
677 tmp->destroy (); 672 tmp->destroy ();
678 return; 673 return;
679 } 674 }
680 else 675 else
681 {
682 while (tmp && tmp->invisible) 676 while (tmp && tmp->invisible)
683 tmp = tmp->below; 677 tmp = tmp->below;
684 }
685 } 678 }
686 679
687 if (tmp == NULL) 680 if (!tmp)
688 { 681 {
689 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.");
690 return; 683 return;
691 } 684 }
692 685
693 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 686 if (tmp->flag [FLAG_INV_LOCKED])
694 { 687 {
695 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 688 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
696 return; 689 return;
697 } 690 }
698 691
699 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 692 if (tmp->flag [FLAG_NO_DROP])
700 { 693 {
701#if 0 694#if 0
702 /* 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. */
703 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.");
704#endif 697#endif
… …
706 } 699 }
707 700
708 if (op->type == PLAYER && op->contr->last_used == tmp) 701 if (op->type == PLAYER && op->contr->last_used == tmp)
709 op->contr->last_used = tmp->below ? tmp->below 702 op->contr->last_used = tmp->below ? tmp->below
710 : tmp->above ? tmp->above 703 : tmp->above ? tmp->above
711 : 0; 704 : (object *)0;
712 705
713 if (op->container) 706 if (op->container_ ())
714 { 707 {
715 if (op->type == PLAYER) 708 if (op->type == PLAYER)
716 put_object_in_sack (op, op->container, tmp, op->contr->count); 709 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
717 else 710 else
718 put_object_in_sack (op, op->container, tmp, 0); 711 put_object_in_sack (op, op->container_ (), tmp, 0);
719 } 712 }
720 else 713 else
721 { 714 {
722 if (op->type == PLAYER) 715 if (op->type == PLAYER)
723 drop_object (op, tmp, op->contr->count); 716 drop_object (op, tmp, op->contr->count);
… …
750 /* 743 /*
751 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
752 the drop() routine will do unknown things to it when dropping 745 the drop() routine will do unknown things to it when dropping
753 in a shop. --Tero.Pelander@utu.fi 746 in a shop. --Tero.Pelander@utu.fi
754 */ 747 */
755
756 int cnt = MAX_ITEM_PER_DROP; 748 int cnt = MAX_ITEM_PER_ACTION;
757 749
758 if (!params) 750 if (!params)
759 { 751 {
760 while (curinv) 752 while (curinv)
761 { 753 {
762 nextinv = curinv->below; 754 nextinv = curinv->below;
763 755
764 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
765 nextinv = nextinv->below; 757 nextinv = nextinv->below;
766 758
767 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!curinv->flag [FLAG_INV_LOCKED]
768 curinv->type != FOOD && curinv->type != KEY && 760 && !curinv->invisible
769 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 && curinv->type != MONEY
770 !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)
771 { 767 {
772 drop (op, curinv); 768 drop (op, curinv);
773 if (--cnt <= 0) break; 769 if (--cnt <= 0) break;
774 } 770 }
775 771
… …
783 nextinv = curinv->below; 779 nextinv = curinv->below;
784 780
785 while (nextinv && nextinv->type == MONEY) 781 while (nextinv && nextinv->type == MONEY)
786 nextinv = nextinv->below; 782 nextinv = nextinv->below;
787 783
788 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)))
789 { 785 {
790 drop (op, curinv); 786 drop (op, curinv);
791 if (--cnt <= 0) break; 787 if (--cnt <= 0) break;
792 } 788 }
793 789
… …
801 nextinv = curinv->below; 797 nextinv = curinv->below;
802 798
803 while (nextinv && nextinv->type == MONEY) 799 while (nextinv && nextinv->type == MONEY)
804 nextinv = nextinv->below; 800 nextinv = nextinv->below;
805 801
806 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))
807 { 803 {
808 drop (op, curinv); 804 drop (op, curinv);
809 if (--cnt <= 0) break; 805 if (--cnt <= 0) break;
810 } 806 }
811 807
… …
819 nextinv = curinv->below; 815 nextinv = curinv->below;
820 816
821 while (nextinv && nextinv->type == MONEY) 817 while (nextinv && nextinv->type == MONEY)
822 nextinv = nextinv->below; 818 nextinv = nextinv->below;
823 819
824 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 820 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
825 { 821 {
826 switch (curinv->type) 822 switch (curinv->type)
827 { 823 {
828 case HORN: 824 case HORN:
829 case BOOK: 825 case BOOK:
… …
869 * <cnt> can be a 0 pointer or a pointer to the maximum number of 865 * <cnt> can be a 0 pointer or a pointer to the maximum number of
870 * drop operations to perform. 866 * drop operations to perform.
871 * 867 *
872 * Returns true if at least one item was dropped. 868 * Returns true if at least one item was dropped.
873 */ 869 */
874bool 870static bool
875drop_vector (object *dropper, vector<object *> &objs, int *cnt) 871drop_vector (object *dropper, vector<object *> &objs, int *cnt)
876{ 872{
877 vector<object *>::iterator i; 873 vector<object *>::iterator i;
878 874
879 bool did_one = false; 875 bool did_one = false;
… …
893 */ 889 */
894int 890int
895command_drop (object *op, char *params) 891command_drop (object *op, char *params)
896{ 892{
897 object *tmp, *next; 893 object *tmp, *next;
898 int did_one = 0;
899 894
900 if (!params) 895 if (!params)
901 { 896 {
902 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 897 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
903 return 0; 898 return 0;
… …
907 vector<object *> matched_objs; 902 vector<object *> matched_objs;
908 903
909 for (tmp = op->inv; tmp; tmp = next) 904 for (tmp = op->inv; tmp; tmp = next)
910 { 905 {
911 next = tmp->below; 906 next = tmp->below;
912 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 907 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
913 continue; 908 continue;
914 909
915 if (item_matched_string (op, tmp, params)) 910 if (item_matched_string (op, tmp, params))
916 matched_objs.push_back (tmp); 911 matched_objs.push_back (tmp);
917 } 912 }
918 913
919 int cnt = MAX_ITEM_PER_DROP; 914 int cnt = MAX_ITEM_PER_ACTION;
920 915
921 if (!drop_vector (op, matched_objs, &cnt)) 916 if (!drop_vector (op, matched_objs, &cnt))
922 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 917 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
923 918
924 if (cnt <= 0) 919 if (cnt <= 0)
… …
952 } 947 }
953 948
954 return 0; 949 return 0;
955} 950}
956 951
957/* op should be a player.
958 * we return the object the player has marked with the 'mark' command
959 * below. If no match is found (or object has changed), we return
960 * NULL. We leave it up to the calling function to print messages if
961 * nothing is found.
962 */
963object *
964find_marked_object (object *op)
965{
966 object *tmp;
967
968 if (!op || !op->contr)
969 return NULL;
970
971 if (!op->contr->mark)
972 {
973/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
974 return 0;
975 }
976
977 /* This may seem like overkill, but we need to make sure that they
978 * player hasn't dropped the item. We use count on the off chance that
979 * an item got reincarnated at some point.
980 */
981 for (tmp = op->inv; tmp; tmp = tmp->below)
982 {
983 if (tmp->invisible)
984 continue;
985
986 if (tmp == op->contr->mark)
987 {
988 if (!tmp->destroyed ())
989 return tmp;
990 else
991 {
992 op->contr->mark = 0;
993/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
994 return 0;
995 }
996 }
997 }
998
999 return 0;
1000}
1001
1002std::string 952std::string
1003object::describe_monster (object *who) 953object::describe_monster (object *who)
1004{ 954{
1005 dynbuf_text buf (512, 512); 955 dynbuf_text buf (512, 512);
1006 956
1007 object *mon = head ? head : this; 957 object *mon = head ? head : this;
1008 958
1009 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 959 if (mon->flag [FLAG_UNDEAD])
1010 buf << "It is an undead force.\r"; 960 buf << "It is an undead force.\r";
1011 961
1012 if (mon->level > who->level) 962 if (mon->level > who->level)
1013 buf << "It is likely more powerful than you.\r"; 963 buf << "It is likely more powerful than you.\r";
1014 else if (mon->level < who->level) 964 else if (mon->level < who->level)
… …
1071 case SHIELD: 1021 case SHIELD:
1072 case BOOTS: 1022 case BOOTS:
1073 case GLOVES: 1023 case GLOVES:
1074 case AMULET: 1024 case AMULET:
1075 case GIRDLE: 1025 case GIRDLE:
1026 case RANGED:
1076 case BOW: 1027 case BOW:
1077 case ARROW: 1028 case ARROW:
1078 case CLOAK: 1029 case CLOAK:
1079 case FOOD: 1030 case FOOD:
1080 case DRINK: 1031 case DRINK:
… …
1101 */ 1052 */
1102void 1053void
1103examine_monster (object *op, object *tmp) 1054examine_monster (object *op, object *tmp)
1104{ 1055{
1105 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 ());
1106}
1107
1108std::string
1109object::describe (object *who)
1110{
1111 dynbuf_text buf (1024, 1024);
1112
1113 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1114
1115 if (custom_name)
1116 buf.printf ("You call it %s.\r", &custom_name);
1117
1118 switch (type)
1119 {
1120 case SPELLBOOK:
1121 if (flag [FLAG_IDENTIFIED] && inv)
1122 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1123 break;
1124
1125 case BOOK:
1126 if (msg)
1127 buf << "Something is written in it.\r";
1128 break;
1129
1130 case CONTAINER:
1131 if (race)
1132 {
1133 if (weight_limit && stats.Str < 100)
1134 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1135 &race, weight_limit / (10.0 * (100 - stats.Str)));
1136 else
1137 buf.printf ("It can hold only %s.\r", &race);
1138 }
1139 else if (weight_limit && stats.Str < 100)
1140 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1141 break;
1142
1143 case WAND:
1144 if (flag [FLAG_IDENTIFIED])
1145 buf.printf ("It has %d charges left.\r", stats.food);
1146 break;
1147 }
1148
1149 if (materialname && !msg)
1150 buf.printf ("It is made of: %s.\r", &materialname);
1151
1152 if (who)
1153 /* Where to wear this item */
1154 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1155 if (slot[i].info)
1156 {
1157 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1158
1159 if (slot[i].info < -1 && who->slot[i].info)
1160 buf.printf ("(%d)", -slot[i].info);
1161
1162 buf << ".\r";
1163 }
1164
1165 if (weight)
1166 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1167
1168 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1169 {
1170 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1171
1172 if (is_in_shop (who))
1173 {
1174 if (flag [FLAG_UNPAID])
1175 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1176 else
1177 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1178 }
1179 }
1180
1181 if (flag [FLAG_MONSTER])
1182 buf << describe_monster (who);
1183
1184 /* Is this item buildable? */
1185 if (flag [FLAG_IS_BUILDABLE])
1186 buf << "This is a buildable item.\r";
1187
1188 /* Does the object have a message? Don't show message for all object
1189 * types - especially if the first entry is a match
1190 */
1191 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1192 {
1193 /* This is just a hack so when identifying the items, we print
1194 * out the extra message
1195 */
1196 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1197 buf << "The object has a story:\r";
1198
1199 buf << msg << '\n';
1200 }
1201
1202 buf << '\n';
1203
1204 return std::string (buf.linearise (), buf.size ());
1205} 1057}
1206 1058
1207static void 1059static void
1208display_new_pickup (object *op) 1060display_new_pickup (object *op)
1209{ 1061{
… …
1315} 1167}
1316 1168
1317int 1169int
1318command_search_items (object *op, char *params) 1170command_search_items (object *op, char *params)
1319{ 1171{
1320 char buf[MAX_BUF];
1321
1322 if (params == NULL) 1172 if (params == NULL)
1323 { 1173 {
1324 if (op->contr->search_str[0] == '\0') 1174 if (op->contr->search_str[0] == '\0')
1325 { 1175 {
1326 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1"); 1176 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
… …
1329 return 1; 1179 return 1;
1330 } 1180 }
1331 1181
1332 op->contr->search_str[0] = '\0'; 1182 op->contr->search_str[0] = '\0';
1333 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1183 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1334 op->update_stats (); 1184 op->contr->queue_stats_update ();
1335 return 1; 1185 return 1;
1336 } 1186 }
1337 1187
1338 if (strlen (params) >= MAX_BUF) 1188 if (strlen (params) >= sizeof (op->contr->search_str))
1339 { 1189 {
1340 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1190 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1341 return 1; 1191 return 1;
1342 } 1192 }
1343 1193
1344 strcpy (op->contr->search_str, params); 1194 strcpy (op->contr->search_str, params);
1345 sprintf (buf, "Now searching for '%s'.", op->contr->search_str); 1195 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1346 new_draw_info (NDI_UNIQUE, 0, op, buf); 1196 op->contr->queue_stats_update ();
1347 op->update_stats ();
1348 1197
1349 return 1; 1198 return 1;
1350} 1199}
1351 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