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.136 by root, Thu Mar 15 14:23:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 at <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>
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
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, 45short 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 46 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}; 47};
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, 48short 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() 192 * Check nrof variable *before* calling can_merge()
191 * 193 *
192 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
193 * check weight 195 * check weight
194 */ 196 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
197{ 198{
198 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
199 if (ob1 == ob2 200 if (ob1 == ob2
200 || ob1->type != ob2->type 201 || ob1->type != ob2->type
277 278
278 /* Note sure why the following is the case - either the object has to 279 /* 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 280 * be animated or have a very low speed. Is this an attempted monster
280 * check? 281 * check?
281 */ 282 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 284 return 0;
284 285
285 switch (ob1->type) 286 switch (ob1->type)
286 { 287 {
287 case SCROLL: 288 case SCROLL:
356/* 357/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 359 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 360 * The result of the dump is stored in the static global errmsg array.
360 */ 361 */
361
362char * 362char *
363dump_object (object *op) 363dump_object (object *op)
364{ 364{
365 if (!op) 365 if (!op)
366 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
367 367
368 object_freezer freezer; 368 object_freezer freezer;
369 save_object (freezer, op, 1); 369 op->write (freezer);
370 return freezer.as_string (); 370 return freezer.as_string ();
371} 371}
372 372
373/* 373/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
391} 391}
392 392
393/* 393/*
394 * Returns the object which has the count-variable equal to the argument. 394 * Returns the object which has the count-variable equal to the argument.
395 */ 395 */
396
397object * 396object *
398find_object (tag_t i) 397find_object (tag_t i)
399{ 398{
400 for (object *op = object::first; op; op = op->next) 399 for_all_objects (op)
401 if (op->count == i) 400 if (op->count == i)
402 return op; 401 return op;
403 402
404 return 0; 403 return 0;
405} 404}
406 405
407/* 406/*
408 * Returns the first object which has a name equal to the argument. 407 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 408 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 409 * Enables features like "patch <name-of-other-player> food 999"
411 */ 410 */
412
413object * 411object *
414find_object_name (const char *str) 412find_object_name (const char *str)
415{ 413{
416 shstr_cmp str_ (str); 414 shstr_cmp str_ (str);
417 object *op; 415 object *op;
418 416
419 for (op = object::first; op != NULL; op = op->next) 417 for_all_objects (op)
420 if (op->name == str_) 418 if (op->name == str_)
421 break; 419 break;
422 420
423 return op; 421 return op;
424} 422}
490 488
491 if (is_removed) 489 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED); 490 SET_FLAG (dst, FLAG_REMOVED);
493 491
494 if (speed < 0) 492 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 493 dst->speed_left = speed_left - rndm ();
496 494
497 /* Copy over key_values, if any. */ 495 /* Copy over key_values, if any. */
498 if (key_values) 496 if (key_values)
499 { 497 {
500 key_value *tail = 0; 498 key_value *tail = 0;
522 tail = new_link; 520 tail = new_link;
523 } 521 }
524 } 522 }
525 } 523 }
526 524
527 update_ob_speed (dst); 525 dst->set_speed (dst->speed);
526}
527
528void
529object::instantiate ()
530{
531 if (!uuid.seq) // HACK
532 uuid = gen_uuid ();
533
534 speed_left = -0.1f;
535 /* copy the body_info to the body_used - this is only really
536 * need for monsters, but doesn't hurt to do it for everything.
537 * by doing so, when a monster is created, it has good starting
538 * values for the body_used info, so when items are created
539 * for it, they can be properly equipped.
540 */
541 memcpy (body_used, body_info, sizeof (body_used));
542
543 attachable::instantiate ();
528} 544}
529 545
530object * 546object *
531object::clone () 547object::clone ()
532{ 548{
538/* 554/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 555 * 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 556 * 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. 557 * be called to update the face variable, _and_ how it looks on the map.
542 */ 558 */
543
544void 559void
545update_turn_face (object *op) 560update_turn_face (object *op)
546{ 561{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 562 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 563 return;
564
549 SET_ANIMATION (op, op->direction); 565 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 566 update_object (op, UP_OBJ_FACE);
551} 567}
552 568
553/* 569/*
554 * Updates the speed of an object. If the speed changes from 0 to another 570 * 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. 571 * 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. 572 * This function needs to be called whenever the speed of an object changes.
557 */ 573 */
558void 574void
559update_ob_speed (object *op) 575object::set_speed (float speed)
560{ 576{
561 extern int arch_init; 577 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 { 578 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 579 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 op->speed = 0; 580 speed = 0;
570 }
571
572 if (arch_init)
573 return;
574
575 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
576 { 581 }
577 /* If already on active list, don't do anything */
578 if (op->active_next || op->active_prev || op == active_objects)
579 return;
580 582
581 /* process_events() expects us to insert the object at the beginning 583 this->speed = speed;
582 * of the list. */
583 op->active_next = active_objects;
584 584
585 if (op->active_next != NULL) 585 if (has_active_speed ())
586 op->active_next->active_prev = op; 586 activate ();
587
588 active_objects = op;
589 }
590 else 587 else
591 { 588 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} 589}
646 590
647/* 591/*
648 * update_object() updates the the map. 592 * update_object() updates the the map.
649 * It takes into account invisible objects (and represent squares covered 593 * It takes into account invisible objects (and represent squares covered
662 * UP_OBJ_FACE: only the objects face has changed. 606 * UP_OBJ_FACE: only the objects face has changed.
663 */ 607 */
664void 608void
665update_object (object *op, int action) 609update_object (object *op, int action)
666{ 610{
667 MoveType move_on, move_off, move_block, move_slow;
668
669 if (op == NULL) 611 if (op == NULL)
670 { 612 {
671 /* this should never happen */ 613 /* this should never happen */
672 LOG (llevDebug, "update_object() called for NULL object.\n"); 614 LOG (llevDebug, "update_object() called for NULL object.\n");
673 return; 615 return;
697 return; 639 return;
698 } 640 }
699 641
700 mapspace &m = op->ms (); 642 mapspace &m = op->ms ();
701 643
702 if (m.flags_ & P_NEED_UPDATE) 644 if (!(m.flags_ & P_UPTODATE))
703 /* nop */; 645 /* nop */;
704 else if (action == UP_OBJ_INSERT) 646 else if (action == UP_OBJ_INSERT)
705 { 647 {
706 // this is likely overkill, TODO: revisit (schmorp) 648 // this is likely overkill, TODO: revisit (schmorp)
707 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 649 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 658 /* This isn't perfect, but I don't expect a lot of objects to
717 * to have move_allow right now. 659 * to have move_allow right now.
718 */ 660 */
719 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 661 || ((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) 662 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
721 m.flags_ = P_NEED_UPDATE; 663 m.flags_ = 0;
722 } 664 }
723 /* if the object is being removed, we can't make intelligent 665 /* if the object is being removed, we can't make intelligent
724 * decisions, because remove_ob can't really pass the object 666 * decisions, because remove_ob can't really pass the object
725 * that is being removed. 667 * that is being removed.
726 */ 668 */
727 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 669 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
728 m.flags_ = P_NEED_UPDATE; 670 m.flags_ = 0;
729 else if (action == UP_OBJ_FACE) 671 else if (action == UP_OBJ_FACE)
730 /* Nothing to do for that case */ ; 672 /* Nothing to do for that case */ ;
731 else 673 else
732 LOG (llevError, "update_object called with invalid action: %d\n", action); 674 LOG (llevError, "update_object called with invalid action: %d\n", action);
733 675
734 if (op->more) 676 if (op->more)
735 update_object (op->more, action); 677 update_object (op->more, action);
736} 678}
737 679
738object::vector object::objects; // not yet used
739object *object::first;
740
741object::object () 680object::object ()
742{ 681{
743 SET_FLAG (this, FLAG_REMOVED); 682 SET_FLAG (this, FLAG_REMOVED);
744 683
745 expmul = 1.0; 684 expmul = 1.0;
746 face = blank_face; 685 face = blank_face;
747} 686}
748 687
749object::~object () 688object::~object ()
750{ 689{
690 unlink ();
691
751 free_key_values (this); 692 free_key_values (this);
752} 693}
753 694
695static int object_count;
696
754void object::link () 697void object::link ()
755{ 698{
756 count = ++ob_count; 699 assert (!index);//D
757 uuid = gen_uuid (); 700 uuid = gen_uuid ();
701 count = ++object_count;
758 702
759 prev = 0; 703 refcnt_inc ();
760 next = object::first; 704 objects.insert (this);
761
762 if (object::first)
763 object::first->prev = this;
764
765 object::first = this;
766} 705}
767 706
768void object::unlink () 707void object::unlink ()
769{ 708{
770 if (this == object::first) 709 if (!index)
771 object::first = next; 710 return;
772 711
773 /* Remove this object from the list of used objects */ 712 objects.erase (this);
774 if (prev) prev->next = next; 713 refcnt_dec ();
775 if (next) next->prev = prev; 714}
776 715
777 prev = 0; 716void
778 next = 0; 717object::activate ()
718{
719 /* If already on active list, don't do anything */
720 if (active)
721 return;
722
723 if (has_active_speed ())
724 actives.insert (this);
725}
726
727void
728object::activate_recursive ()
729{
730 activate ();
731
732 for (object *op = inv; op; op = op->below)
733 op->activate_recursive ();
734}
735
736/* This function removes object 'op' from the list of active
737 * objects.
738 * This should only be used for style maps or other such
739 * reference maps where you don't want an object that isn't
740 * in play chewing up cpu time getting processed.
741 * The reverse of this is to call update_ob_speed, which
742 * will do the right thing based on the speed of the object.
743 */
744void
745object::deactivate ()
746{
747 /* If not on the active list, nothing needs to be done */
748 if (!active)
749 return;
750
751 actives.erase (this);
752}
753
754void
755object::deactivate_recursive ()
756{
757 for (object *op = inv; op; op = op->below)
758 op->deactivate_recursive ();
759
760 deactivate ();
761}
762
763void
764object::set_flag_inv (int flag, int value)
765{
766 for (object *op = inv; op; op = op->below)
767 {
768 op->flag [flag] = value;
769 op->set_flag_inv (flag, value);
770 }
771}
772
773/*
774 * Remove and free all objects in the inventory of the given object.
775 * object.c ?
776 */
777void
778object::destroy_inv (bool drop_to_ground)
779{
780 // need to check first, because the checks below might segfault
781 // as we might be on an invalid mapspace and crossfire code
782 // is too buggy to ensure that the inventory is empty.
783 // corollary: if you create arrows etc. with stuff in tis inventory,
784 // cf will crash below with off-map x and y
785 if (!inv)
786 return;
787
788 /* Only if the space blocks everything do we not process -
789 * if some form of movement is allowed, let objects
790 * drop on that space.
791 */
792 if (!drop_to_ground
793 || !map
794 || map->in_memory != MAP_IN_MEMORY
795 || map->nodrop
796 || ms ().move_block == MOVE_ALL)
797 {
798 while (inv)
799 {
800 inv->destroy_inv (drop_to_ground);
801 inv->destroy ();
802 }
803 }
804 else
805 { /* Put objects in inventory onto this space */
806 while (inv)
807 {
808 object *op = inv;
809
810 if (op->flag [FLAG_STARTEQUIP]
811 || op->flag [FLAG_NO_DROP]
812 || op->type == RUNE
813 || op->type == TRAP
814 || op->flag [FLAG_IS_A_TEMPLATE]
815 || op->flag [FLAG_DESTROY_ON_DEATH])
816 op->destroy ();
817 else
818 map->insert (op, x, y);
819 }
820 }
779} 821}
780 822
781object *object::create () 823object *object::create ()
782{ 824{
783 object *op = new object; 825 object *op = new object;
784 op->link (); 826 op->link ();
785 return op; 827 return op;
786} 828}
787 829
788/*
789 * free_object() frees everything allocated by an object, removes
790 * it from the list of used objects, and puts it on the list of
791 * free objects. The IS_FREED() flag is set in the object.
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 830void
799object::do_destroy () 831object::do_destroy ()
800{ 832{
801 attachable::do_destroy (); 833 attachable::do_destroy ();
802 834
803 if (flag [FLAG_IS_LINKED]) 835 if (flag [FLAG_IS_LINKED])
804 remove_button_link (this); 836 remove_button_link (this);
805 837
806 if (flag [FLAG_FRIENDLY]) 838 if (flag [FLAG_FRIENDLY])
839 {
807 remove_friendly_object (this); 840 remove_friendly_object (this);
841
842 if (type == GOLEM
843 && owner
844 && owner->type == PLAYER
845 && owner->contr->ranges[range_golem] == this)
846 owner->contr->ranges[range_golem] = 0;
847 }
808 848
809 if (!flag [FLAG_REMOVED]) 849 if (!flag [FLAG_REMOVED])
810 remove (); 850 remove ();
811 851
812 if (flag [FLAG_FREED]) 852 destroy_inv (true);
813 return; 853
854 deactivate ();
855 unlink ();
814 856
815 flag [FLAG_FREED] = 1; 857 flag [FLAG_FREED] = 1;
816 858
817 // hack to ensure that freed objects still have a valid map 859 // hack to ensure that freed objects still have a valid map
818 { 860 {
824 866
825 freed_map->name = "/internal/freed_objects_map"; 867 freed_map->name = "/internal/freed_objects_map";
826 freed_map->width = 3; 868 freed_map->width = 3;
827 freed_map->height = 3; 869 freed_map->height = 3;
828 870
829 freed_map->allocate (); 871 freed_map->alloc ();
872 freed_map->in_memory = MAP_IN_MEMORY;
830 } 873 }
831 874
832 map = freed_map; 875 map = freed_map;
833 x = 1; 876 x = 1;
834 y = 1; 877 y = 1;
835 } 878 }
836 879
837 more = 0;
838 head = 0; 880 head = 0;
839 inv = 0; 881
882 if (more)
883 {
884 more->destroy ();
885 more = 0;
886 }
840 887
841 // clear those pointers that likely might have circular references to us 888 // clear those pointers that likely might have circular references to us
842 owner = 0; 889 owner = 0;
843 enemy = 0; 890 enemy = 0;
844 attacked_by = 0; 891 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}
855
856/*
857 * Remove and free all objects in the inventory of the given object.
858 * object.c ?
859 */
860void
861object::destroy_inv (bool drop_to_ground)
862{
863 if (!inv)
864 return;
865
866 /* Only if the space blocks everything do we not process -
867 * if some form of movement is allowed, let objects
868 * drop on that space.
869 */
870 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
871 {
872 while (inv)
873 {
874 inv->destroy_inv (drop_to_ground);
875 inv->destroy ();
876 }
877 }
878 else
879 { /* Put objects in inventory onto this space */
880 while (inv)
881 {
882 object *op = inv;
883
884 if (op->flag [FLAG_STARTEQUIP]
885 || op->flag [FLAG_NO_DROP]
886 || op->type == RUNE
887 || op->type == TRAP
888 || op->flag [FLAG_IS_A_TEMPLATE])
889 op->destroy ();
890 else
891 {
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 }
898 }
899} 892}
900 893
901void 894void
902object::destroy (bool destroy_inventory) 895object::destroy (bool destroy_inventory)
903{ 896{
904 if (destroyed ()) 897 if (destroyed ())
905 return; 898 return;
906 899
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) 900 if (destroy_inventory)
915 destroy_inv (true); 901 destroy_inv (false);
916 902
917 attachable::destroy (); 903 attachable::destroy ();
918} 904}
919 905
920/* 906/*
938 * This function removes the object op from the linked list of objects 924 * 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 925 * which it is currently tied to. When this function is done, the
940 * object will have no environment. If the object previously had an 926 * object will have no environment. If the object previously had an
941 * environment, the x and y coordinates will be updated to 927 * environment, the x and y coordinates will be updated to
942 * the previous environment. 928 * the previous environment.
943 * Beware: This function is called from the editor as well!
944 */ 929 */
945void 930void
946object::remove () 931object::do_remove ()
947{ 932{
948 object *tmp, *last = 0; 933 object *tmp, *last = 0;
949 object *otmp; 934 object *otmp;
950 935
951 if (QUERY_FLAG (this, FLAG_REMOVED)) 936 if (QUERY_FLAG (this, FLAG_REMOVED))
973 * to save cpu time. 958 * to save cpu time.
974 */ 959 */
975 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 960 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
976 otmp->update_stats (); 961 otmp->update_stats ();
977 962
978 if (above != NULL) 963 if (above)
979 above->below = below; 964 above->below = below;
980 else 965 else
981 env->inv = below; 966 env->inv = below;
982 967
983 if (below != NULL) 968 if (below)
984 below->above = above; 969 below->above = above;
985 970
986 /* we set up values so that it could be inserted into 971 /* we set up values so that it could be inserted into
987 * the map, but we don't actually do that - it is up 972 * the map, but we don't actually do that - it is up
988 * to the caller to decide what we want to do. 973 * to the caller to decide what we want to do.
992 above = 0, below = 0; 977 above = 0, below = 0;
993 env = 0; 978 env = 0;
994 } 979 }
995 else if (map) 980 else if (map)
996 { 981 {
997 /* Re did the following section of code - it looks like it had 982 if (type == PLAYER)
998 * lots of logic for things we no longer care about
999 */ 983 {
984 // leaving a spot always closes any open container on the ground
985 if (container && !container->env)
986 // this causes spurious floorbox updates, but it ensures
987 // that the CLOSE event is being sent.
988 close_container ();
989
990 --map->players;
991 map->touch ();
992 }
993
994 map->dirty = true;
995 mapspace &ms = this->ms ();
1000 996
1001 /* link the object above us */ 997 /* link the object above us */
1002 if (above) 998 if (above)
1003 above->below = below; 999 above->below = below;
1004 else 1000 else
1005 map->at (x, y).top = below; /* we were top, set new top */ 1001 ms.top = below; /* we were top, set new top */
1006 1002
1007 /* Relink the object below us, if there is one */ 1003 /* Relink the object below us, if there is one */
1008 if (below) 1004 if (below)
1009 below->above = above; 1005 below->above = above;
1010 else 1006 else
1012 /* Nothing below, which means we need to relink map object for this space 1008 /* 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 1009 * use translated coordinates in case some oddness with map tiling is
1014 * evident 1010 * evident
1015 */ 1011 */
1016 if (GET_MAP_OB (map, x, y) != this) 1012 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); 1013 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 1014
1027 map->at (x, y).bot = above; /* goes on above it. */ 1015 ms.bot = above; /* goes on above it. */
1028 } 1016 }
1029 1017
1030 above = 0; 1018 above = 0;
1031 below = 0; 1019 below = 0;
1032 1020
1033 if (map->in_memory == MAP_SAVING) 1021 if (map->in_memory == MAP_SAVING)
1034 return; 1022 return;
1035 1023
1036 int check_walk_off = !flag [FLAG_NO_APPLY]; 1024 int check_walk_off = !flag [FLAG_NO_APPLY];
1037 1025
1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1026 for (tmp = ms.bot; tmp; tmp = tmp->above)
1039 { 1027 {
1040 /* No point updating the players look faces if he is the object 1028 /* No point updating the players look faces if he is the object
1041 * being removed. 1029 * being removed.
1042 */ 1030 */
1043 1031
1055 1043
1056 if (tmp->contr->ns) 1044 if (tmp->contr->ns)
1057 tmp->contr->ns->floorbox_update (); 1045 tmp->contr->ns->floorbox_update ();
1058 } 1046 }
1059 1047
1060 /* See if player moving off should effect something */ 1048 /* See if object moving off should effect something */
1061 if (check_walk_off 1049 if (check_walk_off
1062 && ((move_type & tmp->move_off) 1050 && ((move_type & tmp->move_off)
1063 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1051 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064 { 1052 {
1065 move_apply (tmp, this, 0); 1053 move_apply (tmp, this, 0);
1067 if (destroyed ()) 1055 if (destroyed ())
1068 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1056 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1069 } 1057 }
1070 1058
1071 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1059 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072 1060 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1073 if (tmp->above == tmp) 1061 if (tmp->above == tmp)
1074 tmp->above = 0; 1062 tmp->above = 0;
1075 1063
1076 last = tmp; 1064 last = tmp;
1077 } 1065 }
1078 1066
1079 /* last == NULL of there are no objects on this space */ 1067 /* last == NULL if there are no objects on this space */
1068 //TODO: this makes little sense, why only update the topmost object?
1080 if (!last) 1069 if (!last)
1081 map->at (x, y).flags_ = P_NEED_UPDATE; 1070 map->at (x, y).flags_ = 0;
1082 else 1071 else
1083 update_object (last, UP_OBJ_REMOVE); 1072 update_object (last, UP_OBJ_REMOVE);
1084 1073
1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1074 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1086 update_all_los (map, x, y); 1075 update_all_los (map, x, y);
1123 1112
1124 return 0; 1113 return 0;
1125} 1114}
1126 1115
1127/* 1116/*
1128 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1117 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1129 * job preparing multi-part monsters 1118 * job preparing multi-part monsters.
1130 */ 1119 */
1131object * 1120object *
1132insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1121insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1133{ 1122{
1134 object *tmp;
1135
1136 if (op->head)
1137 op = op->head;
1138
1139 for (tmp = op; tmp; tmp = tmp->more) 1123 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140 { 1124 {
1141 tmp->x = x + tmp->arch->clone.x; 1125 tmp->x = x + tmp->arch->clone.x;
1142 tmp->y = y + tmp->arch->clone.y; 1126 tmp->y = y + tmp->arch->clone.y;
1143 } 1127 }
1144 1128
1167 */ 1151 */
1168object * 1152object *
1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1153insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1170{ 1154{
1171 object *tmp, *top, *floor = NULL; 1155 object *tmp, *top, *floor = NULL;
1172 sint16 x, y;
1173 1156
1174 if (QUERY_FLAG (op, FLAG_FREED)) 1157 if (QUERY_FLAG (op, FLAG_FREED))
1175 { 1158 {
1176 LOG (llevError, "Trying to insert freed object!\n"); 1159 LOG (llevError, "Trying to insert freed object!\n");
1177 return NULL; 1160 return NULL;
1178 } 1161 }
1179 1162
1180 if (m == NULL) 1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165
1166 op->remove ();
1167
1168 if (!m)
1181 { 1169 {
1182 char *dump = dump_object (op); 1170 char *dump = dump_object (op);
1183 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1171 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1184 free (dump); 1172 free (dump);
1185 return op; 1173 return op;
1198#endif 1186#endif
1199 free (dump); 1187 free (dump);
1200 return op; 1188 return op;
1201 } 1189 }
1202 1190
1203 if (!QUERY_FLAG (op, FLAG_REMOVED))
1204 {
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;
1209 }
1210
1211 if (op->more)
1212 {
1213 /* The part may be on a different map. */
1214
1215 object *more = op->more; 1191 if (object *more = op->more)
1216 1192 {
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) 1193 if (!insert_ob_in_map (more, m, originator, flag))
1233 { 1194 {
1234 if (!op->head) 1195 if (!op->head)
1235 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1196 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1236 1197
1237 return 0; 1198 return 0;
1242 1203
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1204 /* 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 1205 * of areas of callers (eg, anything that uses find_free_spot would now
1245 * need extra work 1206 * need extra work
1246 */ 1207 */
1247 op->map = get_map_from_coord (m, &op->x, &op->y); 1208 if (!xy_normalise (m, op->x, op->y))
1248 x = op->x; 1209 return 0;
1249 y = op->y; 1210
1211 op->map = m;
1212 mapspace &ms = op->ms ();
1250 1213
1251 /* this has to be done after we translate the coordinates. 1214 /* this has to be done after we translate the coordinates.
1252 */ 1215 */
1253 if (op->nrof && !(flag & INS_NO_MERGE)) 1216 if (op->nrof && !(flag & INS_NO_MERGE))
1254 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1217 for (tmp = ms.bot; tmp; tmp = tmp->above)
1255 if (object::can_merge (op, tmp)) 1218 if (object::can_merge (op, tmp))
1256 { 1219 {
1257 op->nrof += tmp->nrof; 1220 op->nrof += tmp->nrof;
1258 tmp->destroy (); 1221 tmp->destroy ();
1259 } 1222 }
1276 op->below = originator->below; 1239 op->below = originator->below;
1277 1240
1278 if (op->below) 1241 if (op->below)
1279 op->below->above = op; 1242 op->below->above = op;
1280 else 1243 else
1281 op->ms ().bot = op; 1244 ms.bot = op;
1282 1245
1283 /* since *below* originator, no need to update top */ 1246 /* since *below* originator, no need to update top */
1284 originator->below = op; 1247 originator->below = op;
1285 } 1248 }
1286 else 1249 else
1287 { 1250 {
1251 top = ms.bot;
1252
1288 /* If there are other objects, then */ 1253 /* If there are other objects, then */
1289 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1254 if ((!(flag & INS_MAP_LOAD)) && top)
1290 { 1255 {
1291 object *last = NULL; 1256 object *last = 0;
1292 1257
1293 /* 1258 /*
1294 * If there are multiple objects on this space, we do some trickier handling. 1259 * If there are multiple objects on this space, we do some trickier handling.
1295 * We've already dealt with merging if appropriate. 1260 * We've already dealt with merging if appropriate.
1296 * Generally, we want to put the new object on top. But if 1261 * 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 1265 * 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 1266 * 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 1267 * when lots of spells are cast in one area. Currently, it is presumed
1303 * that flying non pickable objects are spell objects. 1268 * that flying non pickable objects are spell objects.
1304 */ 1269 */
1305 1270 for (top = ms.bot; top; top = top->above)
1306 while (top != NULL)
1307 { 1271 {
1308 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1272 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1309 floor = top; 1273 floor = top;
1310 1274
1311 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1275 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; 1278 top = top->below;
1315 break; 1279 break;
1316 } 1280 }
1317 1281
1318 last = top; 1282 last = top;
1319 top = top->above;
1320 } 1283 }
1321 1284
1322 /* Don't want top to be NULL, so set it to the last valid object */ 1285 /* Don't want top to be NULL, so set it to the last valid object */
1323 top = last; 1286 top = last;
1324 1287
1326 * looks like instead of lots of conditions here. 1289 * looks like instead of lots of conditions here.
1327 * makes things faster, and effectively the same result. 1290 * makes things faster, and effectively the same result.
1328 */ 1291 */
1329 1292
1330 /* Have object 'fall below' other objects that block view. 1293 /* Have object 'fall below' other objects that block view.
1331 * Unless those objects are exits, type 66 1294 * Unless those objects are exits.
1332 * If INS_ON_TOP is used, don't do this processing 1295 * If INS_ON_TOP is used, don't do this processing
1333 * Need to find the object that in fact blocks view, otherwise 1296 * Need to find the object that in fact blocks view, otherwise
1334 * stacking is a bit odd. 1297 * stacking is a bit odd.
1335 */ 1298 */
1336 if (!(flag & INS_ON_TOP) && 1299 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)) 1300 && ms.flags () & P_BLOCKSVIEW
1301 && (op->face && !faces [op->face].visibility))
1338 { 1302 {
1339 for (last = top; last != floor; last = last->below) 1303 for (last = top; last != floor; last = last->below)
1340 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1304 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1341 break; 1305 break;
1306
1342 /* Check to see if we found the object that blocks view, 1307 /* Check to see if we found the object that blocks view,
1343 * and make sure we have a below pointer for it so that 1308 * and make sure we have a below pointer for it so that
1344 * we can get inserted below this one, which requires we 1309 * we can get inserted below this one, which requires we
1345 * set top to the object below us. 1310 * set top to the object below us.
1346 */ 1311 */
1348 top = last->below; 1313 top = last->below;
1349 } 1314 }
1350 } /* If objects on this space */ 1315 } /* If objects on this space */
1351 1316
1352 if (flag & INS_MAP_LOAD) 1317 if (flag & INS_MAP_LOAD)
1353 top = GET_MAP_TOP (op->map, op->x, op->y); 1318 top = ms.top;
1354 1319
1355 if (flag & INS_ABOVE_FLOOR_ONLY) 1320 if (flag & INS_ABOVE_FLOOR_ONLY)
1356 top = floor; 1321 top = floor;
1357 1322
1358 /* Top is the object that our object (op) is going to get inserted above. 1323 /* Top is the object that our object (op) is going to get inserted above.
1359 */ 1324 */
1360 1325
1361 /* First object on this space */ 1326 /* First object on this space */
1362 if (!top) 1327 if (!top)
1363 { 1328 {
1364 op->above = GET_MAP_OB (op->map, op->x, op->y); 1329 op->above = ms.bot;
1365 1330
1366 if (op->above) 1331 if (op->above)
1367 op->above->below = op; 1332 op->above->below = op;
1368 1333
1369 op->below = NULL; 1334 op->below = 0;
1370 op->ms ().bot = op; 1335 ms.bot = op;
1371 } 1336 }
1372 else 1337 else
1373 { /* get inserted into the stack above top */ 1338 { /* get inserted into the stack above top */
1374 op->above = top->above; 1339 op->above = top->above;
1375 1340
1378 1343
1379 op->below = top; 1344 op->below = top;
1380 top->above = op; 1345 top->above = op;
1381 } 1346 }
1382 1347
1383 if (op->above == NULL) 1348 if (!op->above)
1384 op->ms ().top = op; 1349 ms.top = op;
1385 } /* else not INS_BELOW_ORIGINATOR */ 1350 } /* else not INS_BELOW_ORIGINATOR */
1386 1351
1387 if (op->type == PLAYER) 1352 if (op->type == PLAYER)
1353 {
1388 op->contr->do_los = 1; 1354 op->contr->do_los = 1;
1355 ++op->map->players;
1356 op->map->touch ();
1357 }
1358
1359 op->map->dirty = true;
1389 1360
1390 /* If we have a floor, we know the player, if any, will be above 1361 /* 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. 1362 * it, so save a few ticks and start from there.
1392 */ 1363 */
1393 if (!(flag & INS_MAP_LOAD)) 1364 if (!(flag & INS_MAP_LOAD))
1394 if (object *pl = op->ms ().player ()) 1365 if (object *pl = ms.player ())
1395 if (pl->contr->ns) 1366 if (pl->contr->ns)
1396 pl->contr->ns->floorbox_update (); 1367 pl->contr->ns->floorbox_update ();
1397 1368
1398 /* If this object glows, it may affect lighting conditions that are 1369 /* If this object glows, it may affect lighting conditions that are
1399 * visible to others on this map. But update_all_los is really 1370 * 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 1371 * 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 1372 * on the map will get recalculated. The players could very well
1402 * be far away from this change and not affected in any way - 1373 * be far away from this change and not affected in any way -
1403 * this should get redone to only look for players within range, 1374 * this should get redone to only look for players within range,
1404 * or just updating the P_NEED_UPDATE for spaces within this area 1375 * or just updating the P_UPTODATE for spaces within this area
1405 * of effect may be sufficient. 1376 * of effect may be sufficient.
1406 */ 1377 */
1407 if (op->map->darkness && (op->glow_radius != 0)) 1378 if (op->map->darkness && (op->glow_radius != 0))
1408 update_all_los (op->map, op->x, op->y); 1379 update_all_los (op->map, op->x, op->y);
1409 1380
1447{ 1418{
1448 object *tmp, *tmp1; 1419 object *tmp, *tmp1;
1449 1420
1450 /* first search for itself and remove any old instances */ 1421 /* first search for itself and remove any old instances */
1451 1422
1452 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1423 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1424 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454 tmp->destroy (); 1425 tmp->destroy ();
1455 1426
1456 tmp1 = arch_to_object (archetype::find (arch_string)); 1427 tmp1 = arch_to_object (archetype::find (arch_string));
1457 1428
1458 tmp1->x = op->x; 1429 tmp1->x = op->x;
1459 tmp1->y = op->y; 1430 tmp1->y = op->y;
1460 insert_ob_in_map (tmp1, op->map, op, 0); 1431 insert_ob_in_map (tmp1, op->map, op, 0);
1432}
1433
1434// XXX: function not returning object*
1435object *
1436object::insert_at (object *where, object *originator, int flags)
1437{
1438 where->map->insert (this, where->x, where->y, originator, flags);
1461} 1439}
1462 1440
1463/* 1441/*
1464 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1442 * 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 1443 * is returned contains nr objects, and the remaining parts contains
1466 * the rest (or is removed and freed if that number is 0). 1444 * the rest (or is removed and freed if that number is 0).
1467 * On failure, NULL is returned, and the reason put into the 1445 * On failure, NULL is returned, and the reason put into the
1468 * global static errmsg array. 1446 * global static errmsg array.
1469 */ 1447 */
1470
1471object * 1448object *
1472get_split_ob (object *orig_ob, uint32 nr) 1449get_split_ob (object *orig_ob, uint32 nr)
1473{ 1450{
1474 object *newob; 1451 object *newob;
1475 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1452 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1739 * 1716 *
1740 * MSW 2001-07-08: Check all objects on space, not just those below 1717 * 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 1718 * object being inserted. insert_ob_in_map may not put new objects
1742 * on top. 1719 * on top.
1743 */ 1720 */
1744
1745int 1721int
1746check_move_on (object *op, object *originator) 1722check_move_on (object *op, object *originator)
1747{ 1723{
1748 object *tmp; 1724 object *tmp;
1749 maptile *m = op->map; 1725 maptile *m = op->map;
1776 1752
1777 /* The objects have to be checked from top to bottom. 1753 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1754 * Hence, we first go to the top:
1779 */ 1755 */
1780 1756
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1757 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1758 {
1783 /* Trim the search when we find the first other spell effect 1759 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1760 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1761 * we don't need to check all of them.
1786 */ 1762 */
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1780 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)) 1781 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1782 {
1807 1783
1808 float 1784 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1785 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1786
1811 if (op->type == PLAYER) 1787 if (op->type == PLAYER)
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1788 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))) 1789 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1790 diff /= 4.0;
1844 * The first matching object is returned, or NULL if none. 1820 * The first matching object is returned, or NULL if none.
1845 */ 1821 */
1846object * 1822object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1823present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1824{
1849 if (m == NULL || out_of_map (m, x, y)) 1825 if (!m || out_of_map (m, x, y))
1850 { 1826 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1827 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1828 return NULL;
1853 } 1829 }
1854 1830
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1831 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1832 if (tmp->arch == at)
1857 return tmp; 1833 return tmp;
1858 1834
1859 return NULL; 1835 return NULL;
1860} 1836}
1871 { 1847 {
1872 LOG (llevError, "Present called outside map.\n"); 1848 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1849 return NULL;
1874 } 1850 }
1875 1851
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1852 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1853 if (tmp->type == type)
1878 return tmp; 1854 return tmp;
1879 1855
1880 return NULL; 1856 return NULL;
1881} 1857}
2021 } 1997 }
2022 1998
2023 if (!index) 1999 if (!index)
2024 return -1; 2000 return -1;
2025 2001
2026 return altern[RANDOM () % index]; 2002 return altern [rndm (index)];
2027} 2003}
2028 2004
2029/* 2005/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2006 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2007 * find_free_spot(), but it will search max number of squares.
2052{ 2028{
2053 arr += begin; 2029 arr += begin;
2054 end -= begin; 2030 end -= begin;
2055 2031
2056 while (--end) 2032 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2033 swap (arr [end], arr [rndm (end + 1)]);
2058} 2034}
2059 2035
2060/* new function to make monster searching more efficient, and effective! 2036/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2037 * 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 2038 * the spaces to find monsters. In this way, it won't always look for
2196 2172
2197 return 3; 2173 return 3;
2198} 2174}
2199 2175
2200/* 2176/*
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 2177 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2178 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2179 */
2222
2223int 2180int
2224dirdiff (int dir1, int dir2) 2181dirdiff (int dir1, int dir2)
2225{ 2182{
2226 int d; 2183 int d;
2227 2184
2393 insert_ob_in_ob (object_create_clone (item), dst); 2350 insert_ob_in_ob (object_create_clone (item), dst);
2394 2351
2395 return dst; 2352 return dst;
2396} 2353}
2397 2354
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 2355/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2356 * has the same type and subtype match.
2438 * returns NULL if no match. 2357 * returns NULL if no match.
2439 */ 2358 */
2440object * 2359object *
2493 if (link->key == canonical_key) 2412 if (link->key == canonical_key)
2494 return link->value; 2413 return link->value;
2495 2414
2496 return 0; 2415 return 0;
2497} 2416}
2498
2499 2417
2500/* 2418/*
2501 * Updates the canonical_key in op to value. 2419 * Updates the canonical_key in op to value.
2502 * 2420 *
2503 * canonical_key is a shared string (value doesn't have to be). 2421 * canonical_key is a shared string (value doesn't have to be).
2606 } 2524 }
2607 else 2525 else
2608 item = item->env; 2526 item = item->env;
2609} 2527}
2610 2528
2529
2530const char *
2531object::flag_desc (char *desc, int len) const
2532{
2533 char *p = desc;
2534 bool first = true;
2535
2536 *p = 0;
2537
2538 for (int i = 0; i < NUM_FLAGS; i++)
2539 {
2540 if (len <= 10) // magic constant!
2541 {
2542 snprintf (p, len, ",...");
2543 break;
2544 }
2545
2546 if (flag [i])
2547 {
2548 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2549 len -= cnt;
2550 p += cnt;
2551 first = false;
2552 }
2553 }
2554
2555 return desc;
2556}
2557
2611// return a suitable string describing an objetc in enough detail to find it 2558// return a suitable string describing an object in enough detail to find it
2612const char * 2559const char *
2613object::debug_desc (char *info) const 2560object::debug_desc (char *info) const
2614{ 2561{
2562 char flagdesc[512];
2615 char info2[256 * 3]; 2563 char info2[256 * 4];
2616 char *p = info; 2564 char *p = info;
2617 2565
2618 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2566 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619 count, 2567 count, uuid.seq,
2620 &name, 2568 &name,
2621 title ? " " : "", 2569 title ? "\",title:\"" : "",
2622 title ? (const char *)title : ""); 2570 title ? (const char *)title : "",
2571 flag_desc (flagdesc, 512), type);
2623 2572
2624 if (env) 2573 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2574 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626 2575
2627 if (map) 2576 if (map)
2628 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2577 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2629 2578
2630 return info; 2579 return info;
2631} 2580}
2632 2581
2633const char * 2582const char *
2634object::debug_desc () const 2583object::debug_desc () const
2635{ 2584{
2636 static char info[256 * 3]; 2585 static char info[256 * 4];
2637 return debug_desc (info); 2586 return debug_desc (info);
2638} 2587}
2639 2588
2589const char *
2590object::debug_desc2 () const
2591{
2592 static char info[256 * 4];
2593 return debug_desc (info);
2594}
2595
2596struct region *
2597object::region () const
2598{
2599 return map ? map->region (x, y)
2600 : region::default_region ();
2601}
2602
2603const materialtype_t *
2604object::dominant_material () const
2605{
2606 if (materialtype_t *mat = name_to_material (materialname))
2607 return mat;
2608
2609 // omfg this is slow, this has to be temporary :)
2610 shstr unknown ("unknown");
2611
2612 return name_to_material (unknown);
2613}
2614
2615void
2616object::open_container (object *new_container)
2617{
2618 if (container == new_container)
2619 return;
2620
2621 if (object *old_container = container)
2622 {
2623 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2624 return;
2625
2626#if 0
2627 // remove the "Close old_container" object.
2628 if (object *closer = old_container->inv)
2629 if (closer->type == CLOSE_CON)
2630 closer->destroy ();
2631#endif
2632
2633 old_container->flag [FLAG_APPLIED] = 0;
2634 container = 0;
2635
2636 esrv_update_item (UPD_FLAGS, this, old_container);
2637 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2638 }
2639
2640 if (new_container)
2641 {
2642 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2643 return;
2644
2645 // TODO: this does not seem to serve any purpose anymore?
2646#if 0
2647 // insert the "Close Container" object.
2648 if (archetype *closer = new_container->other_arch)
2649 {
2650 object *closer = arch_to_object (new_container->other_arch);
2651 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2652 new_container->insert (closer);
2653 }
2654#endif
2655
2656 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2657
2658 new_container->flag [FLAG_APPLIED] = 1;
2659 container = new_container;
2660
2661 esrv_update_item (UPD_FLAGS, this, new_container);
2662 esrv_send_inventory (this, new_container);
2663 }
2664}
2665
2666

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines