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.133 by root, Fri Feb 16 19:43:40 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
697 return; 641 return;
698 } 642 }
699 643
700 mapspace &m = op->ms (); 644 mapspace &m = op->ms ();
701 645
702 if (m.flags_ & P_NEED_UPDATE) 646 if (!(m.flags_ & P_UPTODATE))
703 /* nop */; 647 /* nop */;
704 else if (action == UP_OBJ_INSERT) 648 else if (action == UP_OBJ_INSERT)
705 { 649 {
706 // this is likely overkill, TODO: revisit (schmorp) 650 // this is likely overkill, TODO: revisit (schmorp)
707 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 651 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 660 /* This isn't perfect, but I don't expect a lot of objects to
717 * to have move_allow right now. 661 * to have move_allow right now.
718 */ 662 */
719 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 663 || ((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) 664 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
721 m.flags_ = P_NEED_UPDATE; 665 m.flags_ = 0;
722 } 666 }
723 /* if the object is being removed, we can't make intelligent 667 /* if the object is being removed, we can't make intelligent
724 * decisions, because remove_ob can't really pass the object 668 * decisions, because remove_ob can't really pass the object
725 * that is being removed. 669 * that is being removed.
726 */ 670 */
727 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 671 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
728 m.flags_ = P_NEED_UPDATE; 672 m.flags_ = 0;
729 else if (action == UP_OBJ_FACE) 673 else if (action == UP_OBJ_FACE)
730 /* Nothing to do for that case */ ; 674 /* Nothing to do for that case */ ;
731 else 675 else
732 LOG (llevError, "update_object called with invalid action: %d\n", action); 676 LOG (llevError, "update_object called with invalid action: %d\n", action);
733 677
734 if (op->more) 678 if (op->more)
735 update_object (op->more, action); 679 update_object (op->more, action);
736} 680}
737 681
738object::vector object::objects; // not yet used
739object *object::first;
740
741object::object () 682object::object ()
742{ 683{
743 SET_FLAG (this, FLAG_REMOVED); 684 SET_FLAG (this, FLAG_REMOVED);
744 685
745 expmul = 1.0; 686 expmul = 1.0;
746 face = blank_face; 687 face = blank_face;
747} 688}
748 689
749object::~object () 690object::~object ()
750{ 691{
692 unlink ();
693
751 free_key_values (this); 694 free_key_values (this);
752} 695}
753 696
697static int object_count;
698
754void object::link () 699void object::link ()
755{ 700{
756 count = ++ob_count; 701 assert (!index);//D
757 uuid = gen_uuid (); 702 uuid = gen_uuid ();
703 count = ++object_count;
758 704
759 prev = 0; 705 refcnt_inc ();
760 next = object::first; 706 objects.insert (this);
761
762 if (object::first)
763 object::first->prev = this;
764
765 object::first = this;
766} 707}
767 708
768void object::unlink () 709void object::unlink ()
769{ 710{
770 if (this == object::first) 711 if (!index)
771 object::first = next; 712 return;
772 713
773 /* Remove this object from the list of used objects */ 714 objects.erase (this);
774 if (prev) prev->next = next; 715 refcnt_dec ();
775 if (next) next->prev = prev; 716}
776 717
777 prev = 0; 718void
778 next = 0; 719object::activate ()
720{
721 /* If already on active list, don't do anything */
722 if (active)
723 return;
724
725 if (has_active_speed ())
726 actives.insert (this);
727}
728
729void
730object::activate_recursive ()
731{
732 activate ();
733
734 for (object *op = inv; op; op = op->below)
735 op->activate_recursive ();
736}
737
738/* This function removes object 'op' from the list of active
739 * objects.
740 * This should only be used for style maps or other such
741 * reference maps where you don't want an object that isn't
742 * in play chewing up cpu time getting processed.
743 * The reverse of this is to call update_ob_speed, which
744 * will do the right thing based on the speed of the object.
745 */
746void
747object::deactivate ()
748{
749 /* If not on the active list, nothing needs to be done */
750 if (!active)
751 return;
752
753 actives.erase (this);
754}
755
756void
757object::deactivate_recursive ()
758{
759 for (object *op = inv; op; op = op->below)
760 op->deactivate_recursive ();
761
762 deactivate ();
763}
764
765void
766object::set_flag_inv (int flag, int value)
767{
768 for (object *op = inv; op; op = op->below)
769 {
770 op->flag [flag] = value;
771 op->set_flag_inv (flag, value);
772 }
773}
774
775/*
776 * Remove and free all objects in the inventory of the given object.
777 * object.c ?
778 */
779void
780object::destroy_inv (bool drop_to_ground)
781{
782 // need to check first, because the checks below might segfault
783 // as we might be on an invalid mapspace and crossfire code
784 // is too buggy to ensure that the inventory is empty.
785 // corollary: if you create arrows etc. with stuff in tis inventory,
786 // cf will crash below with off-map x and y
787 if (!inv)
788 return;
789
790 /* Only if the space blocks everything do we not process -
791 * if some form of movement is allowed, let objects
792 * drop on that space.
793 */
794 if (!drop_to_ground
795 || !map
796 || map->in_memory != MAP_IN_MEMORY
797 || map->nodrop
798 || ms ().move_block == MOVE_ALL)
799 {
800 while (inv)
801 {
802 inv->destroy_inv (drop_to_ground);
803 inv->destroy ();
804 }
805 }
806 else
807 { /* Put objects in inventory onto this space */
808 while (inv)
809 {
810 object *op = inv;
811
812 if (op->flag [FLAG_STARTEQUIP]
813 || op->flag [FLAG_NO_DROP]
814 || op->type == RUNE
815 || op->type == TRAP
816 || op->flag [FLAG_IS_A_TEMPLATE]
817 || op->flag [FLAG_DESTROY_ON_DEATH])
818 op->destroy ();
819 else
820 map->insert (op, x, y);
821 }
822 }
779} 823}
780 824
781object *object::create () 825object *object::create ()
782{ 826{
783 object *op = new object; 827 object *op = new object;
784 op->link (); 828 op->link ();
785 return op; 829 return op;
786} 830}
787 831
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 832void
799object::do_destroy () 833object::do_destroy ()
800{ 834{
801 attachable::do_destroy (); 835 attachable::do_destroy ();
802 836
803 if (flag [FLAG_IS_LINKED]) 837 if (flag [FLAG_IS_LINKED])
804 remove_button_link (this); 838 remove_button_link (this);
805 839
806 if (flag [FLAG_FRIENDLY]) 840 if (flag [FLAG_FRIENDLY])
841 {
807 remove_friendly_object (this); 842 remove_friendly_object (this);
843
844 if (type == GOLEM
845 && owner
846 && owner->type == PLAYER
847 && owner->contr->ranges[range_golem] == this)
848 owner->contr->ranges[range_golem] = 0;
849 }
808 850
809 if (!flag [FLAG_REMOVED]) 851 if (!flag [FLAG_REMOVED])
810 remove (); 852 remove ();
811 853
812 if (flag [FLAG_FREED]) 854 destroy_inv (true);
813 return; 855
856 deactivate ();
857 unlink ();
814 858
815 flag [FLAG_FREED] = 1; 859 flag [FLAG_FREED] = 1;
816 860
817 // hack to ensure that freed objects still have a valid map 861 // hack to ensure that freed objects still have a valid map
818 { 862 {
824 868
825 freed_map->name = "/internal/freed_objects_map"; 869 freed_map->name = "/internal/freed_objects_map";
826 freed_map->width = 3; 870 freed_map->width = 3;
827 freed_map->height = 3; 871 freed_map->height = 3;
828 872
829 freed_map->allocate (); 873 freed_map->alloc ();
874 freed_map->in_memory = MAP_IN_MEMORY;
830 } 875 }
831 876
832 map = freed_map; 877 map = freed_map;
833 x = 1; 878 x = 1;
834 y = 1; 879 y = 1;
835 } 880 }
836 881
837 more = 0;
838 head = 0; 882 head = 0;
839 inv = 0; 883
884 if (more)
885 {
886 more->destroy ();
887 more = 0;
888 }
840 889
841 // clear those pointers that likely might have circular references to us 890 // clear those pointers that likely might have circular references to us
842 owner = 0; 891 owner = 0;
843 enemy = 0; 892 enemy = 0;
844 attacked_by = 0; 893 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} 894}
900 895
901void 896void
902object::destroy (bool destroy_inventory) 897object::destroy (bool destroy_inventory)
903{ 898{
904 if (destroyed ()) 899 if (destroyed ())
905 return; 900 return;
906 901
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) 902 if (destroy_inventory)
915 destroy_inv (true); 903 destroy_inv (false);
916 904
917 attachable::destroy (); 905 attachable::destroy ();
918} 906}
919 907
920/* 908/*
938 * This function removes the object op from the linked list of objects 926 * 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 927 * which it is currently tied to. When this function is done, the
940 * object will have no environment. If the object previously had an 928 * object will have no environment. If the object previously had an
941 * environment, the x and y coordinates will be updated to 929 * environment, the x and y coordinates will be updated to
942 * the previous environment. 930 * the previous environment.
943 * Beware: This function is called from the editor as well!
944 */ 931 */
945void 932void
946object::remove () 933object::do_remove ()
947{ 934{
948 object *tmp, *last = 0; 935 object *tmp, *last = 0;
949 object *otmp; 936 object *otmp;
950 937
951 if (QUERY_FLAG (this, FLAG_REMOVED)) 938 if (QUERY_FLAG (this, FLAG_REMOVED))
973 * to save cpu time. 960 * to save cpu time.
974 */ 961 */
975 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 962 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
976 otmp->update_stats (); 963 otmp->update_stats ();
977 964
978 if (above != NULL) 965 if (above)
979 above->below = below; 966 above->below = below;
980 else 967 else
981 env->inv = below; 968 env->inv = below;
982 969
983 if (below != NULL) 970 if (below)
984 below->above = above; 971 below->above = above;
985 972
986 /* we set up values so that it could be inserted into 973 /* we set up values so that it could be inserted into
987 * the map, but we don't actually do that - it is up 974 * the map, but we don't actually do that - it is up
988 * to the caller to decide what we want to do. 975 * to the caller to decide what we want to do.
992 above = 0, below = 0; 979 above = 0, below = 0;
993 env = 0; 980 env = 0;
994 } 981 }
995 else if (map) 982 else if (map)
996 { 983 {
997 /* Re did the following section of code - it looks like it had 984 if (type == PLAYER)
998 * lots of logic for things we no longer care about
999 */ 985 {
986 // leaving a spot always closes any open container on the ground
987 if (container && !container->env)
988 // this causes spurious floorbox updates, but it ensures
989 // that the CLOSE event is being sent.
990 close_container ();
991
992 --map->players;
993 map->touch ();
994 }
995
996 map->dirty = true;
997 mapspace &ms = this->ms ();
1000 998
1001 /* link the object above us */ 999 /* link the object above us */
1002 if (above) 1000 if (above)
1003 above->below = below; 1001 above->below = below;
1004 else 1002 else
1005 map->at (x, y).top = below; /* we were top, set new top */ 1003 ms.top = below; /* we were top, set new top */
1006 1004
1007 /* Relink the object below us, if there is one */ 1005 /* Relink the object below us, if there is one */
1008 if (below) 1006 if (below)
1009 below->above = above; 1007 below->above = above;
1010 else 1008 else
1012 /* Nothing below, which means we need to relink map object for this space 1010 /* 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 1011 * use translated coordinates in case some oddness with map tiling is
1014 * evident 1012 * evident
1015 */ 1013 */
1016 if (GET_MAP_OB (map, x, y) != this) 1014 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); 1015 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 1016
1027 map->at (x, y).bot = above; /* goes on above it. */ 1017 ms.bot = above; /* goes on above it. */
1028 } 1018 }
1029 1019
1030 above = 0; 1020 above = 0;
1031 below = 0; 1021 below = 0;
1032 1022
1033 if (map->in_memory == MAP_SAVING) 1023 if (map->in_memory == MAP_SAVING)
1034 return; 1024 return;
1035 1025
1036 int check_walk_off = !flag [FLAG_NO_APPLY]; 1026 int check_walk_off = !flag [FLAG_NO_APPLY];
1037 1027
1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1028 for (tmp = ms.bot; tmp; tmp = tmp->above)
1039 { 1029 {
1040 /* No point updating the players look faces if he is the object 1030 /* No point updating the players look faces if he is the object
1041 * being removed. 1031 * being removed.
1042 */ 1032 */
1043 1033
1055 1045
1056 if (tmp->contr->ns) 1046 if (tmp->contr->ns)
1057 tmp->contr->ns->floorbox_update (); 1047 tmp->contr->ns->floorbox_update ();
1058 } 1048 }
1059 1049
1060 /* See if player moving off should effect something */ 1050 /* See if object moving off should effect something */
1061 if (check_walk_off 1051 if (check_walk_off
1062 && ((move_type & tmp->move_off) 1052 && ((move_type & tmp->move_off)
1063 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1053 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064 { 1054 {
1065 move_apply (tmp, this, 0); 1055 move_apply (tmp, this, 0);
1067 if (destroyed ()) 1057 if (destroyed ())
1068 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1058 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1069 } 1059 }
1070 1060
1071 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1061 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072 1062 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1073 if (tmp->above == tmp) 1063 if (tmp->above == tmp)
1074 tmp->above = 0; 1064 tmp->above = 0;
1075 1065
1076 last = tmp; 1066 last = tmp;
1077 } 1067 }
1078 1068
1079 /* last == NULL of there are no objects on this space */ 1069 /* last == NULL if there are no objects on this space */
1070 //TODO: this makes little sense, why only update the topmost object?
1080 if (!last) 1071 if (!last)
1081 map->at (x, y).flags_ = P_NEED_UPDATE; 1072 map->at (x, y).flags_ = 0;
1082 else 1073 else
1083 update_object (last, UP_OBJ_REMOVE); 1074 update_object (last, UP_OBJ_REMOVE);
1084 1075
1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1086 update_all_los (map, x, y); 1077 update_all_los (map, x, y);
1123 1114
1124 return 0; 1115 return 0;
1125} 1116}
1126 1117
1127/* 1118/*
1128 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1119 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1129 * job preparing multi-part monsters 1120 * job preparing multi-part monsters.
1130 */ 1121 */
1131object * 1122object *
1132insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1123insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1133{ 1124{
1134 object *tmp;
1135
1136 if (op->head)
1137 op = op->head;
1138
1139 for (tmp = op; tmp; tmp = tmp->more) 1125 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140 { 1126 {
1141 tmp->x = x + tmp->arch->clone.x; 1127 tmp->x = x + tmp->arch->clone.x;
1142 tmp->y = y + tmp->arch->clone.y; 1128 tmp->y = y + tmp->arch->clone.y;
1143 } 1129 }
1144 1130
1167 */ 1153 */
1168object * 1154object *
1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1155insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1170{ 1156{
1171 object *tmp, *top, *floor = NULL; 1157 object *tmp, *top, *floor = NULL;
1172 sint16 x, y;
1173 1158
1174 if (QUERY_FLAG (op, FLAG_FREED)) 1159 if (QUERY_FLAG (op, FLAG_FREED))
1175 { 1160 {
1176 LOG (llevError, "Trying to insert freed object!\n"); 1161 LOG (llevError, "Trying to insert freed object!\n");
1177 return NULL; 1162 return NULL;
1178 } 1163 }
1179 1164
1180 if (m == NULL) 1165 if (!QUERY_FLAG (op, FLAG_REMOVED))
1166 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1167
1168 op->remove ();
1169
1170 if (!m)
1181 { 1171 {
1182 char *dump = dump_object (op); 1172 char *dump = dump_object (op);
1183 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1173 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1184 free (dump); 1174 free (dump);
1185 return op; 1175 return op;
1198#endif 1188#endif
1199 free (dump); 1189 free (dump);
1200 return op; 1190 return op;
1201 } 1191 }
1202 1192
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; 1193 if (object *more = op->more)
1216 1194 {
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) 1195 if (!insert_ob_in_map (more, m, originator, flag))
1233 { 1196 {
1234 if (!op->head) 1197 if (!op->head)
1235 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1198 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1236 1199
1237 return 0; 1200 return 0;
1242 1205
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1206 /* 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 1207 * of areas of callers (eg, anything that uses find_free_spot would now
1245 * need extra work 1208 * need extra work
1246 */ 1209 */
1247 op->map = get_map_from_coord (m, &op->x, &op->y); 1210 if (!xy_normalise (m, op->x, op->y))
1248 x = op->x; 1211 return 0;
1249 y = op->y; 1212
1213 op->map = m;
1214 mapspace &ms = op->ms ();
1250 1215
1251 /* this has to be done after we translate the coordinates. 1216 /* this has to be done after we translate the coordinates.
1252 */ 1217 */
1253 if (op->nrof && !(flag & INS_NO_MERGE)) 1218 if (op->nrof && !(flag & INS_NO_MERGE))
1254 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1219 for (tmp = ms.bot; tmp; tmp = tmp->above)
1255 if (object::can_merge (op, tmp)) 1220 if (object::can_merge (op, tmp))
1256 { 1221 {
1257 op->nrof += tmp->nrof; 1222 op->nrof += tmp->nrof;
1258 tmp->destroy (); 1223 tmp->destroy ();
1259 } 1224 }
1276 op->below = originator->below; 1241 op->below = originator->below;
1277 1242
1278 if (op->below) 1243 if (op->below)
1279 op->below->above = op; 1244 op->below->above = op;
1280 else 1245 else
1281 op->ms ().bot = op; 1246 ms.bot = op;
1282 1247
1283 /* since *below* originator, no need to update top */ 1248 /* since *below* originator, no need to update top */
1284 originator->below = op; 1249 originator->below = op;
1285 } 1250 }
1286 else 1251 else
1287 { 1252 {
1253 top = ms.bot;
1254
1288 /* If there are other objects, then */ 1255 /* If there are other objects, then */
1289 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1256 if ((!(flag & INS_MAP_LOAD)) && top)
1290 { 1257 {
1291 object *last = NULL; 1258 object *last = 0;
1292 1259
1293 /* 1260 /*
1294 * If there are multiple objects on this space, we do some trickier handling. 1261 * If there are multiple objects on this space, we do some trickier handling.
1295 * We've already dealt with merging if appropriate. 1262 * We've already dealt with merging if appropriate.
1296 * Generally, we want to put the new object on top. But if 1263 * 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 1267 * 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 1268 * 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 1269 * when lots of spells are cast in one area. Currently, it is presumed
1303 * that flying non pickable objects are spell objects. 1270 * that flying non pickable objects are spell objects.
1304 */ 1271 */
1305 1272 for (top = ms.bot; top; top = top->above)
1306 while (top != NULL)
1307 { 1273 {
1308 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1274 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1309 floor = top; 1275 floor = top;
1310 1276
1311 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1277 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; 1280 top = top->below;
1315 break; 1281 break;
1316 } 1282 }
1317 1283
1318 last = top; 1284 last = top;
1319 top = top->above;
1320 } 1285 }
1321 1286
1322 /* Don't want top to be NULL, so set it to the last valid object */ 1287 /* Don't want top to be NULL, so set it to the last valid object */
1323 top = last; 1288 top = last;
1324 1289
1331 * Unless those objects are exits, type 66 1296 * Unless those objects are exits, type 66
1332 * If INS_ON_TOP is used, don't do this processing 1297 * If INS_ON_TOP is used, don't do this processing
1333 * Need to find the object that in fact blocks view, otherwise 1298 * Need to find the object that in fact blocks view, otherwise
1334 * stacking is a bit odd. 1299 * stacking is a bit odd.
1335 */ 1300 */
1336 if (!(flag & INS_ON_TOP) && 1301 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)) 1302 && ms.flags () & P_BLOCKSVIEW
1303 && (op->face && !op->face->visibility))
1338 { 1304 {
1339 for (last = top; last != floor; last = last->below) 1305 for (last = top; last != floor; last = last->below)
1340 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1306 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1341 break; 1307 break;
1308
1342 /* Check to see if we found the object that blocks view, 1309 /* Check to see if we found the object that blocks view,
1343 * and make sure we have a below pointer for it so that 1310 * and make sure we have a below pointer for it so that
1344 * we can get inserted below this one, which requires we 1311 * we can get inserted below this one, which requires we
1345 * set top to the object below us. 1312 * set top to the object below us.
1346 */ 1313 */
1348 top = last->below; 1315 top = last->below;
1349 } 1316 }
1350 } /* If objects on this space */ 1317 } /* If objects on this space */
1351 1318
1352 if (flag & INS_MAP_LOAD) 1319 if (flag & INS_MAP_LOAD)
1353 top = GET_MAP_TOP (op->map, op->x, op->y); 1320 top = ms.top;
1354 1321
1355 if (flag & INS_ABOVE_FLOOR_ONLY) 1322 if (flag & INS_ABOVE_FLOOR_ONLY)
1356 top = floor; 1323 top = floor;
1357 1324
1358 /* Top is the object that our object (op) is going to get inserted above. 1325 /* Top is the object that our object (op) is going to get inserted above.
1359 */ 1326 */
1360 1327
1361 /* First object on this space */ 1328 /* First object on this space */
1362 if (!top) 1329 if (!top)
1363 { 1330 {
1364 op->above = GET_MAP_OB (op->map, op->x, op->y); 1331 op->above = ms.bot;
1365 1332
1366 if (op->above) 1333 if (op->above)
1367 op->above->below = op; 1334 op->above->below = op;
1368 1335
1369 op->below = NULL; 1336 op->below = 0;
1370 op->ms ().bot = op; 1337 ms.bot = op;
1371 } 1338 }
1372 else 1339 else
1373 { /* get inserted into the stack above top */ 1340 { /* get inserted into the stack above top */
1374 op->above = top->above; 1341 op->above = top->above;
1375 1342
1378 1345
1379 op->below = top; 1346 op->below = top;
1380 top->above = op; 1347 top->above = op;
1381 } 1348 }
1382 1349
1383 if (op->above == NULL) 1350 if (!op->above)
1384 op->ms ().top = op; 1351 ms.top = op;
1385 } /* else not INS_BELOW_ORIGINATOR */ 1352 } /* else not INS_BELOW_ORIGINATOR */
1386 1353
1387 if (op->type == PLAYER) 1354 if (op->type == PLAYER)
1355 {
1388 op->contr->do_los = 1; 1356 op->contr->do_los = 1;
1357 ++op->map->players;
1358 op->map->touch ();
1359 }
1360
1361 op->map->dirty = true;
1389 1362
1390 /* If we have a floor, we know the player, if any, will be above 1363 /* 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. 1364 * it, so save a few ticks and start from there.
1392 */ 1365 */
1393 if (!(flag & INS_MAP_LOAD)) 1366 if (!(flag & INS_MAP_LOAD))
1394 if (object *pl = op->ms ().player ()) 1367 if (object *pl = ms.player ())
1395 if (pl->contr->ns) 1368 if (pl->contr->ns)
1396 pl->contr->ns->floorbox_update (); 1369 pl->contr->ns->floorbox_update ();
1397 1370
1398 /* If this object glows, it may affect lighting conditions that are 1371 /* If this object glows, it may affect lighting conditions that are
1399 * visible to others on this map. But update_all_los is really 1372 * 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 1373 * 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 1374 * on the map will get recalculated. The players could very well
1402 * be far away from this change and not affected in any way - 1375 * be far away from this change and not affected in any way -
1403 * this should get redone to only look for players within range, 1376 * this should get redone to only look for players within range,
1404 * or just updating the P_NEED_UPDATE for spaces within this area 1377 * or just updating the P_UPTODATE for spaces within this area
1405 * of effect may be sufficient. 1378 * of effect may be sufficient.
1406 */ 1379 */
1407 if (op->map->darkness && (op->glow_radius != 0)) 1380 if (op->map->darkness && (op->glow_radius != 0))
1408 update_all_los (op->map, op->x, op->y); 1381 update_all_los (op->map, op->x, op->y);
1409 1382
1447{ 1420{
1448 object *tmp, *tmp1; 1421 object *tmp, *tmp1;
1449 1422
1450 /* first search for itself and remove any old instances */ 1423 /* first search for itself and remove any old instances */
1451 1424
1452 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1425 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1426 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454 tmp->destroy (); 1427 tmp->destroy ();
1455 1428
1456 tmp1 = arch_to_object (archetype::find (arch_string)); 1429 tmp1 = arch_to_object (archetype::find (arch_string));
1457 1430
1458 tmp1->x = op->x; 1431 tmp1->x = op->x;
1459 tmp1->y = op->y; 1432 tmp1->y = op->y;
1460 insert_ob_in_map (tmp1, op->map, op, 0); 1433 insert_ob_in_map (tmp1, op->map, op, 0);
1434}
1435
1436object *
1437object::insert_at (object *where, object *originator, int flags)
1438{
1439 where->map->insert (this, where->x, where->y, originator, flags);
1461} 1440}
1462 1441
1463/* 1442/*
1464 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1443 * 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 1444 * is returned contains nr objects, and the remaining parts contains
1466 * the rest (or is removed and freed if that number is 0). 1445 * the rest (or is removed and freed if that number is 0).
1467 * On failure, NULL is returned, and the reason put into the 1446 * On failure, NULL is returned, and the reason put into the
1468 * global static errmsg array. 1447 * global static errmsg array.
1469 */ 1448 */
1470
1471object * 1449object *
1472get_split_ob (object *orig_ob, uint32 nr) 1450get_split_ob (object *orig_ob, uint32 nr)
1473{ 1451{
1474 object *newob; 1452 object *newob;
1475 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1453 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1739 * 1717 *
1740 * MSW 2001-07-08: Check all objects on space, not just those below 1718 * 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 1719 * object being inserted. insert_ob_in_map may not put new objects
1742 * on top. 1720 * on top.
1743 */ 1721 */
1744
1745int 1722int
1746check_move_on (object *op, object *originator) 1723check_move_on (object *op, object *originator)
1747{ 1724{
1748 object *tmp; 1725 object *tmp;
1749 maptile *m = op->map; 1726 maptile *m = op->map;
1776 1753
1777 /* The objects have to be checked from top to bottom. 1754 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1755 * Hence, we first go to the top:
1779 */ 1756 */
1780 1757
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1758 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1759 {
1783 /* Trim the search when we find the first other spell effect 1760 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1761 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1762 * we don't need to check all of them.
1786 */ 1763 */
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1781 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)) 1782 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1783 {
1807 1784
1808 float 1785 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1786 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1787
1811 if (op->type == PLAYER) 1788 if (op->type == PLAYER)
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1789 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))) 1790 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1791 diff /= 4.0;
1844 * The first matching object is returned, or NULL if none. 1821 * The first matching object is returned, or NULL if none.
1845 */ 1822 */
1846object * 1823object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1824present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1825{
1849 if (m == NULL || out_of_map (m, x, y)) 1826 if (!m || out_of_map (m, x, y))
1850 { 1827 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1828 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1829 return NULL;
1853 } 1830 }
1854 1831
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1832 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1833 if (tmp->arch == at)
1857 return tmp; 1834 return tmp;
1858 1835
1859 return NULL; 1836 return NULL;
1860} 1837}
1871 { 1848 {
1872 LOG (llevError, "Present called outside map.\n"); 1849 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1850 return NULL;
1874 } 1851 }
1875 1852
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1853 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1854 if (tmp->type == type)
1878 return tmp; 1855 return tmp;
1879 1856
1880 return NULL; 1857 return NULL;
1881} 1858}
2021 } 1998 }
2022 1999
2023 if (!index) 2000 if (!index)
2024 return -1; 2001 return -1;
2025 2002
2026 return altern[RANDOM () % index]; 2003 return altern [rndm (index)];
2027} 2004}
2028 2005
2029/* 2006/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2007 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2008 * find_free_spot(), but it will search max number of squares.
2052{ 2029{
2053 arr += begin; 2030 arr += begin;
2054 end -= begin; 2031 end -= begin;
2055 2032
2056 while (--end) 2033 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2034 swap (arr [end], arr [rndm (end + 1)]);
2058} 2035}
2059 2036
2060/* new function to make monster searching more efficient, and effective! 2037/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2038 * 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 2039 * the spaces to find monsters. In this way, it won't always look for
2196 2173
2197 return 3; 2174 return 3;
2198} 2175}
2199 2176
2200/* 2177/*
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 2178 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2179 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2180 */
2222
2223int 2181int
2224dirdiff (int dir1, int dir2) 2182dirdiff (int dir1, int dir2)
2225{ 2183{
2226 int d; 2184 int d;
2227 2185
2393 insert_ob_in_ob (object_create_clone (item), dst); 2351 insert_ob_in_ob (object_create_clone (item), dst);
2394 2352
2395 return dst; 2353 return dst;
2396} 2354}
2397 2355
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 2356/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2357 * has the same type and subtype match.
2438 * returns NULL if no match. 2358 * returns NULL if no match.
2439 */ 2359 */
2440object * 2360object *
2606 } 2526 }
2607 else 2527 else
2608 item = item->env; 2528 item = item->env;
2609} 2529}
2610 2530
2531
2532const char *
2533object::flag_desc (char *desc, int len) const
2534{
2535 char *p = desc;
2536 bool first = true;
2537
2538 *p = 0;
2539
2540 for (int i = 0; i < NUM_FLAGS; i++)
2541 {
2542 if (len <= 10) // magic constant!
2543 {
2544 snprintf (p, len, ",...");
2545 break;
2546 }
2547
2548 if (flag [i])
2549 {
2550 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2551 len -= cnt;
2552 p += cnt;
2553 first = false;
2554 }
2555 }
2556
2557 return desc;
2558}
2559
2611// return a suitable string describing an objetc in enough detail to find it 2560// return a suitable string describing an object in enough detail to find it
2612const char * 2561const char *
2613object::debug_desc (char *info) const 2562object::debug_desc (char *info) const
2614{ 2563{
2564 char flagdesc[512];
2615 char info2[256 * 3]; 2565 char info2[256 * 4];
2616 char *p = info; 2566 char *p = info;
2617 2567
2618 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2568 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619 count, 2569 count, uuid.seq,
2620 &name, 2570 &name,
2621 title ? " " : "", 2571 title ? "\",title:\"" : "",
2622 title ? (const char *)title : ""); 2572 title ? (const char *)title : "",
2573 flag_desc (flagdesc, 512), type);
2623 2574
2624 if (env) 2575 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2576 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626 2577
2627 if (map) 2578 if (map)
2628 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2579 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2629 2580
2630 return info; 2581 return info;
2631} 2582}
2632 2583
2633const char * 2584const char *
2634object::debug_desc () const 2585object::debug_desc () const
2635{ 2586{
2636 static char info[256 * 3]; 2587 static char info[256 * 4];
2637 return debug_desc (info); 2588 return debug_desc (info);
2638} 2589}
2639 2590
2591const char *
2592object::debug_desc2 () const
2593{
2594 static char info[256 * 4];
2595 return debug_desc (info);
2596}
2597
2598struct region *
2599object::region () const
2600{
2601 return map ? map->region (x, y)
2602 : region::default_region ();
2603}
2604
2605const materialtype_t *
2606object::dominant_material () const
2607{
2608 if (materialtype_t *mat = name_to_material (materialname))
2609 return mat;
2610
2611 // omfg this is slow, this has to be temporary :)
2612 shstr unknown ("unknown");
2613
2614 return name_to_material (unknown);
2615}
2616
2617void
2618object::open_container (object *new_container)
2619{
2620 if (container == new_container)
2621 return;
2622
2623 if (object *old_container = container)
2624 {
2625 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2626 return;
2627
2628#if 0
2629 // remove the "Close old_container" object.
2630 if (object *closer = old_container->inv)
2631 if (closer->type == CLOSE_CON)
2632 closer->destroy ();
2633#endif
2634
2635 old_container->flag [FLAG_APPLIED] = 0;
2636 container = 0;
2637
2638 esrv_update_item (UPD_FLAGS, this, old_container);
2639 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2640 }
2641
2642 if (new_container)
2643 {
2644 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2645 return;
2646
2647 // TODO: this does not seem to serve any purpose anymore?
2648#if 0
2649 // insert the "Close Container" object.
2650 if (archetype *closer = new_container->other_arch)
2651 {
2652 object *closer = arch_to_object (new_container->other_arch);
2653 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2654 new_container->insert (closer);
2655 }
2656#endif
2657
2658 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2659
2660 new_container->flag [FLAG_APPLIED] = 1;
2661 container = new_container;
2662
2663 esrv_update_item (UPD_FLAGS, this, new_container);
2664 esrv_send_inventory (this, new_container);
2665 }
2666}
2667
2668

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines