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.65 by root, Sun Apr 20 18:48:51 2008 UTC vs.
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
91find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
92{ 92{
93 return find_best_apply_object_match (pl, params, AP_TOGGLE); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
94} 94}
95 95
96static bool
97can_split (object *pl, object *&op, sint32 nrof)
98{
99 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100 {
101 op = tmp;
102 return true;
103 }
104 else
105 {
106 if (op->nrof > 1)
107 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
108 else
109 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
110
111 return false;
112 }
113}
114
96int 115int
97command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
98{ 117{
99 if (!params) 118 if (!params)
100 { 119 {
… …
208 * not need to use split_ob and stuff. 227 * not need to use split_ob and stuff.
209 */ 228 */
210int 229int
211sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
212{ 231{
213
214 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 232 if (!QUERY_FLAG (sack, FLAG_APPLIED))
215 { 233 {
216 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 234 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
217 return 0; 235 return 0;
218 } 236 }
237
219 if (sack == op) 238 if (sack == op)
220 { 239 {
221 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); 240 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
222 return 0; 241 return 0;
223 } 242 }
243
224 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
225 { 245 {
226 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
227 return 0; 247 return 0;
228 } 248 }
249
229 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
230 { 251 {
231 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 252 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
232 return 0; 253 return 0;
233 } 254 }
255
234 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
235 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
236 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 258 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
237 { 259 {
238 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 260 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
239 return 0; 261 return 0;
240 } 262 }
263
241 /* All other checks pass, must be OK */ 264 /* All other checks pass, must be OK */
242 return 1; 265 return 1;
243} 266}
244 267
245/* Pick up commands follow */ 268/* Pick up commands follow */
… …
252static void 275static void
253pick_up_object (object *pl, object *op, object *tmp, int nrof) 276pick_up_object (object *pl, object *op, object *tmp, int nrof)
254{ 277{
255 object *env = tmp->env; 278 object *env = tmp->env;
256 uint32 weight, effective_weight_limit; 279 uint32 weight, effective_weight_limit;
257 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 280 int tmp_nrof = tmp->number_of ();
258 281
259 /* IF the player is flying & trying to take the item out of a container 282 /* IF the player is flying & trying to take the item out of a container
260 * that is in his inventory, let him. tmp->env points to the container 283 * that is in his inventory, let him. tmp->env points to the container
261 * (sack, luggage, etc), tmp->env->env then points to the player (nested 284 * (sack, luggage, etc), tmp->env->env then points to the player (nested
262 * containers not allowed as of now) 285 * containers not allowed as of now)
263 */ 286 */
264 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
265 { 288 {
266 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 289 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, "
291 "or waiting till the levitation effect wears off.>");
267 return; 292 return;
268 } 293 }
269 294
270 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 295 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
271 return; 296 return;
272 297
273 if (nrof > tmp_nrof || nrof == 0) 298 if (nrof > tmp_nrof || nrof <= 0)
274 nrof = tmp_nrof; 299 nrof = tmp_nrof;
275 300
276 /* Figure out how much weight this object will add to the player */ 301 /* Figure out how much weight this object will add to the player */
277 weight = tmp->weight * nrof; 302 weight = tmp->weight * nrof;
278 if (tmp->inv) 303 if (tmp->inv)
… …
284 { 309 {
285 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 310 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
286 return; 311 return;
287 } 312 }
288 313
289 if (nrof != tmp_nrof) 314 if (!can_split (pl, tmp, nrof))
290 {
291 object *tmp2 = tmp;
292
293 tmp = get_split_ob (tmp, nrof);
294 if (!tmp)
295 {
296 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
297 return; 315 return;
298 }
299
300 /* Tell the client what happened to the rest of objects */
301 if (pl->contr)
302 if (tmp2->destroyed ())
303 esrv_del_item (pl->contr, tmp2->count);
304 else
305 esrv_update_item (UPD_NROF, pl, tmp2);
306 }
307 else
308 {
309 /* If the object is in a container, send a delete to the client.
310 * - we are moving all the items from the container to elsewhere,
311 * so it needs to be deleted.
312 */
313 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
314 {
315 if (tmp->env && pl->type == PLAYER)
316 esrv_del_item (pl->contr, tmp->count);
317
318 tmp->remove (); /* Unlink it */
319 }
320 }
321 316
322 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 317 if (QUERY_FLAG (tmp, FLAG_UNPAID))
318 {
319 tmp->flag.reset (FLAG_UNPAID);
323 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)); 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));
321 tmp->flag.set (FLAG_UNPAID);
322 }
324 else 323 else
325 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp)); 324 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
326 325
327 tmp = insert_ob_in_ob (tmp, op); 326 op->insert (tmp);
328
329 /* All the stuff below deals with client/server code, and is only
330 * usable by players
331 */
332 if (pl->contr)
333 {
334 esrv_send_item (pl, tmp);
335
336 /* These are needed to update the weight for the container we
337 * are putting the object in.
338 */
339 if (op != pl)
340 {
341 esrv_update_item (UPD_WEIGHT, pl, op);
342 esrv_send_item (pl, pl);
343 }
344
345 /* Update the container the object was in */
346 if (env && env != pl && env != op)
347 esrv_update_item (UPD_WEIGHT, pl, env);
348 }
349} 327}
350 328
351/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 329/* modified slightly to allow monsters use this -b.t. 5-31-95 */
352void 330void
353pick_up (object *op, object *alt) 331pick_up (object *op, object *alt)
… …
506 * but that probably will make it more difficult to read, and 484 * but that probably will make it more difficult to read, and
507 * not make it any more efficient 485 * not make it any more efficient
508 */ 486 */
509 if (params && item_matched_string (op, tmp, params)) 487 if (params && item_matched_string (op, tmp, params))
510 { 488 {
489 if (--cnt < 0) break;
511 pick_up (op, tmp); 490 pick_up (op, tmp);
512 if (--cnt <= 0) break;
513 } 491 }
514 else if (can_pick (op, tmp) && !params) 492 else if (can_pick (op, tmp) && !params)
515 { 493 {
494 if (--cnt < 0) break;
516 pick_up (op, tmp); 495 pick_up (op, tmp);
517 break; 496 break;
518 } 497 }
519 498
520 tmp = next; 499 tmp = next;
521 } 500 }
522 501
523 if (cnt <= 0) 502 if (cnt < 0)
524 { 503 {
525 op->failmsg ("Couldn't pick up so many items at once."); 504 op->failmsg ("Couldn't pick up so many items at once.");
526 return 0; 505 return 0;
527 } 506 }
528 507
… …
539 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 518 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
540 } 519 }
541 520
542 return 0; 521 return 0;
543} 522}
544
545 523
546/* 524/*
547 * This function was part of drop, now is own function. 525 * This function was part of drop, now is own function.
548 * Player 'op' tries to put object 'tmp' into sack 'sack', 526 * Player 'op' tries to put object 'tmp' into sack 'sack',
549 * if nrof is non zero, then nrof objects is tried to put into sack. 527 * if nrof is non zero, then nrof objects is tried to put into sack.
… …
565 return; 543 return;
566 } 544 }
567 545
568 if (tmp->type == CONTAINER && tmp->inv) 546 if (tmp->type == CONTAINER && tmp->inv)
569 { 547 {
570
571 /* Eneq(@csd.uu.se): If the object to be dropped is a container 548 /* Eneq(@csd.uu.se): If the object to be dropped is a container
572 * we instead move the contents of that container into the active 549 * we instead move the contents of that container into the active
573 * container, this is only done if the object has something in it. 550 * container, this is only done if the object has something in it.
574 */ 551 */
575 sack2 = tmp; 552 sack2 = tmp;
… …
578 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
579 { 556 {
580 tmp = tmp2->below; 557 tmp = tmp2->below;
581 558
582 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
583 {
584 put_object_in_sack (op, sack, tmp2, 0); 560 put_object_in_sack (op, sack, tmp2, 0);
585 }
586 else 561 else
587 { 562 {
588 sprintf (buf, "Your %s fills up.", query_name (sack)); 563 sprintf (buf, "Your %s fills up.", query_name (sack));
589 new_draw_info (NDI_UNIQUE, 0, op, buf); 564 new_draw_info (NDI_UNIQUE, 0, op, buf);
590 break; 565 break;
591 } 566 }
592 } 567 }
593 568
594 esrv_update_item (UPD_WEIGHT, op, sack2);
595 return; 569 return;
596 } 570 }
597 571
598 /* Don't worry about this for containers - our caller should have 572 /* Don't worry about this for containers - our caller should have
599 * already checked this. 573 * already checked this.
… …
604 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 578 if (QUERY_FLAG (tmp, FLAG_APPLIED))
605 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
606 return; 580 return;
607 581
608 /* we want to put some portion of the item into the container */ 582 /* we want to put some portion of the item into the container */
609 if (nrof && tmp->nrof != nrof) 583 if (!can_split (op, tmp, nrof))
610 {
611 object *tmp2 = tmp;
612
613 tmp = get_split_ob (tmp, nrof);
614
615 if (!tmp)
616 {
617 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
618 return; 584 return;
619 }
620 /* Tell a client what happened other objects */
621 if (tmp2->destroyed ())
622 esrv_del_item (op->contr, tmp2->count);
623 else /* this can proably be replaced with an update */
624 esrv_send_item (op, tmp2);
625 }
626 else
627 tmp->remove ();
628 585
629 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
630 tmp2 = insert_ob_in_ob (tmp, sack); 587 sack->insert (tmp);
631
632 // elmex: 2007-11-26: removed update_stats and replaced
633 // it by update_after_inventory_change () in the caller
634 // of this function
635
636 /* If an object merged (and thus, different object), we need to
637 * delete the original.
638 */
639 if (tmp2 != tmp)
640 esrv_del_item (op->contr, tmp->count);
641
642 esrv_send_item (op, tmp2);
643
644 /* update the sacks weight */
645 esrv_update_item (UPD_WEIGHT, op, sack);
646} 588}
647 589
648/* 590/*
649 * This function was part of drop, now is own function. 591 * This function was part of drop, now is own function.
650 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
… …
652 * This is used when dropping objects onto the floor. 594 * This is used when dropping objects onto the floor.
653 */ 595 */
654void 596void
655drop_object (object *op, object *tmp, uint32 nrof) 597drop_object (object *op, object *tmp, uint32 nrof)
656{ 598{
657 object *floor;
658
659 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
660 return; 600 return;
661 601
662 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
663 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
666 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D 606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
667 607
668 /* We are only dropping some of the items. We split the current object 608 /* We are only dropping some of the items. We split the current object
669 * off 609 * off
670 */ 610 */
671 if (nrof && tmp->nrof != nrof) 611 if (!can_split (op, tmp, nrof))
672 {
673 object *tmp2 = tmp;
674
675 tmp = get_split_ob (tmp, nrof);
676 if (!tmp)
677 {
678 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
679 return;
680 }
681 /* Tell a client what happened rest of objects. tmp2 is now the
682 * original object
683 */
684 if (op->type == PLAYER)
685 {
686 if (tmp2->destroyed ())
687 esrv_del_item (op->contr, tmp2->count);
688 else
689 esrv_send_item (op, tmp2);
690 }
691 }
692 else
693 tmp->remove ();
694 612
695 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 613 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
696 return; 614 return;
697 615
698 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 616 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
699 { 617 {
700 op->statusmsg (format ("You drop the %s.", query_name (tmp))); 618 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
701 op->statusmsg ("The gods who lent it to you retrieves it."); 619 op->statusmsg ("The gods who lent it to you retrieves it.");
702
703 if (op->type == PLAYER)
704 esrv_del_item (op->contr, tmp->count);
705 620
706 tmp->destroy (); 621 tmp->destroy ();
707 op->update_stats (); 622 op->update_stats ();
708 return; 623 return;
709 } 624 }
710
711 if (op->type == PLAYER)
712 esrv_del_item (op->contr, tmp->count);
713 625
714 /* Call this before we update the various windows/players. At least 626 /* Call this before we update the various windows/players. At least
715 * that we, we know the weight is correct. 627 * that we, we know the weight is correct.
716 */ 628 */
717 // 2007-11-26: moved op->update_stats away and calling it later after 629 // 2007-11-26: moved op->update_stats away and calling it later after
718 // all items of a drop command have been processed. 630 // all items of a drop command have been processed.
719 631
720 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) 632 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
721 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 633 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
722 return; 634 return;
723 635
724 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 636 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
637 {
725 sell_item (tmp, op); 638 if (!sell_item (tmp, op))
639 return; // if we can't sell it we don't drop it
640 }
726 641
727 tmp->x = op->x; 642 tmp->x = op->x;
728 tmp->y = op->y; 643 tmp->y = op->y;
729 644
730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 645 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
731}
732
733void update_after_inventory_change (object *op)
734{
735 /* Call this before we update the various windows/players. At least
736 * that we, we know the weight is correct.
737 */
738 op->update_stats ();
739
740 // elmex: kept this for now, i have no idea what happens when i remove it:
741 if (op->type == PLAYER)
742 {
743 /* Need to update the weight for the player */
744 esrv_send_item (op, op);
745 op->contr->ns->floorbox_update ();
746 }
747} 646}
748 647
749void 648void
750drop (object *op, object *tmp) 649drop (object *op, object *tmp)
751{ 650{
… …
766 tmp->destroy (); 665 tmp->destroy ();
767 return; 666 return;
768 } 667 }
769 else 668 else
770 { 669 {
771 while (tmp != NULL && tmp->invisible) 670 while (tmp && tmp->invisible)
772 tmp = tmp->below; 671 tmp = tmp->below;
773 } 672 }
774 } 673 }
775 674
776 if (tmp == NULL) 675 if (tmp == NULL)
777 { 676 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 677 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
779 return; 678 return;
780 } 679 }
680
781 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 681 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
782 { 682 {
783 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 683 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
784 return; 684 return;
785 } 685 }
686
786 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 687 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
787 { 688 {
788#if 0 689#if 0
789 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 690 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
790 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
814 715
815 if (op->type == PLAYER) 716 if (op->type == PLAYER)
816 op->contr->count = 0; 717 op->contr->count = 0;
817} 718}
818 719
819
820
821/* Command will drop all items that have not been locked */ 720/* Command will drop all items that have not been locked */
822int 721int
823command_dropall (object *op, char *params) 722command_dropall (object *op, char *params)
824{ 723{
825 724
826 object *curinv, *nextinv;
827
828 if (op->inv == NULL) 725 if (op->inv == NULL)
829 { 726 {
830 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 727 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
831 return 0; 728 return 0;
832 } 729 }
833 730
834 curinv = op->inv; 731 object *curinv = op->inv;
732 object *nextinv;
835 733
836 /* 734 /*
837 This is the default. Drops everything not locked or considered 735 This is the default. Drops everything not locked or considered
838 not something that should be dropped. 736 not something that should be dropped.
839 */ 737 */
… …
843 in a shop. --Tero.Pelander@utu.fi 741 in a shop. --Tero.Pelander@utu.fi
844 */ 742 */
845 743
846 int cnt = MAX_ITEM_PER_DROP; 744 int cnt = MAX_ITEM_PER_DROP;
847 745
848 if (params == NULL) 746 if (!params)
849 { 747 {
850 while (curinv != NULL) 748 while (curinv)
851 { 749 {
852 nextinv = curinv->below; 750 nextinv = curinv->below;
751
853 while (nextinv && nextinv->type == MONEY) 752 while (nextinv && nextinv->type == MONEY)
854 nextinv = nextinv->below; 753 nextinv = nextinv->below;
754
855 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 755 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
856 curinv->type != FOOD && curinv->type != KEY && 756 curinv->type != FOOD && curinv->type != KEY &&
857 curinv->type != SPECIAL_KEY && curinv->type != GEM && 757 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
858 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 758 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
859 { 759 {
860 drop (op, curinv); 760 drop (op, curinv);
861 if (--cnt <= 0) break; 761 if (--cnt <= 0) break;
862 } 762 }
763
863 curinv = nextinv; 764 curinv = nextinv;
864 } 765 }
865 } 766 }
866
867 else if (strcmp (params, "weapons") == 0) 767 else if (strcmp (params, "weapons") == 0)
868 { 768 {
869 while (curinv != NULL) 769 while (curinv)
870 { 770 {
871 nextinv = curinv->below; 771 nextinv = curinv->below;
772
872 while (nextinv && nextinv->type == MONEY) 773 while (nextinv && nextinv->type == MONEY)
873 nextinv = nextinv->below; 774 nextinv = nextinv->below;
775
874 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 776 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
875 { 777 {
876 drop (op, curinv); 778 drop (op, curinv);
877 if (--cnt <= 0) break; 779 if (--cnt <= 0) break;
878 } 780 }
781
879 curinv = nextinv; 782 curinv = nextinv;
880 } 783 }
881 } 784 }
882
883 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 785 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
884 { 786 {
885 while (curinv != NULL) 787 while (curinv)
886 { 788 {
887 nextinv = curinv->below; 789 nextinv = curinv->below;
790
888 while (nextinv && nextinv->type == MONEY) 791 while (nextinv && nextinv->type == MONEY)
889 nextinv = nextinv->below; 792 nextinv = nextinv->below;
793
890 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 794 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
891 { 795 {
892 drop (op, curinv); 796 drop (op, curinv);
893 if (--cnt <= 0) break; 797 if (--cnt <= 0) break;
894 } 798 }
799
895 curinv = nextinv; 800 curinv = nextinv;
896 } 801 }
897 } 802 }
898
899 else if (strcmp (params, "misc") == 0) 803 else if (strcmp (params, "misc") == 0)
900 { 804 {
901 while (curinv != NULL) 805 while (curinv)
902 { 806 {
903 nextinv = curinv->below; 807 nextinv = curinv->below;
808
904 while (nextinv && nextinv->type == MONEY) 809 while (nextinv && nextinv->type == MONEY)
905 nextinv = nextinv->below; 810 nextinv = nextinv->below;
811
906 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 812 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
907 { 813 {
908 switch (curinv->type) 814 switch (curinv->type)
909 { 815 {
910 case HORN: 816 case HORN:
… …
928 break; 834 break;
929 default: 835 default:
930 curinv = nextinv; 836 curinv = nextinv;
931 break; 837 break;
932 } 838 }
839
933 if (--cnt <= 0) break; 840 if (--cnt <= 0) break;
934 } 841 }
842
935 curinv = nextinv; 843 curinv = nextinv;
936 } 844 }
937 } 845 }
938 846
939 if (cnt <= 0) 847 if (cnt <= 0)
940 op->failmsg ("Only dropped some items, can't drop that many items at once."); 848 op->failmsg ("Only dropped some items, can't drop that many items at once.");
941
942 update_after_inventory_change (op);
943 849
944/* draw_look(op);*/ 850/* draw_look(op);*/
945 return 0; 851 return 0;
946} 852}
947 853
948/* Object op wants to drop object(s) params. params can be a 854/* Object op wants to drop object(s) params. params can be a
949 * comma seperated list. 855 * comma seperated list.
950 */ 856 */
951
952int 857int
953command_drop (object *op, char *params) 858command_drop (object *op, char *params)
954{ 859{
955 object *tmp, *next; 860 object *tmp, *next;
956 int did_one = 0; 861 int did_one = 0;
… …
981 if (!did_one) 886 if (!did_one)
982 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 887 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
983 888
984 if (cnt <= 0) 889 if (cnt <= 0)
985 op->failmsg ("Only dropped some items, can't drop that many items at once."); 890 op->failmsg ("Only dropped some items, can't drop that many items at once.");
986
987 update_after_inventory_change (op);
988 } 891 }
989 892
990 return 0; 893 return 0;
991} 894}
992 895
… …
1067 dynbuf_text buf (512, 512); 970 dynbuf_text buf (512, 512);
1068 971
1069 object *mon = head ? head : this; 972 object *mon = head ? head : this;
1070 973
1071 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 974 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1072 buf << "It is an undead force.\n"; 975 buf << " - It is an undead force.\n";
1073 976
1074 if (mon->level > who->level) 977 if (mon->level > who->level)
1075 buf << "It is likely more powerful than you.\n"; 978 buf << " - It is likely more powerful than you.\n";
1076 else if (mon->level < who->level) 979 else if (mon->level < who->level)
1077 buf << "It is likely less powerful than you.\n"; 980 buf << " - It is likely less powerful than you.\n";
1078 else 981 else
1079 buf << "It is probably as powerful as you.\n"; 982 buf << " - It is probably as powerful as you.\n";
1080 983
1081 if (mon->attacktype & AT_ACID) 984 if (mon->attacktype & AT_ACID)
1082 buf << "You seem to smell an acrid odor.\n"; 985 buf << " - You seem to smell an acrid odor.\n";
1083 986
1084 /* Anyone know why this used to use the clone value instead of the 987 /* Anyone know why this used to use the clone value instead of the
1085 * maxhp field? This seems that it should give more accurate results. 988 * maxhp field? This seems that it should give more accurate results.
1086 */ 989 */
1087 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 990 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1088 { /* From 1-4 */ 991 { /* From 1-4 */
1089 case 1: 992 case 1:
1090 buf << "It is in a bad shape.\n"; 993 buf << " - It is in a bad shape.\n";
1091 break; 994 break;
1092 case 2: 995 case 2:
1093 buf << "It is hurt.\n"; 996 buf << " - It is hurt.\n";
1094 break; 997 break;
1095 case 3: 998 case 3:
1096 buf << "It is somewhat hurt.\n"; 999 buf << " - It is somewhat hurt.\n";
1097 break; 1000 break;
1098 case 4: 1001 case 4:
1099 buf << "It is in excellent shape.\n"; 1002 buf << " - It is in excellent shape.\n";
1100 break; 1003 break;
1101 } 1004 }
1102 1005
1103 if (present_in_ob (POISONING, mon)) 1006 if (present_in_ob (POISONING, mon))
1104 buf << "It looks very ill.\n"; 1007 buf << " - It looks very ill.\n";
1105 1008
1106 return buf; 1009 return buf;
1107} 1010}
1108 1011
1109/* tmp is the object being described, pl is who is examing it. */ 1012/* tmp is the object being described, pl is who is examing it. */
… …
1167std::string 1070std::string
1168object::describe (object *who) 1071object::describe (object *who)
1169{ 1072{
1170 dynbuf_text buf (1024, 1024); 1073 dynbuf_text buf (1024, 1024);
1171 1074
1172 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1075 buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());
1173 1076
1174 if (custom_name) 1077 if (custom_name)
1175 buf.printf ("You call it %s\n", &custom_name); 1078 buf.printf ("You call it %s.\n\n", &custom_name);
1176 1079
1177 switch (type) 1080 switch (type)
1178 { 1081 {
1179 case SPELLBOOK: 1082 case SPELLBOOK:
1180 if (flag [FLAG_IDENTIFIED] && inv) 1083 if (flag [FLAG_IDENTIFIED] && inv)
1181 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1084 buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1182 break; 1085 break;
1183 1086
1184 case BOOK: 1087 case BOOK:
1185 if (msg) 1088 if (msg)
1186 buf << "Something is written in it.\n"; 1089 buf << "Something is written in it.\n";
… …
1245 buf << "This is a buildable item.\n"; 1148 buf << "This is a buildable item.\n";
1246 1149
1247 /* Does the object have a message? Don't show message for all object 1150 /* Does the object have a message? Don't show message for all object
1248 * types - especially if the first entry is a match 1151 * types - especially if the first entry is a match
1249 */ 1152 */
1250 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@') 1153 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1251 { 1154 {
1252 /* This is just a hack so when identifying the items, we print 1155 /* This is just a hack so when identifying the items, we print
1253 * out the extra message 1156 * out the extra message
1254 */ 1157 */
1255 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1158 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1256 buf << "The object has a story:\n"; 1159 buf << "The object has a story:\n\n";
1257 1160
1258 buf << msg << '\n'; 1161 buf << msg << '\n';
1259 } 1162 }
1260 1163
1261 buf << '\n'; 1164 buf << '\n';

Diff Legend

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