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.89 by root, Tue Dec 26 09:52:40 2006 UTC vs.
Revision 1.113 by root, Tue Jan 9 21:32:41 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
… …
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:
… …
391} 392}
392 393
393/* 394/*
394 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
395 */ 396 */
396
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 for (object *op = object::first; op; op = op->next) 400 for_all_objects (op)
401 if (op->count == i) 401 if (op->count == i)
402 return op; 402 return op;
403 403
404 return 0; 404 return 0;
405} 405}
406 406
407/* 407/*
408 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
411 */ 411 */
412
413object * 412object *
414find_object_name (const char *str) 413find_object_name (const char *str)
415{ 414{
416 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
417 object *op; 416 object *op;
418 417
419 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
420 if (op->name == str_) 419 if (op->name == str_)
421 break; 420 break;
422 421
423 return op; 422 return op;
424} 423}
… …
538/* 537/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 538 * 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 539 * 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. 540 * be called to update the face variable, _and_ how it looks on the map.
542 */ 541 */
543
544void 542void
545update_turn_face (object *op) 543update_turn_face (object *op)
546{ 544{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 545 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 546 return;
547
549 SET_ANIMATION (op, op->direction); 548 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 549 update_object (op, UP_OBJ_FACE);
551} 550}
552 551
553/* 552/*
… …
556 * This function needs to be called whenever the speed of an object changes. 555 * This function needs to be called whenever the speed of an object changes.
557 */ 556 */
558void 557void
559object::set_speed (float speed) 558object::set_speed (float speed)
560{ 559{
561 extern int arch_init;
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (flag [FLAG_FREED] && speed) 560 if (flag [FLAG_FREED] && speed)
567 { 561 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name); 562 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0; 563 speed = 0;
570 } 564 }
571 565
572 this->speed = speed; 566 this->speed = speed;
573 567
574 if (arch_init) 568 if (has_active_speed ())
575 return; 569 activate ();
576
577 if (FABS (speed) > MIN_ACTIVE_SPEED)
578 {
579 /* If already on active list, don't do anything */
580 if (active_next || active_prev || this == active_objects)
581 return;
582
583 /* process_events() expects us to insert the object at the beginning
584 * of the list. */
585 active_next = active_objects;
586
587 if (active_next)
588 active_next->active_prev = this;
589
590 active_objects = this;
591 }
592 else 570 else
593 { 571 deactivate ();
594 /* If not on the active list, nothing needs to be done */
595 if (!active_next && !active_prev && this != active_objects)
596 return;
597
598 if (!active_prev)
599 {
600 active_objects = active_next;
601
602 if (active_next)
603 active_next->active_prev = 0;
604 }
605 else
606 {
607 active_prev->active_next = active_next;
608
609 if (active_next)
610 active_next->active_prev = active_prev;
611 }
612
613 active_next = 0;
614 active_prev = 0;
615 }
616}
617
618/* This function removes object 'op' from the list of active
619 * objects.
620 * This should only be used for style maps or other such
621 * reference maps where you don't want an object that isn't
622 * in play chewing up cpu time getting processed.
623 * The reverse of this is to call update_ob_speed, which
624 * will do the right thing based on the speed of the object.
625 */
626void
627remove_from_active_list (object *op)
628{
629 /* If not on the active list, nothing needs to be done */
630 if (!op->active_next && !op->active_prev && op != active_objects)
631 return;
632
633 if (op->active_prev == NULL)
634 {
635 active_objects = op->active_next;
636 if (op->active_next != NULL)
637 op->active_next->active_prev = NULL;
638 }
639 else
640 {
641 op->active_prev->active_next = op->active_next;
642 if (op->active_next)
643 op->active_next->active_prev = op->active_prev;
644 }
645 op->active_next = NULL;
646 op->active_prev = NULL;
647} 572}
648 573
649/* 574/*
650 * update_object() updates the the map. 575 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 576 * It takes into account invisible objects (and represent squares covered
… …
699 return; 624 return;
700 } 625 }
701 626
702 mapspace &m = op->ms (); 627 mapspace &m = op->ms ();
703 628
704 if (m.flags_ & P_NEED_UPDATE) 629 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 630 /* nop */;
706 else if (action == UP_OBJ_INSERT) 631 else if (action == UP_OBJ_INSERT)
707 { 632 {
708 // this is likely overkill, TODO: revisit (schmorp) 633 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
… …
718 /* This isn't perfect, but I don't expect a lot of objects to 643 /* This isn't perfect, but I don't expect a lot of objects to
719 * to have move_allow right now. 644 * to have move_allow right now.
720 */ 645 */
721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723 m.flags_ = P_NEED_UPDATE; 648 m.flags_ = 0;
724 } 649 }
725 /* if the object is being removed, we can't make intelligent 650 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 651 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 652 * that is being removed.
728 */ 653 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 655 m.flags_ = 0;
731 else if (action == UP_OBJ_FACE) 656 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 657 /* Nothing to do for that case */ ;
733 else 658 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 659 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 660
736 if (op->more) 661 if (op->more)
737 update_object (op->more, action); 662 update_object (op->more, action);
738} 663}
739 664
740object::vector object::objects; // not yet used
741object *object::first;
742
743object::object () 665object::object ()
744{ 666{
745 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
746 668
747 expmul = 1.0; 669 expmul = 1.0;
… …
751object::~object () 673object::~object ()
752{ 674{
753 free_key_values (this); 675 free_key_values (this);
754} 676}
755 677
678static int object_count;
679
756void object::link () 680void object::link ()
757{ 681{
758 count = ++ob_count; 682 assert (!index);//D
759 uuid = gen_uuid (); 683 uuid = gen_uuid ();
684 count = ++object_count;
760 685
761 prev = 0; 686 refcnt_inc ();
762 next = object::first; 687 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 688}
769 689
770void object::unlink () 690void object::unlink ()
771{ 691{
772 if (this == object::first) 692 assert (index);//D
773 object::first = next; 693 objects.erase (this);
694 refcnt_dec ();
695}
774 696
775 /* Remove this object from the list of used objects */ 697void
776 if (prev) prev->next = next; 698object::activate ()
777 if (next) next->prev = prev; 699{
700 /* If already on active list, don't do anything */
701 if (active)
702 return;
778 703
779 prev = 0; 704 if (has_active_speed ())
780 next = 0; 705 actives.insert (this);
706}
707
708void
709object::activate_recursive ()
710{
711 activate ();
712
713 for (object *op = inv; op; op = op->below)
714 op->activate_recursive ();
715}
716
717/* This function removes object 'op' from the list of active
718 * objects.
719 * This should only be used for style maps or other such
720 * reference maps where you don't want an object that isn't
721 * in play chewing up cpu time getting processed.
722 * The reverse of this is to call update_ob_speed, which
723 * will do the right thing based on the speed of the object.
724 */
725void
726object::deactivate ()
727{
728 /* If not on the active list, nothing needs to be done */
729 if (!active)
730 return;
731
732 actives.erase (this);
733}
734
735void
736object::deactivate_recursive ()
737{
738 for (object *op = inv; op; op = op->below)
739 op->deactivate_recursive ();
740
741 deactivate ();
742}
743
744void
745object::set_flag_inv (int flag, int value)
746{
747 for (object *op = inv; op; op = op->below)
748 {
749 op->flag [flag] = value;
750 op->set_flag_inv (flag, value);
751 }
781} 752}
782 753
783/* 754/*
784 * Remove and free all objects in the inventory of the given object. 755 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 756 * object.c ?
786 */ 757 */
787void 758void
788object::destroy_inv (bool drop_to_ground) 759object::destroy_inv (bool drop_to_ground)
789{ 760{
761 // need to check first, because the checks below might segfault
762 // as we might be on an invalid mapspace and crossfire code
763 // is too buggy to ensure that the inventory is empty.
764 // corollary: if you create arrows etc. with stuff in tis inventory,
765 // cf will crash below with off-map x and y
766 if (!inv)
767 return;
768
790 /* Only if the space blocks everything do we not process - 769 /* Only if the space blocks everything do we not process -
791 * if some form of movement is allowed, let objects 770 * if some form of movement is allowed, let objects
792 * drop on that space. 771 * drop on that space.
793 */ 772 */
794 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 773 if (!drop_to_ground
774 || !map
775 || map->in_memory != MAP_IN_MEMORY
776 || ms ().move_block == MOVE_ALL)
795 { 777 {
796 while (inv) 778 while (inv)
779 {
780 inv->destroy_inv (drop_to_ground);
797 inv->destroy (); 781 inv->destroy ();
782 }
798 } 783 }
799 else 784 else
800 { /* Put objects in inventory onto this space */ 785 { /* Put objects in inventory onto this space */
801 while (inv) 786 while (inv)
802 { 787 {
… …
804 789
805 if (op->flag [FLAG_STARTEQUIP] 790 if (op->flag [FLAG_STARTEQUIP]
806 || op->flag [FLAG_NO_DROP] 791 || op->flag [FLAG_NO_DROP]
807 || op->type == RUNE 792 || op->type == RUNE
808 || op->type == TRAP 793 || op->type == TRAP
809 || op->flag [FLAG_IS_A_TEMPLATE]) 794 || op->flag [FLAG_IS_A_TEMPLATE]
795 || op->flag [FLAG_DESTROY_ON_DEATH])
810 op->destroy (); 796 op->destroy ();
811 else 797 else
812 { 798 map->insert (op, x, y);
813 op->remove ();
814 op->x = x;
815 op->y = y;
816 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
817 }
818 } 799 }
819 } 800 }
820} 801}
821 802
822object *object::create () 803object *object::create ()
… …
838 remove_friendly_object (this); 819 remove_friendly_object (this);
839 820
840 if (!flag [FLAG_REMOVED]) 821 if (!flag [FLAG_REMOVED])
841 remove (); 822 remove ();
842 823
843 if (flag [FLAG_FREED]) 824 destroy_inv (true);
844 return; 825
826 deactivate ();
827 unlink ();
845 828
846 flag [FLAG_FREED] = 1; 829 flag [FLAG_FREED] = 1;
847
848 destroy_inv (true);
849 set_speed (0);
850 unlink ();
851 830
852 // hack to ensure that freed objects still have a valid map 831 // hack to ensure that freed objects still have a valid map
853 { 832 {
854 static maptile *freed_map; // freed objects are moved here to avoid crashes 833 static maptile *freed_map; // freed objects are moved here to avoid crashes
855 834
… …
859 838
860 freed_map->name = "/internal/freed_objects_map"; 839 freed_map->name = "/internal/freed_objects_map";
861 freed_map->width = 3; 840 freed_map->width = 3;
862 freed_map->height = 3; 841 freed_map->height = 3;
863 842
864 freed_map->allocate (); 843 freed_map->alloc ();
844 freed_map->in_memory = MAP_IN_MEMORY;
865 } 845 }
866 846
867 map = freed_map; 847 map = freed_map;
868 x = 1; 848 x = 1;
869 y = 1; 849 y = 1;
… …
879 859
880 // clear those pointers that likely might have circular references to us 860 // clear those pointers that likely might have circular references to us
881 owner = 0; 861 owner = 0;
882 enemy = 0; 862 enemy = 0;
883 attacked_by = 0; 863 attacked_by = 0;
884
885 // only relevant for players(?), but make sure of it anyways
886 contr = 0;
887} 864}
888 865
889void 866void
890object::destroy (bool destroy_inventory) 867object::destroy (bool destroy_inventory)
891{ 868{
… …
954 * to save cpu time. 931 * to save cpu time.
955 */ 932 */
956 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 933 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
957 otmp->update_stats (); 934 otmp->update_stats ();
958 935
959 if (above != NULL) 936 if (above)
960 above->below = below; 937 above->below = below;
961 else 938 else
962 env->inv = below; 939 env->inv = below;
963 940
964 if (below != NULL) 941 if (below)
965 below->above = above; 942 below->above = above;
966 943
967 /* we set up values so that it could be inserted into 944 /* we set up values so that it could be inserted into
968 * the map, but we don't actually do that - it is up 945 * the map, but we don't actually do that - it is up
969 * to the caller to decide what we want to do. 946 * to the caller to decide what we want to do.
… …
973 above = 0, below = 0; 950 above = 0, below = 0;
974 env = 0; 951 env = 0;
975 } 952 }
976 else if (map) 953 else if (map)
977 { 954 {
978 /* Re did the following section of code - it looks like it had 955 if (type == PLAYER)
979 * lots of logic for things we no longer care about
980 */ 956 {
957 --map->players;
958 map->touch ();
959 }
960
961 map->dirty = true;
981 962
982 /* link the object above us */ 963 /* link the object above us */
983 if (above) 964 if (above)
984 above->below = below; 965 above->below = below;
985 else 966 else
… …
1014 if (map->in_memory == MAP_SAVING) 995 if (map->in_memory == MAP_SAVING)
1015 return; 996 return;
1016 997
1017 int check_walk_off = !flag [FLAG_NO_APPLY]; 998 int check_walk_off = !flag [FLAG_NO_APPLY];
1018 999
1019 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1000 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1020 { 1001 {
1021 /* No point updating the players look faces if he is the object 1002 /* No point updating the players look faces if he is the object
1022 * being removed. 1003 * being removed.
1023 */ 1004 */
1024 1005
… …
1036 1017
1037 if (tmp->contr->ns) 1018 if (tmp->contr->ns)
1038 tmp->contr->ns->floorbox_update (); 1019 tmp->contr->ns->floorbox_update ();
1039 } 1020 }
1040 1021
1041 /* See if player moving off should effect something */ 1022 /* See if object moving off should effect something */
1042 if (check_walk_off 1023 if (check_walk_off
1043 && ((move_type & tmp->move_off) 1024 && ((move_type & tmp->move_off)
1044 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1025 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045 { 1026 {
1046 move_apply (tmp, this, 0); 1027 move_apply (tmp, this, 0);
… …
1048 if (destroyed ()) 1029 if (destroyed ())
1049 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1030 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1050 } 1031 }
1051 1032
1052 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1033 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1053 1034 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1054 if (tmp->above == tmp) 1035 if (tmp->above == tmp)
1055 tmp->above = 0; 1036 tmp->above = 0;
1056 1037
1057 last = tmp; 1038 last = tmp;
1058 } 1039 }
1059 1040
1060 /* last == NULL of there are no objects on this space */ 1041 /* last == NULL if there are no objects on this space */
1042 //TODO: this makes little sense, why only update the topmost object?
1061 if (!last) 1043 if (!last)
1062 map->at (x, y).flags_ = P_NEED_UPDATE; 1044 map->at (x, y).flags_ = 0;
1063 else 1045 else
1064 update_object (last, UP_OBJ_REMOVE); 1046 update_object (last, UP_OBJ_REMOVE);
1065 1047
1066 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1048 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1067 update_all_los (map, x, y); 1049 update_all_los (map, x, y);
… …
1110 * job preparing multi-part monsters 1092 * job preparing multi-part monsters
1111 */ 1093 */
1112object * 1094object *
1113insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1095insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1114{ 1096{
1115 object *tmp;
1116
1117 if (op->head)
1118 op = op->head;
1119
1120 for (tmp = op; tmp; tmp = tmp->more) 1097 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1121 { 1098 {
1122 tmp->x = x + tmp->arch->clone.x; 1099 tmp->x = x + tmp->arch->clone.x;
1123 tmp->y = y + tmp->arch->clone.y; 1100 tmp->y = y + tmp->arch->clone.y;
1124 } 1101 }
1125 1102
… …
1156 { 1133 {
1157 LOG (llevError, "Trying to insert freed object!\n"); 1134 LOG (llevError, "Trying to insert freed object!\n");
1158 return NULL; 1135 return NULL;
1159 } 1136 }
1160 1137
1161 if (m == NULL) 1138 if (!m)
1162 { 1139 {
1163 char *dump = dump_object (op); 1140 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1165 free (dump); 1142 free (dump);
1166 return op; 1143 return op;
… …
1193 { 1170 {
1194 /* The part may be on a different map. */ 1171 /* The part may be on a different map. */
1195 1172
1196 object *more = op->more; 1173 object *more = op->more;
1197 1174
1198 /* We really need the caller to normalize coordinates - if 1175 /* We really need the caller to normalise coordinates - if
1199 * we set the map, that doesn't work if the location is within 1176 * we set the map, that doesn't work if the location is within
1200 * a map and this is straddling an edge. So only if coordinate 1177 * a map and this is straddling an edge. So only if coordinate
1201 * is clear wrong do we normalize it. 1178 * is clear wrong do we normalise it.
1202 */ 1179 */
1203 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1180 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1204 more->map = get_map_from_coord (m, &more->x, &more->y); 1181 more->map = get_map_from_coord (m, &more->x, &more->y);
1205 else if (!more->map) 1182 else if (!more->map)
1206 { 1183 {
… …
1230 y = op->y; 1207 y = op->y;
1231 1208
1232 /* this has to be done after we translate the coordinates. 1209 /* this has to be done after we translate the coordinates.
1233 */ 1210 */
1234 if (op->nrof && !(flag & INS_NO_MERGE)) 1211 if (op->nrof && !(flag & INS_NO_MERGE))
1235 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1212 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1236 if (object::can_merge (op, tmp)) 1213 if (object::can_merge (op, tmp))
1237 { 1214 {
1238 op->nrof += tmp->nrof; 1215 op->nrof += tmp->nrof;
1239 tmp->destroy (); 1216 tmp->destroy ();
1240 } 1217 }
… …
1267 else 1244 else
1268 { 1245 {
1269 /* If there are other objects, then */ 1246 /* If there are other objects, then */
1270 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1247 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1271 { 1248 {
1272 object *last = NULL; 1249 object *last = 0;
1273 1250
1274 /* 1251 /*
1275 * If there are multiple objects on this space, we do some trickier handling. 1252 * If there are multiple objects on this space, we do some trickier handling.
1276 * We've already dealt with merging if appropriate. 1253 * We've already dealt with merging if appropriate.
1277 * Generally, we want to put the new object on top. But if 1254 * Generally, we want to put the new object on top. But if
… …
1281 * once we get to them. This reduces the need to traverse over all of 1258 * once we get to them. This reduces the need to traverse over all of
1282 * them when adding another one - this saves quite a bit of cpu time 1259 * them when adding another one - this saves quite a bit of cpu time
1283 * when lots of spells are cast in one area. Currently, it is presumed 1260 * when lots of spells are cast in one area. Currently, it is presumed
1284 * that flying non pickable objects are spell objects. 1261 * that flying non pickable objects are spell objects.
1285 */ 1262 */
1286
1287 while (top != NULL) 1263 while (top)
1288 { 1264 {
1289 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1265 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1290 floor = top; 1266 floor = top;
1291 1267
1292 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1268 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1345 op->above = GET_MAP_OB (op->map, op->x, op->y); 1321 op->above = GET_MAP_OB (op->map, op->x, op->y);
1346 1322
1347 if (op->above) 1323 if (op->above)
1348 op->above->below = op; 1324 op->above->below = op;
1349 1325
1350 op->below = NULL; 1326 op->below = 0;
1351 op->ms ().bot = op; 1327 op->ms ().bot = op;
1352 } 1328 }
1353 else 1329 else
1354 { /* get inserted into the stack above top */ 1330 { /* get inserted into the stack above top */
1355 op->above = top->above; 1331 op->above = top->above;
… …
1359 1335
1360 op->below = top; 1336 op->below = top;
1361 top->above = op; 1337 top->above = op;
1362 } 1338 }
1363 1339
1364 if (op->above == NULL) 1340 if (!op->above)
1365 op->ms ().top = op; 1341 op->ms ().top = op;
1366 } /* else not INS_BELOW_ORIGINATOR */ 1342 } /* else not INS_BELOW_ORIGINATOR */
1367 1343
1368 if (op->type == PLAYER) 1344 if (op->type == PLAYER)
1345 {
1369 op->contr->do_los = 1; 1346 op->contr->do_los = 1;
1347 ++op->map->players;
1348 op->map->touch ();
1349 }
1350
1351 op->map->dirty = true;
1370 1352
1371 /* If we have a floor, we know the player, if any, will be above 1353 /* If we have a floor, we know the player, if any, will be above
1372 * it, so save a few ticks and start from there. 1354 * it, so save a few ticks and start from there.
1373 */ 1355 */
1374 if (!(flag & INS_MAP_LOAD)) 1356 if (!(flag & INS_MAP_LOAD))
… …
1380 * visible to others on this map. But update_all_los is really 1362 * visible to others on this map. But update_all_los is really
1381 * an inefficient way to do this, as it means los for all players 1363 * an inefficient way to do this, as it means los for all players
1382 * on the map will get recalculated. The players could very well 1364 * on the map will get recalculated. The players could very well
1383 * be far away from this change and not affected in any way - 1365 * be far away from this change and not affected in any way -
1384 * this should get redone to only look for players within range, 1366 * this should get redone to only look for players within range,
1385 * or just updating the P_NEED_UPDATE for spaces within this area 1367 * or just updating the P_UPTODATE for spaces within this area
1386 * of effect may be sufficient. 1368 * of effect may be sufficient.
1387 */ 1369 */
1388 if (op->map->darkness && (op->glow_radius != 0)) 1370 if (op->map->darkness && (op->glow_radius != 0))
1389 update_all_los (op->map, op->x, op->y); 1371 update_all_los (op->map, op->x, op->y);
1390 1372
… …
1428{ 1410{
1429 object *tmp, *tmp1; 1411 object *tmp, *tmp1;
1430 1412
1431 /* first search for itself and remove any old instances */ 1413 /* first search for itself and remove any old instances */
1432 1414
1433 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1415 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1434 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1416 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1435 tmp->destroy (); 1417 tmp->destroy ();
1436 1418
1437 tmp1 = arch_to_object (archetype::find (arch_string)); 1419 tmp1 = arch_to_object (archetype::find (arch_string));
1438 1420
1439 tmp1->x = op->x; 1421 tmp1->x = op->x;
1440 tmp1->y = op->y; 1422 tmp1->y = op->y;
1441 insert_ob_in_map (tmp1, op->map, op, 0); 1423 insert_ob_in_map (tmp1, op->map, op, 0);
1424}
1425
1426object *
1427object::insert_at (object *where, object *originator, int flags)
1428{
1429 where->map->insert (this, where->x, where->y, originator, flags);
1442} 1430}
1443 1431
1444/* 1432/*
1445 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1433 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1446 * is returned contains nr objects, and the remaining parts contains 1434 * is returned contains nr objects, and the remaining parts contains
1447 * the rest (or is removed and freed if that number is 0). 1435 * the rest (or is removed and freed if that number is 0).
1448 * On failure, NULL is returned, and the reason put into the 1436 * On failure, NULL is returned, and the reason put into the
1449 * global static errmsg array. 1437 * global static errmsg array.
1450 */ 1438 */
1451
1452object * 1439object *
1453get_split_ob (object *orig_ob, uint32 nr) 1440get_split_ob (object *orig_ob, uint32 nr)
1454{ 1441{
1455 object *newob; 1442 object *newob;
1456 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1443 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1720 * 1707 *
1721 * MSW 2001-07-08: Check all objects on space, not just those below 1708 * MSW 2001-07-08: Check all objects on space, not just those below
1722 * object being inserted. insert_ob_in_map may not put new objects 1709 * object being inserted. insert_ob_in_map may not put new objects
1723 * on top. 1710 * on top.
1724 */ 1711 */
1725
1726int 1712int
1727check_move_on (object *op, object *originator) 1713check_move_on (object *op, object *originator)
1728{ 1714{
1729 object *tmp; 1715 object *tmp;
1730 maptile *m = op->map; 1716 maptile *m = op->map;
… …
1757 1743
1758 /* The objects have to be checked from top to bottom. 1744 /* The objects have to be checked from top to bottom.
1759 * Hence, we first go to the top: 1745 * Hence, we first go to the top:
1760 */ 1746 */
1761 1747
1762 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1748 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1763 { 1749 {
1764 /* Trim the search when we find the first other spell effect 1750 /* Trim the search when we find the first other spell effect
1765 * this helps performance so that if a space has 50 spell objects, 1751 * this helps performance so that if a space has 50 spell objects,
1766 * we don't need to check all of them. 1752 * we don't need to check all of them.
1767 */ 1753 */
… …
1825 * The first matching object is returned, or NULL if none. 1811 * The first matching object is returned, or NULL if none.
1826 */ 1812 */
1827object * 1813object *
1828present_arch (const archetype *at, maptile *m, int x, int y) 1814present_arch (const archetype *at, maptile *m, int x, int y)
1829{ 1815{
1830 if (m == NULL || out_of_map (m, x, y)) 1816 if (!m || out_of_map (m, x, y))
1831 { 1817 {
1832 LOG (llevError, "Present_arch called outside map.\n"); 1818 LOG (llevError, "Present_arch called outside map.\n");
1833 return NULL; 1819 return NULL;
1834 } 1820 }
1835 1821
1836 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1822 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837 if (tmp->arch == at) 1823 if (tmp->arch == at)
1838 return tmp; 1824 return tmp;
1839 1825
1840 return NULL; 1826 return NULL;
1841} 1827}
… …
1852 { 1838 {
1853 LOG (llevError, "Present called outside map.\n"); 1839 LOG (llevError, "Present called outside map.\n");
1854 return NULL; 1840 return NULL;
1855 } 1841 }
1856 1842
1857 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1843 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1858 if (tmp->type == type) 1844 if (tmp->type == type)
1859 return tmp; 1845 return tmp;
1860 1846
1861 return NULL; 1847 return NULL;
1862} 1848}
… …
2587 } 2573 }
2588 else 2574 else
2589 item = item->env; 2575 item = item->env;
2590} 2576}
2591 2577
2578
2579const char *
2580object::flag_desc (char *desc, int len) const
2581{
2582 char *p = desc;
2583 bool first = true;
2584
2585 *p = 0;
2586
2587 for (int i = 0; i < NUM_FLAGS; i++)
2588 {
2589 if (len <= 10) // magic constant!
2590 {
2591 snprintf (p, len, ",...");
2592 break;
2593 }
2594
2595 if (flag [i])
2596 {
2597 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2598 len -= cnt;
2599 p += cnt;
2600 first = false;
2601 }
2602 }
2603
2604 return desc;
2605}
2606
2592// return a suitable string describing an objetc in enough detail to find it 2607// return a suitable string describing an object in enough detail to find it
2593const char * 2608const char *
2594object::debug_desc (char *info) const 2609object::debug_desc (char *info) const
2595{ 2610{
2611 char flagdesc[512];
2596 char info2[256 * 3]; 2612 char info2[256 * 4];
2597 char *p = info; 2613 char *p = info;
2598 2614
2599 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2615 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2600 count, 2616 count, uuid.seq,
2601 &name, 2617 &name,
2602 title ? " " : "", 2618 title ? "\",title:" : "",
2603 title ? (const char *)title : ""); 2619 title ? (const char *)title : "",
2620 flag_desc (flagdesc, 512), type);
2604 2621
2605 if (env) 2622 if (env)
2606 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2623 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2607 2624
2608 if (map) 2625 if (map)
2609 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2626 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2610 2627
2611 return info; 2628 return info;
2612} 2629}
2613 2630
2614const char * 2631const char *
2615object::debug_desc () const 2632object::debug_desc () const
2616{ 2633{
2617 static char info[256 * 3]; 2634 static char info[256 * 4];
2618 return debug_desc (info); 2635 return debug_desc (info);
2619} 2636}
2620 2637

Diff Legend

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