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.80 by elmex, Sun Oct 5 12:40:21 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; 612 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 613
695 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 614 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
696 return; 615 return;
697 616
698 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 617 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
699 { 618 {
700 op->statusmsg (format ("You drop the %s.", query_name (tmp))); 619 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
701 op->statusmsg ("The gods who lent it to you retrieves it."); 620 op->statusmsg ("The god who lent it to you retrieves it.");
702
703 if (op->type == PLAYER)
704 esrv_del_item (op->contr, tmp->count);
705 621
706 tmp->destroy (); 622 tmp->destroy ();
707 op->update_stats (); 623 op->update_stats ();
708 return; 624 return;
709 } 625 }
710
711 if (op->type == PLAYER)
712 esrv_del_item (op->contr, tmp->count);
713 626
714 /* Call this before we update the various windows/players. At least 627 /* Call this before we update the various windows/players. At least
715 * that we, we know the weight is correct. 628 * that we, we know the weight is correct.
716 */ 629 */
717 // 2007-11-26: moved op->update_stats away and calling it later after 630 // 2007-11-26: moved op->update_stats away and calling it later after
718 // all items of a drop command have been processed. 631 // all items of a drop command have been processed.
719 632
720 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) 633 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))) 634 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
722 return; 635 return;
723 636
724 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 637 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
638 {
725 sell_item (tmp, op); 639 if (!sell_item (tmp, op))
640 {
641 // if we can't sell it we don't drop it, so give it back to the seller
642 op->insert (tmp);
643 return;
644 }
645 }
726 646
727 tmp->x = op->x; 647 tmp->x = op->x;
728 tmp->y = op->y; 648 tmp->y = op->y;
729 649
730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 650 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} 651}
748 652
749void 653void
750drop (object *op, object *tmp) 654drop (object *op, object *tmp)
751{ 655{
… …
760 if (tmp->env && tmp->env->type != PLAYER) 664 if (tmp->env && tmp->env->type != PLAYER)
761 { 665 {
762 /* Just toss the object - probably shouldn't be hanging 666 /* Just toss the object - probably shouldn't be hanging
763 * around anyways 667 * around anyways
764 */ 668 */
765 tmp->remove ();
766 tmp->destroy (); 669 tmp->destroy ();
767 return; 670 return;
768 } 671 }
769 else 672 else
770 { 673 {
771 while (tmp != NULL && tmp->invisible) 674 while (tmp && tmp->invisible)
772 tmp = tmp->below; 675 tmp = tmp->below;
773 } 676 }
774 } 677 }
775 678
776 if (tmp == NULL) 679 if (tmp == NULL)
777 { 680 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 681 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
779 return; 682 return;
780 } 683 }
684
781 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 685 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
782 { 686 {
783 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 687 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
784 return; 688 return;
785 } 689 }
690
786 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 691 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
787 { 692 {
788#if 0 693#if 0
789 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 694 /* 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."); 695 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
814 719
815 if (op->type == PLAYER) 720 if (op->type == PLAYER)
816 op->contr->count = 0; 721 op->contr->count = 0;
817} 722}
818 723
819
820
821/* Command will drop all items that have not been locked */ 724/* Command will drop all items that have not been locked */
822int 725int
823command_dropall (object *op, char *params) 726command_dropall (object *op, char *params)
824{ 727{
825 728
826 object *curinv, *nextinv;
827
828 if (op->inv == NULL) 729 if (op->inv == NULL)
829 { 730 {
830 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 731 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
831 return 0; 732 return 0;
832 } 733 }
833 734
834 curinv = op->inv; 735 object *curinv = op->inv;
736 object *nextinv;
835 737
836 /* 738 /*
837 This is the default. Drops everything not locked or considered 739 This is the default. Drops everything not locked or considered
838 not something that should be dropped. 740 not something that should be dropped.
839 */ 741 */
… …
843 in a shop. --Tero.Pelander@utu.fi 745 in a shop. --Tero.Pelander@utu.fi
844 */ 746 */
845 747
846 int cnt = MAX_ITEM_PER_DROP; 748 int cnt = MAX_ITEM_PER_DROP;
847 749
848 if (params == NULL) 750 if (!params)
849 { 751 {
850 while (curinv != NULL) 752 while (curinv)
851 { 753 {
852 nextinv = curinv->below; 754 nextinv = curinv->below;
755
853 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
854 nextinv = nextinv->below; 757 nextinv = nextinv->below;
758
855 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
856 curinv->type != FOOD && curinv->type != KEY && 760 curinv->type != FOOD && curinv->type != KEY &&
857 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
858 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 762 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
859 { 763 {
860 drop (op, curinv); 764 drop (op, curinv);
861 if (--cnt <= 0) break; 765 if (--cnt <= 0) break;
862 } 766 }
767
863 curinv = nextinv; 768 curinv = nextinv;
864 } 769 }
865 } 770 }
866
867 else if (strcmp (params, "weapons") == 0) 771 else if (strcmp (params, "weapons") == 0)
868 { 772 {
869 while (curinv != NULL) 773 while (curinv)
870 { 774 {
871 nextinv = curinv->below; 775 nextinv = curinv->below;
776
872 while (nextinv && nextinv->type == MONEY) 777 while (nextinv && nextinv->type == MONEY)
873 nextinv = nextinv->below; 778 nextinv = nextinv->below;
779
874 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 780 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
875 { 781 {
876 drop (op, curinv); 782 drop (op, curinv);
877 if (--cnt <= 0) break; 783 if (--cnt <= 0) break;
878 } 784 }
785
879 curinv = nextinv; 786 curinv = nextinv;
880 } 787 }
881 } 788 }
882
883 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 789 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
884 { 790 {
885 while (curinv != NULL) 791 while (curinv)
886 { 792 {
887 nextinv = curinv->below; 793 nextinv = curinv->below;
794
888 while (nextinv && nextinv->type == MONEY) 795 while (nextinv && nextinv->type == MONEY)
889 nextinv = nextinv->below; 796 nextinv = nextinv->below;
797
890 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 798 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
891 { 799 {
892 drop (op, curinv); 800 drop (op, curinv);
893 if (--cnt <= 0) break; 801 if (--cnt <= 0) break;
894 } 802 }
803
895 curinv = nextinv; 804 curinv = nextinv;
896 } 805 }
897 } 806 }
898
899 else if (strcmp (params, "misc") == 0) 807 else if (strcmp (params, "misc") == 0)
900 { 808 {
901 while (curinv != NULL) 809 while (curinv)
902 { 810 {
903 nextinv = curinv->below; 811 nextinv = curinv->below;
812
904 while (nextinv && nextinv->type == MONEY) 813 while (nextinv && nextinv->type == MONEY)
905 nextinv = nextinv->below; 814 nextinv = nextinv->below;
815
906 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 816 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
907 { 817 {
908 switch (curinv->type) 818 switch (curinv->type)
909 { 819 {
910 case HORN: 820 case HORN:
… …
928 break; 838 break;
929 default: 839 default:
930 curinv = nextinv; 840 curinv = nextinv;
931 break; 841 break;
932 } 842 }
843
933 if (--cnt <= 0) break; 844 if (--cnt <= 0) break;
934 } 845 }
846
935 curinv = nextinv; 847 curinv = nextinv;
936 } 848 }
937 } 849 }
938 850
939 if (cnt <= 0) 851 if (cnt <= 0)
940 op->failmsg ("Only dropped some items, can't drop that many items at once."); 852 op->failmsg ("Only dropped some items, can't drop that many items at once.");
941
942 update_after_inventory_change (op);
943 853
944/* draw_look(op);*/ 854/* draw_look(op);*/
945 return 0; 855 return 0;
946} 856}
947 857
948/* Object op wants to drop object(s) params. params can be a 858/* Object op wants to drop object(s) params. params can be a
949 * comma seperated list. 859 * comma seperated list.
950 */ 860 */
951
952int 861int
953command_drop (object *op, char *params) 862command_drop (object *op, char *params)
954{ 863{
955 object *tmp, *next; 864 object *tmp, *next;
956 int did_one = 0; 865 int did_one = 0;
… …
981 if (!did_one) 890 if (!did_one)
982 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 891 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
983 892
984 if (cnt <= 0) 893 if (cnt <= 0)
985 op->failmsg ("Only dropped some items, can't drop that many items at once."); 894 op->failmsg ("Only dropped some items, can't drop that many items at once.");
986
987 update_after_inventory_change (op);
988 } 895 }
989 896
990 return 0; 897 return 0;
991} 898}
992 899
… …
1067 dynbuf_text buf (512, 512); 974 dynbuf_text buf (512, 512);
1068 975
1069 object *mon = head ? head : this; 976 object *mon = head ? head : this;
1070 977
1071 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 978 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1072 buf << "It is an undead force.\n"; 979 buf << "It is an undead force.\r";
1073 980
1074 if (mon->level > who->level) 981 if (mon->level > who->level)
1075 buf << "It is likely more powerful than you.\n"; 982 buf << "It is likely more powerful than you.\r";
1076 else if (mon->level < who->level) 983 else if (mon->level < who->level)
1077 buf << "It is likely less powerful than you.\n"; 984 buf << "It is likely less powerful than you.\r";
1078 else 985 else
1079 buf << "It is probably as powerful as you.\n"; 986 buf << "It is probably as powerful as you.\r";
1080 987
1081 if (mon->attacktype & AT_ACID) 988 if (mon->attacktype & AT_ACID)
1082 buf << "You seem to smell an acrid odor.\n"; 989 buf << "You seem to smell an acrid odor.\r";
1083 990
1084 /* Anyone know why this used to use the clone value instead of the 991 /* 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. 992 * maxhp field? This seems that it should give more accurate results.
1086 */ 993 */
1087 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 994 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1088 { /* From 1-4 */ 995 { /* From 1-4 */
1089 case 1: 996 case 1:
1090 buf << "It is in a bad shape.\n"; 997 buf << "It is in a bad shape.\r";
1091 break; 998 break;
1092 case 2: 999 case 2:
1093 buf << "It is hurt.\n"; 1000 buf << "It is hurt.\r";
1094 break; 1001 break;
1095 case 3: 1002 case 3:
1096 buf << "It is somewhat hurt.\n"; 1003 buf << "It is somewhat hurt.\r";
1097 break; 1004 break;
1098 case 4: 1005 case 4:
1099 buf << "It is in excellent shape.\n"; 1006 buf << "It is in excellent shape.\r";
1100 break; 1007 break;
1101 } 1008 }
1102 1009
1103 if (present_in_ob (POISONING, mon)) 1010 if (present_in_ob (POISONING, mon))
1104 buf << "It looks very ill.\n"; 1011 buf << "It looks very ill.\r";
1012
1013 buf << '\n';
1105 1014
1106 return buf; 1015 return buf;
1107} 1016}
1108 1017
1109/* tmp is the object being described, pl is who is examing it. */ 1018/* tmp is the object being described, pl is who is examing it. */
… …
1167std::string 1076std::string
1168object::describe (object *who) 1077object::describe (object *who)
1169{ 1078{
1170 dynbuf_text buf (1024, 1024); 1079 dynbuf_text buf (1024, 1024);
1171 1080
1172 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1081 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1173 1082
1174 if (custom_name) 1083 if (custom_name)
1175 buf.printf ("You call it %s\n", &custom_name); 1084 buf.printf ("You call it %s.\r", &custom_name);
1176 1085
1177 switch (type) 1086 switch (type)
1178 { 1087 {
1179 case SPELLBOOK: 1088 case SPELLBOOK:
1180 if (flag [FLAG_IDENTIFIED] && inv) 1089 if (flag [FLAG_IDENTIFIED] && inv)
1181 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1090 buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1182 break; 1091 break;
1183 1092
1184 case BOOK: 1093 case BOOK:
1185 if (msg) 1094 if (msg)
1186 buf << "Something is written in it.\n"; 1095 buf << "Something is written in it.\r";
1187 break; 1096 break;
1188 1097
1189 case CONTAINER: 1098 case CONTAINER:
1190 if (race != NULL) 1099 if (race)
1191 { 1100 {
1192 if (weight_limit && stats.Str < 100) 1101 if (weight_limit && stats.Str < 100)
1193 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n", 1102 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1194 &race, weight_limit / (10.0 * (100 - stats.Str))); 1103 &race, weight_limit / (10.0 * (100 - stats.Str)));
1195 else 1104 else
1196 buf.printf ("It can hold only %s.\n", &race); 1105 buf.printf ("It can hold only %s.\r", &race);
1197 } 1106 }
1198 else if (weight_limit && stats.Str < 100) 1107 else if (weight_limit && stats.Str < 100)
1199 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str))); 1108 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1200 break; 1109 break;
1201 1110
1202 case WAND: 1111 case WAND:
1203 if (flag [FLAG_IDENTIFIED]) 1112 if (flag [FLAG_IDENTIFIED])
1204 buf.printf ("It has %d charges left.\n", stats.food); 1113 buf.printf ("It has %d charges left.\r", stats.food);
1205 break; 1114 break;
1206 } 1115 }
1207 1116
1208 if (materialname && !msg) 1117 if (materialname && !msg)
1209 buf.printf ("It is made of: %s.\n", &materialname); 1118 buf.printf ("It is made of: %s.\r", &materialname);
1210 1119
1211 if (who) 1120 if (who)
1212 /* Where to wear this item */ 1121 /* Where to wear this item */
1213 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1122 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1214 if (slot[i].info) 1123 if (slot[i].info)
… …
1216 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); 1125 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1217 1126
1218 if (slot[i].info < -1 && who->slot[i].info) 1127 if (slot[i].info < -1 && who->slot[i].info)
1219 buf.printf ("(%d)", -slot[i].info); 1128 buf.printf ("(%d)", -slot[i].info);
1220 1129
1221 buf << ".\n"; 1130 buf << ".\r";
1222 } 1131 }
1223 1132
1224 if (weight) 1133 if (weight)
1225 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0); 1134 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1226 1135
1227 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1136 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1228 { 1137 {
1229 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); 1138 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1230 1139
1231 if (is_in_shop (who)) 1140 if (is_in_shop (who))
1232 { 1141 {
1233 if (flag [FLAG_UNPAID]) 1142 if (flag [FLAG_UNPAID])
1234 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); 1143 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1235 else 1144 else
1236 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); 1145 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1237 } 1146 }
1238 } 1147 }
1239 1148
1240 if (flag [FLAG_MONSTER]) 1149 if (flag [FLAG_MONSTER])
1241 buf << describe_monster (who); 1150 buf << describe_monster (who);
1242 1151
1243 /* Is this item buildable? */ 1152 /* Is this item buildable? */
1244 if (flag [FLAG_IS_BUILDABLE]) 1153 if (flag [FLAG_IS_BUILDABLE])
1245 buf << "This is a buildable item.\n"; 1154 buf << "This is a buildable item.\r";
1246 1155
1247 /* Does the object have a message? Don't show message for all object 1156 /* Does the object have a message? Don't show message for all object
1248 * types - especially if the first entry is a match 1157 * types - especially if the first entry is a match
1249 */ 1158 */
1250 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@') 1159 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1251 { 1160 {
1252 /* This is just a hack so when identifying the items, we print 1161 /* This is just a hack so when identifying the items, we print
1253 * out the extra message 1162 * out the extra message
1254 */ 1163 */
1255 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1164 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1256 buf << "The object has a story:\n"; 1165 buf << "The object has a story:\r";
1257 1166
1258 buf << msg << '\n'; 1167 buf << msg << '\n';
1259 } 1168 }
1260 1169
1261 buf << '\n'; 1170 buf << '\n';

Diff Legend

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