ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC vs.
Revision 1.157 by root, Mon May 28 21:21:40 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
28#include <stdio.h> 29#include <stdio.h>
29#include <sys/types.h> 30#include <sys/types.h>
30#include <sys/uio.h> 31#include <sys/uio.h>
31#include <object.h> 32#include <object.h>
32#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
33#include <loader.h> 35#include <loader.h>
34 36
35#include <bitset> 37#include <bitset>
36 38
37int nrofallocobjects = 0; 39int nrofallocobjects = 0;
38static UUID uuid; 40static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 41const uint64 UUID_SKIP = 1<<19;
40 42
41object *active_objects; /* List of active objects that need to be processed */ 43objectvec objects;
44activevec actives;
42 45
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 46short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 48};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
190 * Check nrof variable *before* calling can_merge() 193 * Check nrof variable *before* calling can_merge()
191 * 194 *
192 * Improvements made with merge: Better checking on potion, and also 195 * Improvements made with merge: Better checking on potion, and also
193 * check weight 196 * check weight
194 */ 197 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 198bool object::can_merge_slow (object *ob1, object *ob2)
197{ 199{
198 /* A couple quicksanity checks */ 200 /* A couple quicksanity checks */
199 if (ob1 == ob2 201 if (ob1 == ob2
200 || ob1->type != ob2->type 202 || ob1->type != ob2->type
277 279
278 /* Note sure why the following is the case - either the object has to 280 /* Note sure why the following is the case - either the object has to
279 * be animated or have a very low speed. Is this an attempted monster 281 * be animated or have a very low speed. Is this an attempted monster
280 * check? 282 * check?
281 */ 283 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 285 return 0;
284 286
285 switch (ob1->type) 287 switch (ob1->type)
286 { 288 {
287 case SCROLL: 289 case SCROLL:
323sum_weight (object *op) 325sum_weight (object *op)
324{ 326{
325 long sum; 327 long sum;
326 object *inv; 328 object *inv;
327 329
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 331 {
330 if (inv->inv) 332 if (inv->inv)
331 sum_weight (inv); 333 sum_weight (inv);
334
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 336 }
334 337
335 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 359/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 361 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 362 * The result of the dump is stored in the static global errmsg array.
360 */ 363 */
361
362char * 364char *
363dump_object (object *op) 365dump_object (object *op)
364{ 366{
365 if (!op) 367 if (!op)
366 return strdup ("[NULLOBJ]"); 368 return strdup ("[NULLOBJ]");
367 369
368 object_freezer freezer; 370 object_freezer freezer;
369 save_object (freezer, op, 1); 371 op->write (freezer);
370 return freezer.as_string (); 372 return freezer.as_string ();
371} 373}
372 374
373/* 375/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 376 * get_nearest_part(multi-object, object 2) returns the part of the
391} 393}
392 394
393/* 395/*
394 * Returns the object which has the count-variable equal to the argument. 396 * Returns the object which has the count-variable equal to the argument.
395 */ 397 */
396
397object * 398object *
398find_object (tag_t i) 399find_object (tag_t i)
399{ 400{
400 for (object *op = object::first; op; op = op->next) 401 for_all_objects (op)
401 if (op->count == i) 402 if (op->count == i)
402 return op; 403 return op;
403 404
404 return 0; 405 return 0;
405} 406}
406 407
407/* 408/*
408 * Returns the first object which has a name equal to the argument. 409 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 411 * Enables features like "patch <name-of-other-player> food 999"
411 */ 412 */
412
413object * 413object *
414find_object_name (const char *str) 414find_object_name (const char *str)
415{ 415{
416 shstr_cmp str_ (str); 416 shstr_cmp str_ (str);
417 object *op; 417 object *op;
418 418
419 for (op = object::first; op != NULL; op = op->next) 419 for_all_objects (op)
420 if (op->name == str_) 420 if (op->name == str_)
421 break; 421 break;
422 422
423 return op; 423 return op;
424} 424}
450 owner = owner->owner; 450 owner = owner->owner;
451 451
452 this->owner = owner; 452 this->owner = owner;
453} 453}
454 454
455int
456object::slottype () const
457{
458 if (type == SKILL)
459 {
460 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
461 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
462 }
463 else
464 {
465 if (slot [body_combat].info) return slot_combat;
466 if (slot [body_range ].info) return slot_ranged;
467 }
468
469 return slot_none;
470}
471
472bool
473object::change_weapon (object *ob)
474{
475 if (current_weapon == ob)
476 return true;
477
478 if (chosen_skill)
479 chosen_skill->flag [FLAG_APPLIED] = false;
480
481 current_weapon = ob;
482 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
483
484 if (chosen_skill)
485 chosen_skill->flag [FLAG_APPLIED] = true;
486
487 update_stats ();
488
489 if (ob)
490 {
491 // now check wether any body locations became invalid, in which case
492 // we cannot apply the weapon at the moment.
493 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
494 if (slot[i].used < 0)
495 {
496 current_weapon = chosen_skill = 0;
497 update_stats ();
498
499 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance all your items at once, "
501 "but the %s is just too much for your body. "
502 "[You need to unapply some items first.]", &ob->name);
503 return false;
504 }
505
506 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
507 }
508 else
509 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
510
511 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
512 {
513 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
514 &name, ob->debug_desc ());
515 return false;
516 }
517
518 return true;
519}
520
455/* Zero the key_values on op, decrementing the shared-string 521/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 522 * refcounts and freeing the links.
457 */ 523 */
458static void 524static void
459free_key_values (object *op) 525free_key_values (object *op)
460{ 526{
461 for (key_value *i = op->key_values; i != 0;) 527 for (key_value *i = op->key_values; i; )
462 { 528 {
463 key_value *next = i->next; 529 key_value *next = i->next;
464 delete i; 530 delete i;
465 531
466 i = next; 532 i = next;
467 } 533 }
468 534
469 op->key_values = 0; 535 op->key_values = 0;
470} 536}
471 537
472/* 538object &
473 * copy_to first frees everything allocated by the dst object, 539object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 540{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 541 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 542 bool is_removed = flag [FLAG_REMOVED];
485 543
486 *(object_copy *)dst = *this; 544 *(object_copy *)this = src;
487 545
488 if (is_freed) 546 flag [FLAG_FREED] = is_freed;
489 SET_FLAG (dst, FLAG_FREED); 547 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED);
493
494 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496 548
497 /* Copy over key_values, if any. */ 549 /* Copy over key_values, if any. */
498 if (key_values) 550 if (src.key_values)
499 { 551 {
500 key_value *tail = 0; 552 key_value *tail = 0;
501 key_value *i;
502
503 dst->key_values = 0; 553 key_values = 0;
504 554
505 for (i = key_values; i; i = i->next) 555 for (key_value *i = src.key_values; i; i = i->next)
506 { 556 {
507 key_value *new_link = new key_value; 557 key_value *new_link = new key_value;
508 558
509 new_link->next = 0; 559 new_link->next = 0;
510 new_link->key = i->key; 560 new_link->key = i->key;
511 new_link->value = i->value; 561 new_link->value = i->value;
512 562
513 /* Try and be clever here, too. */ 563 /* Try and be clever here, too. */
514 if (!dst->key_values) 564 if (!key_values)
515 { 565 {
516 dst->key_values = new_link; 566 key_values = new_link;
517 tail = new_link; 567 tail = new_link;
518 } 568 }
519 else 569 else
520 { 570 {
521 tail->next = new_link; 571 tail->next = new_link;
522 tail = new_link; 572 tail = new_link;
523 } 573 }
524 } 574 }
525 } 575 }
576}
526 577
527 update_ob_speed (dst); 578/*
579 * copy_to first frees everything allocated by the dst object,
580 * and then copies the contents of itself into the second
581 * object, allocating what needs to be allocated. Basically, any
582 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
583 * if the first object is freed, the pointers in the new object
584 * will point at garbage.
585 */
586void
587object::copy_to (object *dst)
588{
589 *dst = *this;
590
591 if (speed < 0)
592 dst->speed_left = speed_left - rndm ();
593
594 dst->set_speed (dst->speed);
595}
596
597void
598object::instantiate ()
599{
600 if (!uuid.seq) // HACK
601 uuid = gen_uuid ();
602
603 speed_left = -0.1f;
604 /* copy the body_info to the body_used - this is only really
605 * need for monsters, but doesn't hurt to do it for everything.
606 * by doing so, when a monster is created, it has good starting
607 * values for the body_used info, so when items are created
608 * for it, they can be properly equipped.
609 */
610 for (int i = NUM_BODY_LOCATIONS; i--; )
611 slot[i].used = slot[i].info;
612
613 attachable::instantiate ();
528} 614}
529 615
530object * 616object *
531object::clone () 617object::clone ()
532{ 618{
538/* 624/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 625 * If an object with the IS_TURNABLE() flag needs to be turned due
540 * to the closest player being on the other side, this function can 626 * to the closest player being on the other side, this function can
541 * be called to update the face variable, _and_ how it looks on the map. 627 * be called to update the face variable, _and_ how it looks on the map.
542 */ 628 */
543
544void 629void
545update_turn_face (object *op) 630update_turn_face (object *op)
546{ 631{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 632 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 633 return;
634
549 SET_ANIMATION (op, op->direction); 635 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 636 update_object (op, UP_OBJ_FACE);
551} 637}
552 638
553/* 639/*
554 * Updates the speed of an object. If the speed changes from 0 to another 640 * Updates the speed of an object. If the speed changes from 0 to another
555 * value, or vice versa, then add/remove the object from the active list. 641 * value, or vice versa, then add/remove the object from the active list.
556 * This function needs to be called whenever the speed of an object changes. 642 * This function needs to be called whenever the speed of an object changes.
557 */ 643 */
558void 644void
559update_ob_speed (object *op) 645object::set_speed (float speed)
560{ 646{
561 extern int arch_init; 647 if (flag [FLAG_FREED] && speed)
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
567 { 648 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 649 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 op->speed = 0; 650 speed = 0;
570 }
571
572 if (arch_init)
573 return;
574
575 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
576 { 651 }
577 /* If already on active list, don't do anything */
578 if (op->active_next || op->active_prev || op == active_objects)
579 return;
580 652
581 /* process_events() expects us to insert the object at the beginning 653 this->speed = speed;
582 * of the list. */
583 op->active_next = active_objects;
584 654
585 if (op->active_next != NULL) 655 if (has_active_speed ())
586 op->active_next->active_prev = op; 656 activate ();
587
588 active_objects = op;
589 }
590 else 657 else
591 { 658 deactivate ();
592 /* If not on the active list, nothing needs to be done */
593 if (!op->active_next && !op->active_prev && op != active_objects)
594 return;
595
596 if (op->active_prev == NULL)
597 {
598 active_objects = op->active_next;
599
600 if (op->active_next != NULL)
601 op->active_next->active_prev = NULL;
602 }
603 else
604 {
605 op->active_prev->active_next = op->active_next;
606
607 if (op->active_next)
608 op->active_next->active_prev = op->active_prev;
609 }
610
611 op->active_next = NULL;
612 op->active_prev = NULL;
613 }
614}
615
616/* This function removes object 'op' from the list of active
617 * objects.
618 * This should only be used for style maps or other such
619 * reference maps where you don't want an object that isn't
620 * in play chewing up cpu time getting processed.
621 * The reverse of this is to call update_ob_speed, which
622 * will do the right thing based on the speed of the object.
623 */
624void
625remove_from_active_list (object *op)
626{
627 /* If not on the active list, nothing needs to be done */
628 if (!op->active_next && !op->active_prev && op != active_objects)
629 return;
630
631 if (op->active_prev == NULL)
632 {
633 active_objects = op->active_next;
634 if (op->active_next != NULL)
635 op->active_next->active_prev = NULL;
636 }
637 else
638 {
639 op->active_prev->active_next = op->active_next;
640 if (op->active_next)
641 op->active_next->active_prev = op->active_prev;
642 }
643 op->active_next = NULL;
644 op->active_prev = NULL;
645} 659}
646 660
647/* 661/*
648 * update_object() updates the the map. 662 * update_object() updates the the map.
649 * It takes into account invisible objects (and represent squares covered 663 * It takes into account invisible objects (and represent squares covered
662 * UP_OBJ_FACE: only the objects face has changed. 676 * UP_OBJ_FACE: only the objects face has changed.
663 */ 677 */
664void 678void
665update_object (object *op, int action) 679update_object (object *op, int action)
666{ 680{
667 MoveType move_on, move_off, move_block, move_slow;
668
669 if (op == NULL) 681 if (op == NULL)
670 { 682 {
671 /* this should never happen */ 683 /* this should never happen */
672 LOG (llevDebug, "update_object() called for NULL object.\n"); 684 LOG (llevDebug, "update_object() called for NULL object.\n");
673 return; 685 return;
697 return; 709 return;
698 } 710 }
699 711
700 mapspace &m = op->ms (); 712 mapspace &m = op->ms ();
701 713
702 if (m.flags_ & P_NEED_UPDATE) 714 if (!(m.flags_ & P_UPTODATE))
703 /* nop */; 715 /* nop */;
704 else if (action == UP_OBJ_INSERT) 716 else if (action == UP_OBJ_INSERT)
705 { 717 {
706 // this is likely overkill, TODO: revisit (schmorp) 718 // this is likely overkill, TODO: revisit (schmorp)
707 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 719 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
716 /* This isn't perfect, but I don't expect a lot of objects to 728 /* This isn't perfect, but I don't expect a lot of objects to
717 * to have move_allow right now. 729 * to have move_allow right now.
718 */ 730 */
719 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 731 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
720 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 732 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
721 m.flags_ = P_NEED_UPDATE; 733 m.flags_ = 0;
722 } 734 }
723 /* if the object is being removed, we can't make intelligent 735 /* if the object is being removed, we can't make intelligent
724 * decisions, because remove_ob can't really pass the object 736 * decisions, because remove_ob can't really pass the object
725 * that is being removed. 737 * that is being removed.
726 */ 738 */
727 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 739 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
728 m.flags_ = P_NEED_UPDATE; 740 m.flags_ = 0;
729 else if (action == UP_OBJ_FACE) 741 else if (action == UP_OBJ_FACE)
730 /* Nothing to do for that case */ ; 742 /* Nothing to do for that case */ ;
731 else 743 else
732 LOG (llevError, "update_object called with invalid action: %d\n", action); 744 LOG (llevError, "update_object called with invalid action: %d\n", action);
733 745
734 if (op->more) 746 if (op->more)
735 update_object (op->more, action); 747 update_object (op->more, action);
736} 748}
737 749
738object::vector object::objects; // not yet used
739object *object::first;
740
741object::object () 750object::object ()
742{ 751{
743 SET_FLAG (this, FLAG_REMOVED); 752 SET_FLAG (this, FLAG_REMOVED);
744 753
745 expmul = 1.0; 754 expmul = 1.0;
746 face = blank_face; 755 face = blank_face;
747} 756}
748 757
749object::~object () 758object::~object ()
750{ 759{
760 unlink ();
761
751 free_key_values (this); 762 free_key_values (this);
752} 763}
753 764
765static int object_count;
766
754void object::link () 767void object::link ()
755{ 768{
756 count = ++ob_count; 769 assert (!index);//D
757 uuid = gen_uuid (); 770 uuid = gen_uuid ();
771 count = ++object_count;
758 772
759 prev = 0; 773 refcnt_inc ();
760 next = object::first; 774 objects.insert (this);
761
762 if (object::first)
763 object::first->prev = this;
764
765 object::first = this;
766} 775}
767 776
768void object::unlink () 777void object::unlink ()
769{ 778{
770 if (this == object::first) 779 if (!index)
771 object::first = next;
772
773 /* Remove this object from the list of used objects */
774 if (prev) prev->next = next;
775 if (next) next->prev = prev;
776
777 prev = 0;
778 next = 0;
779}
780
781object *object::create ()
782{
783 object *op = new object;
784 op->link ();
785 return op; 780 return;
786}
787 781
788/* 782 objects.erase (this);
789 * free_object() frees everything allocated by an object, removes 783 refcnt_dec ();
790 * it from the list of used objects, and puts it on the list of 784}
791 * free objects. The IS_FREED() flag is set in the object. 785
792 * The object must have been removed by remove_ob() first for
793 * this function to succeed.
794 *
795 * If destroy_inventory is set, free inventory as well. Else drop items in
796 * inventory to the ground.
797 */
798void 786void
799object::do_destroy () 787object::activate ()
800{ 788{
801 attachable::do_destroy (); 789 /* If already on active list, don't do anything */
802 790 if (active)
803 if (flag [FLAG_IS_LINKED])
804 remove_button_link (this);
805
806 if (flag [FLAG_FRIENDLY])
807 remove_friendly_object (this);
808
809 if (!flag [FLAG_REMOVED])
810 remove ();
811
812 if (flag [FLAG_FREED])
813 return; 791 return;
814 792
815 flag [FLAG_FREED] = 1; 793 if (has_active_speed ())
794 actives.insert (this);
795}
816 796
817 // hack to ensure that freed objects still have a valid map 797void
818 { 798object::activate_recursive ()
819 static maptile *freed_map; // freed objects are moved here to avoid crashes 799{
800 activate ();
820 801
821 if (!freed_map) 802 for (object *op = inv; op; op = op->below)
803 op->activate_recursive ();
804}
805
806/* This function removes object 'op' from the list of active
807 * objects.
808 * This should only be used for style maps or other such
809 * reference maps where you don't want an object that isn't
810 * in play chewing up cpu time getting processed.
811 * The reverse of this is to call update_ob_speed, which
812 * will do the right thing based on the speed of the object.
813 */
814void
815object::deactivate ()
816{
817 /* If not on the active list, nothing needs to be done */
818 if (!active)
819 return;
820
821 actives.erase (this);
822}
823
824void
825object::deactivate_recursive ()
826{
827 for (object *op = inv; op; op = op->below)
828 op->deactivate_recursive ();
829
830 deactivate ();
831}
832
833void
834object::set_flag_inv (int flag, int value)
835{
836 for (object *op = inv; op; op = op->below)
822 { 837 {
823 freed_map = new maptile; 838 op->flag [flag] = value;
824 839 op->set_flag_inv (flag, value);
825 freed_map->name = "/internal/freed_objects_map";
826 freed_map->width = 3;
827 freed_map->height = 3;
828
829 freed_map->allocate ();
830 } 840 }
831
832 map = freed_map;
833 x = 1;
834 y = 1;
835 }
836
837 more = 0;
838 head = 0;
839 inv = 0;
840
841 // clear those pointers that likely might have circular references to us
842 owner = 0;
843 enemy = 0;
844 attacked_by = 0;
845
846 // only relevant for players(?), but make sure of it anyways
847 contr = 0;
848
849 /* Remove object from the active list */
850 speed = 0;
851 update_ob_speed (this);
852
853 unlink ();
854} 841}
855 842
856/* 843/*
857 * Remove and free all objects in the inventory of the given object. 844 * Remove and free all objects in the inventory of the given object.
858 * object.c ? 845 * object.c ?
859 */ 846 */
860void 847void
861object::destroy_inv (bool drop_to_ground) 848object::destroy_inv (bool drop_to_ground)
862{ 849{
850 // need to check first, because the checks below might segfault
851 // as we might be on an invalid mapspace and crossfire code
852 // is too buggy to ensure that the inventory is empty.
853 // corollary: if you create arrows etc. with stuff in tis inventory,
854 // cf will crash below with off-map x and y
863 if (!inv) 855 if (!inv)
864 return; 856 return;
865 857
866 /* Only if the space blocks everything do we not process - 858 /* Only if the space blocks everything do we not process -
867 * if some form of movement is allowed, let objects 859 * if some form of movement is allowed, let objects
868 * drop on that space. 860 * drop on that space.
869 */ 861 */
870 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 862 if (!drop_to_ground
863 || !map
864 || map->in_memory != MAP_IN_MEMORY
865 || map->nodrop
866 || ms ().move_block == MOVE_ALL)
871 { 867 {
872 while (inv) 868 while (inv)
873 { 869 {
874 inv->destroy_inv (drop_to_ground); 870 inv->destroy_inv (drop_to_ground);
875 inv->destroy (); 871 inv->destroy ();
883 879
884 if (op->flag [FLAG_STARTEQUIP] 880 if (op->flag [FLAG_STARTEQUIP]
885 || op->flag [FLAG_NO_DROP] 881 || op->flag [FLAG_NO_DROP]
886 || op->type == RUNE 882 || op->type == RUNE
887 || op->type == TRAP 883 || op->type == TRAP
888 || op->flag [FLAG_IS_A_TEMPLATE]) 884 || op->flag [FLAG_IS_A_TEMPLATE]
885 || op->flag [FLAG_DESTROY_ON_DEATH])
889 op->destroy (); 886 op->destroy ();
890 else 887 else
891 { 888 map->insert (op, x, y);
892 op->remove ();
893 op->x = x;
894 op->y = y;
895 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
896 }
897 } 889 }
898 } 890 }
891}
892
893object *object::create ()
894{
895 object *op = new object;
896 op->link ();
897 return op;
898}
899
900void
901object::do_destroy ()
902{
903 attachable::do_destroy ();
904
905 if (flag [FLAG_IS_LINKED])
906 remove_button_link (this);
907
908 if (flag [FLAG_FRIENDLY])
909 remove_friendly_object (this);
910
911 if (!flag [FLAG_REMOVED])
912 remove ();
913
914 destroy_inv (true);
915
916 deactivate ();
917 unlink ();
918
919 flag [FLAG_FREED] = 1;
920
921 // hack to ensure that freed objects still have a valid map
922 {
923 static maptile *freed_map; // freed objects are moved here to avoid crashes
924
925 if (!freed_map)
926 {
927 freed_map = new maptile;
928
929 freed_map->name = "/internal/freed_objects_map";
930 freed_map->width = 3;
931 freed_map->height = 3;
932
933 freed_map->alloc ();
934 freed_map->in_memory = MAP_IN_MEMORY;
935 }
936
937 map = freed_map;
938 x = 1;
939 y = 1;
940 }
941
942 head = 0;
943
944 if (more)
945 {
946 more->destroy ();
947 more = 0;
948 }
949
950 // clear those pointers that likely might have circular references to us
951 owner = 0;
952 enemy = 0;
953 attacked_by = 0;
899} 954}
900 955
901void 956void
902object::destroy (bool destroy_inventory) 957object::destroy (bool destroy_inventory)
903{ 958{
904 if (destroyed ()) 959 if (destroyed ())
905 return; 960 return;
906 961
907 if (more)
908 {
909 //TODO: non-head objects must not have inventory
910 more->destroy (destroy_inventory);
911 more = 0;
912 }
913
914 if (destroy_inventory) 962 if (destroy_inventory)
915 destroy_inv (true); 963 destroy_inv (false);
916 964
917 attachable::destroy (); 965 attachable::destroy ();
918} 966}
919 967
920/* 968/*
938 * This function removes the object op from the linked list of objects 986 * This function removes the object op from the linked list of objects
939 * which it is currently tied to. When this function is done, the 987 * which it is currently tied to. When this function is done, the
940 * object will have no environment. If the object previously had an 988 * object will have no environment. If the object previously had an
941 * environment, the x and y coordinates will be updated to 989 * environment, the x and y coordinates will be updated to
942 * the previous environment. 990 * the previous environment.
943 * Beware: This function is called from the editor as well!
944 */ 991 */
945void 992void
946object::remove () 993object::do_remove ()
947{ 994{
948 object *tmp, *last = 0; 995 object *tmp, *last = 0;
949 object *otmp; 996 object *otmp;
950 997
951 if (QUERY_FLAG (this, FLAG_REMOVED)) 998 if (QUERY_FLAG (this, FLAG_REMOVED))
973 * to save cpu time. 1020 * to save cpu time.
974 */ 1021 */
975 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1022 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
976 otmp->update_stats (); 1023 otmp->update_stats ();
977 1024
978 if (above != NULL) 1025 if (above)
979 above->below = below; 1026 above->below = below;
980 else 1027 else
981 env->inv = below; 1028 env->inv = below;
982 1029
983 if (below != NULL) 1030 if (below)
984 below->above = above; 1031 below->above = above;
985 1032
986 /* we set up values so that it could be inserted into 1033 /* we set up values so that it could be inserted into
987 * the map, but we don't actually do that - it is up 1034 * the map, but we don't actually do that - it is up
988 * to the caller to decide what we want to do. 1035 * to the caller to decide what we want to do.
992 above = 0, below = 0; 1039 above = 0, below = 0;
993 env = 0; 1040 env = 0;
994 } 1041 }
995 else if (map) 1042 else if (map)
996 { 1043 {
997 /* Re did the following section of code - it looks like it had 1044 if (type == PLAYER)
998 * lots of logic for things we no longer care about
999 */ 1045 {
1046 // leaving a spot always closes any open container on the ground
1047 if (container && !container->env)
1048 // this causes spurious floorbox updates, but it ensures
1049 // that the CLOSE event is being sent.
1050 close_container ();
1051
1052 --map->players;
1053 map->touch ();
1054 }
1055
1056 map->dirty = true;
1057 mapspace &ms = this->ms ();
1000 1058
1001 /* link the object above us */ 1059 /* link the object above us */
1002 if (above) 1060 if (above)
1003 above->below = below; 1061 above->below = below;
1004 else 1062 else
1005 map->at (x, y).top = below; /* we were top, set new top */ 1063 ms.top = below; /* we were top, set new top */
1006 1064
1007 /* Relink the object below us, if there is one */ 1065 /* Relink the object below us, if there is one */
1008 if (below) 1066 if (below)
1009 below->above = above; 1067 below->above = above;
1010 else 1068 else
1012 /* Nothing below, which means we need to relink map object for this space 1070 /* Nothing below, which means we need to relink map object for this space
1013 * use translated coordinates in case some oddness with map tiling is 1071 * use translated coordinates in case some oddness with map tiling is
1014 * evident 1072 * evident
1015 */ 1073 */
1016 if (GET_MAP_OB (map, x, y) != this) 1074 if (GET_MAP_OB (map, x, y) != this)
1017 {
1018 char *dump = dump_object (this);
1019 LOG (llevError,
1020 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1075 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1021 free (dump);
1022 dump = dump_object (GET_MAP_OB (map, x, y));
1023 LOG (llevError, "%s\n", dump);
1024 free (dump);
1025 }
1026 1076
1027 map->at (x, y).bot = above; /* goes on above it. */ 1077 ms.bot = above; /* goes on above it. */
1028 } 1078 }
1029 1079
1030 above = 0; 1080 above = 0;
1031 below = 0; 1081 below = 0;
1032 1082
1033 if (map->in_memory == MAP_SAVING) 1083 if (map->in_memory == MAP_SAVING)
1034 return; 1084 return;
1035 1085
1036 int check_walk_off = !flag [FLAG_NO_APPLY]; 1086 int check_walk_off = !flag [FLAG_NO_APPLY];
1037 1087
1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1088 for (tmp = ms.bot; tmp; tmp = tmp->above)
1039 { 1089 {
1040 /* No point updating the players look faces if he is the object 1090 /* No point updating the players look faces if he is the object
1041 * being removed. 1091 * being removed.
1042 */ 1092 */
1043 1093
1055 1105
1056 if (tmp->contr->ns) 1106 if (tmp->contr->ns)
1057 tmp->contr->ns->floorbox_update (); 1107 tmp->contr->ns->floorbox_update ();
1058 } 1108 }
1059 1109
1060 /* See if player moving off should effect something */ 1110 /* See if object moving off should effect something */
1061 if (check_walk_off 1111 if (check_walk_off
1062 && ((move_type & tmp->move_off) 1112 && ((move_type & tmp->move_off)
1063 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1113 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064 { 1114 {
1065 move_apply (tmp, this, 0); 1115 move_apply (tmp, this, 0);
1067 if (destroyed ()) 1117 if (destroyed ())
1068 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1118 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1069 } 1119 }
1070 1120
1071 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1121 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072 1122 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1073 if (tmp->above == tmp) 1123 if (tmp->above == tmp)
1074 tmp->above = 0; 1124 tmp->above = 0;
1075 1125
1076 last = tmp; 1126 last = tmp;
1077 } 1127 }
1078 1128
1079 /* last == NULL of there are no objects on this space */ 1129 /* last == NULL if there are no objects on this space */
1130 //TODO: this makes little sense, why only update the topmost object?
1080 if (!last) 1131 if (!last)
1081 map->at (x, y).flags_ = P_NEED_UPDATE; 1132 map->at (x, y).flags_ = 0;
1082 else 1133 else
1083 update_object (last, UP_OBJ_REMOVE); 1134 update_object (last, UP_OBJ_REMOVE);
1084 1135
1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1136 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1086 update_all_los (map, x, y); 1137 update_all_los (map, x, y);
1122 } 1173 }
1123 1174
1124 return 0; 1175 return 0;
1125} 1176}
1126 1177
1178void
1179object::expand_tail ()
1180{
1181 if (more)
1182 return;
1183
1184 object *prev = this;
1185
1186 for (archetype *at = arch->more; at; at = at->more)
1187 {
1188 object *op = arch_to_object (at);
1189
1190 op->name = name;
1191 op->name_pl = name_pl;
1192 op->title = title;
1193
1194 op->head = this;
1195 prev->more = op;
1196
1197 prev = op;
1198 }
1199}
1200
1127/* 1201/*
1128 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1202 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1129 * job preparing multi-part monsters 1203 * job preparing multi-part monsters.
1130 */ 1204 */
1131object * 1205object *
1132insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1206insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1133{ 1207{
1134 object *tmp;
1135
1136 if (op->head)
1137 op = op->head;
1138
1139 for (tmp = op; tmp; tmp = tmp->more) 1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140 { 1209 {
1141 tmp->x = x + tmp->arch->clone.x; 1210 tmp->x = x + tmp->arch->clone.x;
1142 tmp->y = y + tmp->arch->clone.y; 1211 tmp->y = y + tmp->arch->clone.y;
1143 } 1212 }
1144 1213
1166 * just 'op' otherwise 1235 * just 'op' otherwise
1167 */ 1236 */
1168object * 1237object *
1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1238insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1170{ 1239{
1240 assert (!op->flag [FLAG_FREED]);
1241
1171 object *tmp, *top, *floor = NULL; 1242 object *top, *floor = NULL;
1172 sint16 x, y;
1173 1243
1174 if (QUERY_FLAG (op, FLAG_FREED)) 1244 op->remove ();
1175 {
1176 LOG (llevError, "Trying to insert freed object!\n");
1177 return NULL;
1178 }
1179 1245
1180 if (m == NULL) 1246#if 0
1181 { 1247 if (!m->active != !op->active)
1182 char *dump = dump_object (op); 1248 if (m->active)
1183 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1249 op->activate_recursive ();
1184 free (dump); 1250 else
1185 return op; 1251 op->deactivate_recursive ();
1186 } 1252#endif
1187 1253
1188 if (out_of_map (m, op->x, op->y)) 1254 if (out_of_map (m, op->x, op->y))
1189 { 1255 {
1190 char *dump = dump_object (op);
1191 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1256 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1192#ifdef MANY_CORES 1257#ifdef MANY_CORES
1193 /* Better to catch this here, as otherwise the next use of this object 1258 /* Better to catch this here, as otherwise the next use of this object
1194 * is likely to cause a crash. Better to find out where it is getting 1259 * is likely to cause a crash. Better to find out where it is getting
1195 * improperly inserted. 1260 * improperly inserted.
1196 */ 1261 */
1197 abort (); 1262 abort ();
1198#endif 1263#endif
1199 free (dump);
1200 return op; 1264 return op;
1201 } 1265 }
1202 1266
1203 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1267 if (object *more = op->more)
1204 { 1268 if (!insert_ob_in_map (more, m, originator, flag))
1205 char *dump = dump_object (op);
1206 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1207 free (dump);
1208 return op; 1269 return 0;
1209 }
1210
1211 if (op->more)
1212 {
1213 /* The part may be on a different map. */
1214
1215 object *more = op->more;
1216
1217 /* We really need the caller to normalize coordinates - if
1218 * we set the map, that doesn't work if the location is within
1219 * a map and this is straddling an edge. So only if coordinate
1220 * is clear wrong do we normalize it.
1221 */
1222 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1223 more->map = get_map_from_coord (m, &more->x, &more->y);
1224 else if (!more->map)
1225 {
1226 /* For backwards compatibility - when not dealing with tiled maps,
1227 * more->map should always point to the parent.
1228 */
1229 more->map = m;
1230 }
1231
1232 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1233 {
1234 if (!op->head)
1235 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1236
1237 return 0;
1238 }
1239 }
1240 1270
1241 CLEAR_FLAG (op, FLAG_REMOVED); 1271 CLEAR_FLAG (op, FLAG_REMOVED);
1242 1272
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1273 /* Ideally, the caller figures this out. However, it complicates a lot
1244 * of areas of callers (eg, anything that uses find_free_spot would now 1274 * of areas of callers (eg, anything that uses find_free_spot would now
1245 * need extra work 1275 * need extra work
1246 */ 1276 */
1247 op->map = get_map_from_coord (m, &op->x, &op->y); 1277 if (!xy_normalise (m, op->x, op->y))
1248 x = op->x; 1278 return 0;
1249 y = op->y; 1279
1280 op->map = m;
1281 mapspace &ms = op->ms ();
1250 1282
1251 /* this has to be done after we translate the coordinates. 1283 /* this has to be done after we translate the coordinates.
1252 */ 1284 */
1253 if (op->nrof && !(flag & INS_NO_MERGE)) 1285 if (op->nrof && !(flag & INS_NO_MERGE))
1254 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1286 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1255 if (object::can_merge (op, tmp)) 1287 if (object::can_merge (op, tmp))
1256 { 1288 {
1257 op->nrof += tmp->nrof; 1289 op->nrof += tmp->nrof;
1258 tmp->destroy (); 1290 tmp->destroy ();
1259 } 1291 }
1276 op->below = originator->below; 1308 op->below = originator->below;
1277 1309
1278 if (op->below) 1310 if (op->below)
1279 op->below->above = op; 1311 op->below->above = op;
1280 else 1312 else
1281 op->ms ().bot = op; 1313 ms.bot = op;
1282 1314
1283 /* since *below* originator, no need to update top */ 1315 /* since *below* originator, no need to update top */
1284 originator->below = op; 1316 originator->below = op;
1285 } 1317 }
1286 else 1318 else
1287 { 1319 {
1320 top = ms.bot;
1321
1288 /* If there are other objects, then */ 1322 /* If there are other objects, then */
1289 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1323 if ((!(flag & INS_MAP_LOAD)) && top)
1290 { 1324 {
1291 object *last = NULL; 1325 object *last = 0;
1292 1326
1293 /* 1327 /*
1294 * If there are multiple objects on this space, we do some trickier handling. 1328 * If there are multiple objects on this space, we do some trickier handling.
1295 * We've already dealt with merging if appropriate. 1329 * We've already dealt with merging if appropriate.
1296 * Generally, we want to put the new object on top. But if 1330 * Generally, we want to put the new object on top. But if
1300 * once we get to them. This reduces the need to traverse over all of 1334 * once we get to them. This reduces the need to traverse over all of
1301 * them when adding another one - this saves quite a bit of cpu time 1335 * them when adding another one - this saves quite a bit of cpu time
1302 * when lots of spells are cast in one area. Currently, it is presumed 1336 * when lots of spells are cast in one area. Currently, it is presumed
1303 * that flying non pickable objects are spell objects. 1337 * that flying non pickable objects are spell objects.
1304 */ 1338 */
1305 1339 for (top = ms.bot; top; top = top->above)
1306 while (top != NULL)
1307 { 1340 {
1308 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1341 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1309 floor = top; 1342 floor = top;
1310 1343
1311 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1344 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1314 top = top->below; 1347 top = top->below;
1315 break; 1348 break;
1316 } 1349 }
1317 1350
1318 last = top; 1351 last = top;
1319 top = top->above;
1320 } 1352 }
1321 1353
1322 /* Don't want top to be NULL, so set it to the last valid object */ 1354 /* Don't want top to be NULL, so set it to the last valid object */
1323 top = last; 1355 top = last;
1324 1356
1326 * looks like instead of lots of conditions here. 1358 * looks like instead of lots of conditions here.
1327 * makes things faster, and effectively the same result. 1359 * makes things faster, and effectively the same result.
1328 */ 1360 */
1329 1361
1330 /* Have object 'fall below' other objects that block view. 1362 /* Have object 'fall below' other objects that block view.
1331 * Unless those objects are exits, type 66 1363 * Unless those objects are exits.
1332 * If INS_ON_TOP is used, don't do this processing 1364 * If INS_ON_TOP is used, don't do this processing
1333 * Need to find the object that in fact blocks view, otherwise 1365 * Need to find the object that in fact blocks view, otherwise
1334 * stacking is a bit odd. 1366 * stacking is a bit odd.
1335 */ 1367 */
1336 if (!(flag & INS_ON_TOP) && 1368 if (!(flag & INS_ON_TOP)
1337 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1369 && ms.flags () & P_BLOCKSVIEW
1370 && (op->face && !faces [op->face].visibility))
1338 { 1371 {
1339 for (last = top; last != floor; last = last->below) 1372 for (last = top; last != floor; last = last->below)
1340 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1373 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1341 break; 1374 break;
1375
1342 /* Check to see if we found the object that blocks view, 1376 /* Check to see if we found the object that blocks view,
1343 * and make sure we have a below pointer for it so that 1377 * and make sure we have a below pointer for it so that
1344 * we can get inserted below this one, which requires we 1378 * we can get inserted below this one, which requires we
1345 * set top to the object below us. 1379 * set top to the object below us.
1346 */ 1380 */
1348 top = last->below; 1382 top = last->below;
1349 } 1383 }
1350 } /* If objects on this space */ 1384 } /* If objects on this space */
1351 1385
1352 if (flag & INS_MAP_LOAD) 1386 if (flag & INS_MAP_LOAD)
1353 top = GET_MAP_TOP (op->map, op->x, op->y); 1387 top = ms.top;
1354 1388
1355 if (flag & INS_ABOVE_FLOOR_ONLY) 1389 if (flag & INS_ABOVE_FLOOR_ONLY)
1356 top = floor; 1390 top = floor;
1357 1391
1358 /* Top is the object that our object (op) is going to get inserted above. 1392 /* Top is the object that our object (op) is going to get inserted above.
1359 */ 1393 */
1360 1394
1361 /* First object on this space */ 1395 /* First object on this space */
1362 if (!top) 1396 if (!top)
1363 { 1397 {
1364 op->above = GET_MAP_OB (op->map, op->x, op->y); 1398 op->above = ms.bot;
1365 1399
1366 if (op->above) 1400 if (op->above)
1367 op->above->below = op; 1401 op->above->below = op;
1368 1402
1369 op->below = NULL; 1403 op->below = 0;
1370 op->ms ().bot = op; 1404 ms.bot = op;
1371 } 1405 }
1372 else 1406 else
1373 { /* get inserted into the stack above top */ 1407 { /* get inserted into the stack above top */
1374 op->above = top->above; 1408 op->above = top->above;
1375 1409
1378 1412
1379 op->below = top; 1413 op->below = top;
1380 top->above = op; 1414 top->above = op;
1381 } 1415 }
1382 1416
1383 if (op->above == NULL) 1417 if (!op->above)
1384 op->ms ().top = op; 1418 ms.top = op;
1385 } /* else not INS_BELOW_ORIGINATOR */ 1419 } /* else not INS_BELOW_ORIGINATOR */
1386 1420
1387 if (op->type == PLAYER) 1421 if (op->type == PLAYER)
1422 {
1388 op->contr->do_los = 1; 1423 op->contr->do_los = 1;
1424 ++op->map->players;
1425 op->map->touch ();
1426 }
1427
1428 op->map->dirty = true;
1389 1429
1390 /* If we have a floor, we know the player, if any, will be above 1430 /* If we have a floor, we know the player, if any, will be above
1391 * it, so save a few ticks and start from there. 1431 * it, so save a few ticks and start from there.
1392 */ 1432 */
1393 if (!(flag & INS_MAP_LOAD)) 1433 if (!(flag & INS_MAP_LOAD))
1394 if (object *pl = op->ms ().player ()) 1434 if (object *pl = ms.player ())
1395 if (pl->contr->ns) 1435 if (pl->contr->ns)
1396 pl->contr->ns->floorbox_update (); 1436 pl->contr->ns->floorbox_update ();
1397 1437
1398 /* If this object glows, it may affect lighting conditions that are 1438 /* If this object glows, it may affect lighting conditions that are
1399 * visible to others on this map. But update_all_los is really 1439 * visible to others on this map. But update_all_los is really
1400 * an inefficient way to do this, as it means los for all players 1440 * an inefficient way to do this, as it means los for all players
1401 * on the map will get recalculated. The players could very well 1441 * on the map will get recalculated. The players could very well
1402 * be far away from this change and not affected in any way - 1442 * be far away from this change and not affected in any way -
1403 * this should get redone to only look for players within range, 1443 * this should get redone to only look for players within range,
1404 * or just updating the P_NEED_UPDATE for spaces within this area 1444 * or just updating the P_UPTODATE for spaces within this area
1405 * of effect may be sufficient. 1445 * of effect may be sufficient.
1406 */ 1446 */
1407 if (op->map->darkness && (op->glow_radius != 0)) 1447 if (op->map->darkness && (op->glow_radius != 0))
1408 update_all_los (op->map, op->x, op->y); 1448 update_all_los (op->map, op->x, op->y);
1409 1449
1420 * blocked() and wall() work properly), and these flags are updated by 1460 * blocked() and wall() work properly), and these flags are updated by
1421 * update_object(). 1461 * update_object().
1422 */ 1462 */
1423 1463
1424 /* if this is not the head or flag has been passed, don't check walk on status */ 1464 /* if this is not the head or flag has been passed, don't check walk on status */
1425 if (!(flag & INS_NO_WALK_ON) && !op->head) 1465 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1426 { 1466 {
1427 if (check_move_on (op, originator)) 1467 if (check_move_on (op, originator))
1428 return 0; 1468 return 0;
1429 1469
1430 /* If we are a multi part object, lets work our way through the check 1470 /* If we are a multi part object, lets work our way through the check
1431 * walk on's. 1471 * walk on's.
1432 */ 1472 */
1433 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1473 for (object *tmp = op->more; tmp; tmp = tmp->more)
1434 if (check_move_on (tmp, originator)) 1474 if (check_move_on (tmp, originator))
1435 return 0; 1475 return 0;
1436 } 1476 }
1437 1477
1438 return op; 1478 return op;
1447{ 1487{
1448 object *tmp, *tmp1; 1488 object *tmp, *tmp1;
1449 1489
1450 /* first search for itself and remove any old instances */ 1490 /* first search for itself and remove any old instances */
1451 1491
1452 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1492 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1493 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454 tmp->destroy (); 1494 tmp->destroy ();
1455 1495
1456 tmp1 = arch_to_object (archetype::find (arch_string)); 1496 tmp1 = arch_to_object (archetype::find (arch_string));
1457 1497
1458 tmp1->x = op->x; 1498 tmp1->x = op->x;
1459 tmp1->y = op->y; 1499 tmp1->y = op->y;
1460 insert_ob_in_map (tmp1, op->map, op, 0); 1500 insert_ob_in_map (tmp1, op->map, op, 0);
1501}
1502
1503object *
1504object::insert_at (object *where, object *originator, int flags)
1505{
1506 return where->map->insert (this, where->x, where->y, originator, flags);
1461} 1507}
1462 1508
1463/* 1509/*
1464 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1510 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1465 * is returned contains nr objects, and the remaining parts contains 1511 * is returned contains nr objects, and the remaining parts contains
1466 * the rest (or is removed and freed if that number is 0). 1512 * the rest (or is removed and freed if that number is 0).
1467 * On failure, NULL is returned, and the reason put into the 1513 * On failure, NULL is returned, and the reason put into the
1468 * global static errmsg array. 1514 * global static errmsg array.
1469 */ 1515 */
1470
1471object * 1516object *
1472get_split_ob (object *orig_ob, uint32 nr) 1517get_split_ob (object *orig_ob, uint32 nr)
1473{ 1518{
1474 object *newob; 1519 object *newob;
1475 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1520 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1506 * the amount of an object. If the amount reaches 0, the object 1551 * the amount of an object. If the amount reaches 0, the object
1507 * is subsequently removed and freed. 1552 * is subsequently removed and freed.
1508 * 1553 *
1509 * Return value: 'op' if something is left, NULL if the amount reached 0 1554 * Return value: 'op' if something is left, NULL if the amount reached 0
1510 */ 1555 */
1511
1512object * 1556object *
1513decrease_ob_nr (object *op, uint32 i) 1557decrease_ob_nr (object *op, uint32 i)
1514{ 1558{
1515 object *tmp; 1559 object *tmp;
1516 1560
1591 1635
1592/* 1636/*
1593 * add_weight(object, weight) adds the specified weight to an object, 1637 * add_weight(object, weight) adds the specified weight to an object,
1594 * and also updates how much the environment(s) is/are carrying. 1638 * and also updates how much the environment(s) is/are carrying.
1595 */ 1639 */
1596
1597void 1640void
1598add_weight (object *op, signed long weight) 1641add_weight (object *op, signed long weight)
1599{ 1642{
1600 while (op != NULL) 1643 while (op != NULL)
1601 { 1644 {
1616 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1659 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1617 free (dump); 1660 free (dump);
1618 return op; 1661 return op;
1619 } 1662 }
1620 1663
1621 if (where->head) 1664 if (where->head_ () != where)
1622 { 1665 {
1623 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1666 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1624 where = where->head; 1667 where = where->head;
1625 } 1668 }
1626 1669
1627 return where->insert (op); 1670 return where->insert (op);
1628} 1671}
1633 * inside the object environment. 1676 * inside the object environment.
1634 * 1677 *
1635 * The function returns now pointer to inserted item, and return value can 1678 * The function returns now pointer to inserted item, and return value can
1636 * be != op, if items are merged. -Tero 1679 * be != op, if items are merged. -Tero
1637 */ 1680 */
1638
1639object * 1681object *
1640object::insert (object *op) 1682object::insert (object *op)
1641{ 1683{
1642 object *tmp, *otmp; 1684 object *tmp, *otmp;
1643 1685
1739 * 1781 *
1740 * MSW 2001-07-08: Check all objects on space, not just those below 1782 * MSW 2001-07-08: Check all objects on space, not just those below
1741 * object being inserted. insert_ob_in_map may not put new objects 1783 * object being inserted. insert_ob_in_map may not put new objects
1742 * on top. 1784 * on top.
1743 */ 1785 */
1744
1745int 1786int
1746check_move_on (object *op, object *originator) 1787check_move_on (object *op, object *originator)
1747{ 1788{
1748 object *tmp; 1789 object *tmp;
1749 maptile *m = op->map; 1790 maptile *m = op->map;
1776 1817
1777 /* The objects have to be checked from top to bottom. 1818 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1819 * Hence, we first go to the top:
1779 */ 1820 */
1780 1821
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1822 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1823 {
1783 /* Trim the search when we find the first other spell effect 1824 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1825 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1826 * we don't need to check all of them.
1786 */ 1827 */
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1845 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1846 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1847 {
1807 1848
1808 float 1849 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1850 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1851
1811 if (op->type == PLAYER) 1852 if (op->type == PLAYER)
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1853 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1813 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1854 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1855 diff /= 4.0;
1844 * The first matching object is returned, or NULL if none. 1885 * The first matching object is returned, or NULL if none.
1845 */ 1886 */
1846object * 1887object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1888present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1889{
1849 if (m == NULL || out_of_map (m, x, y)) 1890 if (!m || out_of_map (m, x, y))
1850 { 1891 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1892 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1893 return NULL;
1853 } 1894 }
1854 1895
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1896 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1897 if (tmp->arch == at)
1857 return tmp; 1898 return tmp;
1858 1899
1859 return NULL; 1900 return NULL;
1860} 1901}
1871 { 1912 {
1872 LOG (llevError, "Present called outside map.\n"); 1913 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1914 return NULL;
1874 } 1915 }
1875 1916
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1917 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1918 if (tmp->type == type)
1878 return tmp; 1919 return tmp;
1879 1920
1880 return NULL; 1921 return NULL;
1881} 1922}
1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1999 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1959 { 2000 {
1960 CLEAR_FLAG (tmp, flag); 2001 CLEAR_FLAG (tmp, flag);
1961 unflag_inv (tmp, flag); 2002 unflag_inv (tmp, flag);
1962 } 2003 }
1963}
1964
1965/*
1966 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1967 * all it's inventory (recursively).
1968 * If checksums are used, a player will get set_cheat called for
1969 * him/her-self and all object carried by a call to this function.
1970 */
1971void
1972set_cheat (object *op)
1973{
1974 SET_FLAG (op, FLAG_WAS_WIZ);
1975 flag_inv (op, FLAG_WAS_WIZ);
1976} 2004}
1977 2005
1978/* 2006/*
1979 * find_free_spot(object, map, x, y, start, stop) will search for 2007 * find_free_spot(object, map, x, y, start, stop) will search for
1980 * a spot at the given map and coordinates which will be able to contain 2008 * a spot at the given map and coordinates which will be able to contain
2021 } 2049 }
2022 2050
2023 if (!index) 2051 if (!index)
2024 return -1; 2052 return -1;
2025 2053
2026 return altern[RANDOM () % index]; 2054 return altern [rndm (index)];
2027} 2055}
2028 2056
2029/* 2057/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2058 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2059 * find_free_spot(), but it will search max number of squares.
2052{ 2080{
2053 arr += begin; 2081 arr += begin;
2054 end -= begin; 2082 end -= begin;
2055 2083
2056 while (--end) 2084 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2085 swap (arr [end], arr [rndm (end + 1)]);
2058} 2086}
2059 2087
2060/* new function to make monster searching more efficient, and effective! 2088/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2089 * This basically returns a randomized array (in the passed pointer) of
2062 * the spaces to find monsters. In this way, it won't always look for 2090 * the spaces to find monsters. In this way, it won't always look for
2098 object *tmp; 2126 object *tmp;
2099 maptile *mp; 2127 maptile *mp;
2100 2128
2101 MoveType blocked, move_type; 2129 MoveType blocked, move_type;
2102 2130
2103 if (exclude && exclude->head) 2131 if (exclude && exclude->head_ () != exclude)
2104 { 2132 {
2105 exclude = exclude->head; 2133 exclude = exclude->head;
2106 move_type = exclude->move_type; 2134 move_type = exclude->move_type;
2107 } 2135 }
2108 else 2136 else
2131 max = maxfree[i]; 2159 max = maxfree[i];
2132 else if (mflags & P_IS_ALIVE) 2160 else if (mflags & P_IS_ALIVE)
2133 { 2161 {
2134 for (tmp = ms.bot; tmp; tmp = tmp->above) 2162 for (tmp = ms.bot; tmp; tmp = tmp->above)
2135 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2163 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2136 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2164 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2137 break; 2165 break;
2138 2166
2139 if (tmp) 2167 if (tmp)
2140 return freedir[i]; 2168 return freedir[i];
2141 } 2169 }
2196 2224
2197 return 3; 2225 return 3;
2198} 2226}
2199 2227
2200/* 2228/*
2201 * absdir(int): Returns a number between 1 and 8, which represent
2202 * the "absolute" direction of a number (it actually takes care of
2203 * "overflow" in previous calculations of a direction).
2204 */
2205
2206int
2207absdir (int d)
2208{
2209 while (d < 1)
2210 d += 8;
2211
2212 while (d > 8)
2213 d -= 8;
2214
2215 return d;
2216}
2217
2218/*
2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2229 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2230 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2231 */
2222
2223int 2232int
2224dirdiff (int dir1, int dir2) 2233dirdiff (int dir1, int dir2)
2225{ 2234{
2226 int d; 2235 int d;
2227 2236
2355 * create clone from object to another 2364 * create clone from object to another
2356 */ 2365 */
2357object * 2366object *
2358object_create_clone (object *asrc) 2367object_create_clone (object *asrc)
2359{ 2368{
2360 object *dst = 0, *tmp, *src, *part, *prev, *item; 2369 object *dst = 0, *tmp, *src, *prev, *item;
2361 2370
2362 if (!asrc) 2371 if (!asrc)
2363 return 0; 2372 return 0;
2364 2373
2365 src = asrc;
2366 if (src->head)
2367 src = src->head; 2374 src = asrc->head_ ();
2368 2375
2369 prev = 0; 2376 prev = 0;
2370 for (part = src; part; part = part->more) 2377 for (object *part = src; part; part = part->more)
2371 { 2378 {
2372 tmp = part->clone (); 2379 tmp = part->clone ();
2373 tmp->x -= src->x; 2380 tmp->x -= src->x;
2374 tmp->y -= src->y; 2381 tmp->y -= src->y;
2375 2382
2393 insert_ob_in_ob (object_create_clone (item), dst); 2400 insert_ob_in_ob (object_create_clone (item), dst);
2394 2401
2395 return dst; 2402 return dst;
2396} 2403}
2397 2404
2398/* GROS - Creates an object using a string representing its content. */
2399/* Basically, we save the content of the string to a temp file, then call */
2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2401/* but it was simple to make and allows reusing the load_object function. */
2402/* Remember not to use load_object_str in a time-critical situation. */
2403/* Also remember that multiparts objects are not supported for now. */
2404object *
2405load_object_str (const char *obstr)
2406{
2407 object *op;
2408 char filename[MAX_BUF];
2409
2410 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412 FILE *tempfile = fopen (filename, "w");
2413
2414 if (tempfile == NULL)
2415 {
2416 LOG (llevError, "Error - Unable to access load object temp file\n");
2417 return NULL;
2418 }
2419
2420 fprintf (tempfile, obstr);
2421 fclose (tempfile);
2422
2423 op = object::create ();
2424
2425 object_thawer thawer (filename);
2426
2427 if (thawer)
2428 load_object (thawer, op, 0);
2429
2430 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431 CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433 return op;
2434}
2435
2436/* This returns the first object in who's inventory that 2405/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2406 * has the same type and subtype match.
2438 * returns NULL if no match. 2407 * returns NULL if no match.
2439 */ 2408 */
2440object * 2409object *
2493 if (link->key == canonical_key) 2462 if (link->key == canonical_key)
2494 return link->value; 2463 return link->value;
2495 2464
2496 return 0; 2465 return 0;
2497} 2466}
2498
2499 2467
2500/* 2468/*
2501 * Updates the canonical_key in op to value. 2469 * Updates the canonical_key in op to value.
2502 * 2470 *
2503 * canonical_key is a shared string (value doesn't have to be). 2471 * canonical_key is a shared string (value doesn't have to be).
2606 } 2574 }
2607 else 2575 else
2608 item = item->env; 2576 item = item->env;
2609} 2577}
2610 2578
2579
2580const char *
2581object::flag_desc (char *desc, int len) const
2582{
2583 char *p = desc;
2584 bool first = true;
2585
2586 *p = 0;
2587
2588 for (int i = 0; i < NUM_FLAGS; i++)
2589 {
2590 if (len <= 10) // magic constant!
2591 {
2592 snprintf (p, len, ",...");
2593 break;
2594 }
2595
2596 if (flag [i])
2597 {
2598 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2599 len -= cnt;
2600 p += cnt;
2601 first = false;
2602 }
2603 }
2604
2605 return desc;
2606}
2607
2611// return a suitable string describing an objetc in enough detail to find it 2608// return a suitable string describing an object in enough detail to find it
2612const char * 2609const char *
2613object::debug_desc (char *info) const 2610object::debug_desc (char *info) const
2614{ 2611{
2612 char flagdesc[512];
2615 char info2[256 * 3]; 2613 char info2[256 * 4];
2616 char *p = info; 2614 char *p = info;
2617 2615
2618 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2616 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619 count, 2617 count, uuid.seq,
2620 &name, 2618 &name,
2621 title ? " " : "", 2619 title ? "\",title:\"" : "",
2622 title ? (const char *)title : ""); 2620 title ? (const char *)title : "",
2621 flag_desc (flagdesc, 512), type);
2623 2622
2624 if (env) 2623 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2624 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626 2625
2627 if (map) 2626 if (map)
2628 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2627 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2629 2628
2630 return info; 2629 return info;
2631} 2630}
2632 2631
2633const char * 2632const char *
2634object::debug_desc () const 2633object::debug_desc () const
2635{ 2634{
2636 static char info[256 * 3]; 2635 static char info[3][256 * 4];
2636 static int info_idx;
2637
2637 return debug_desc (info); 2638 return debug_desc (info [++info_idx % 3]);
2638} 2639}
2639 2640
2641struct region *
2642object::region () const
2643{
2644 return map ? map->region (x, y)
2645 : region::default_region ();
2646}
2647
2648const materialtype_t *
2649object::dominant_material () const
2650{
2651 if (materialtype_t *mat = name_to_material (materialname))
2652 return mat;
2653
2654 // omfg this is slow, this has to be temporary :)
2655 shstr unknown ("unknown");
2656
2657 return name_to_material (unknown);
2658}
2659
2660void
2661object::open_container (object *new_container)
2662{
2663 if (container == new_container)
2664 return;
2665
2666 if (object *old_container = container)
2667 {
2668 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2669 return;
2670
2671#if 0
2672 // remove the "Close old_container" object.
2673 if (object *closer = old_container->inv)
2674 if (closer->type == CLOSE_CON)
2675 closer->destroy ();
2676#endif
2677
2678 old_container->flag [FLAG_APPLIED] = 0;
2679 container = 0;
2680
2681 esrv_update_item (UPD_FLAGS, this, old_container);
2682 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2683 }
2684
2685 if (new_container)
2686 {
2687 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2688 return;
2689
2690 // TODO: this does not seem to serve any purpose anymore?
2691#if 0
2692 // insert the "Close Container" object.
2693 if (archetype *closer = new_container->other_arch)
2694 {
2695 object *closer = arch_to_object (new_container->other_arch);
2696 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2697 new_container->insert (closer);
2698 }
2699#endif
2700
2701 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2702
2703 new_container->flag [FLAG_APPLIED] = 1;
2704 container = new_container;
2705
2706 esrv_update_item (UPD_FLAGS, this, new_container);
2707 esrv_send_inventory (this, new_container);
2708 }
2709}
2710
2711

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines