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.94 by root, Wed Dec 27 05:22:35 2006 UTC vs.
Revision 1.112 by root, Mon Jan 8 14:11:04 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; 665object *object::first;
742 666
743object::object () 667object::object ()
744{ 668{
745 SET_FLAG (this, FLAG_REMOVED); 669 SET_FLAG (this, FLAG_REMOVED);
… …
751object::~object () 675object::~object ()
752{ 676{
753 free_key_values (this); 677 free_key_values (this);
754} 678}
755 679
680static int object_count;
681
756void object::link () 682void object::link ()
757{ 683{
758 count = ++ob_count; 684 assert (!index);//D
759 uuid = gen_uuid (); 685 uuid = gen_uuid ();
686 count = ++object_count;
760 687
761 prev = 0; 688 refcnt_inc ();
762 next = object::first; 689 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 690}
769 691
770void object::unlink () 692void object::unlink ()
771{ 693{
772 if (this == object::first) 694 assert (index);//D
773 object::first = next; 695 objects.erase (this);
696 refcnt_dec ();
697}
774 698
775 /* Remove this object from the list of used objects */ 699void
776 if (prev) prev->next = next; 700object::activate ()
777 if (next) next->prev = prev; 701{
702 /* If already on active list, don't do anything */
703 if (active)
704 return;
778 705
779 prev = 0; 706 if (has_active_speed ())
780 next = 0; 707 actives.insert (this);
708}
709
710void
711object::activate_recursive ()
712{
713 activate ();
714
715 for (object *op = inv; op; op = op->below)
716 op->activate_recursive ();
717}
718
719/* This function removes object 'op' from the list of active
720 * objects.
721 * This should only be used for style maps or other such
722 * reference maps where you don't want an object that isn't
723 * in play chewing up cpu time getting processed.
724 * The reverse of this is to call update_ob_speed, which
725 * will do the right thing based on the speed of the object.
726 */
727void
728object::deactivate ()
729{
730 /* If not on the active list, nothing needs to be done */
731 if (!active)
732 return;
733
734 actives.erase (this);
735}
736
737void
738object::deactivate_recursive ()
739{
740 for (object *op = inv; op; op = op->below)
741 op->deactivate_recursive ();
742
743 deactivate ();
744}
745
746void
747object::set_flag_inv (int flag, int value)
748{
749 for (object *op = inv; op; op = op->below)
750 {
751 op->flag [flag] = value;
752 op->set_flag_inv (flag, value);
753 }
781} 754}
782 755
783/* 756/*
784 * Remove and free all objects in the inventory of the given object. 757 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 758 * object.c ?
… …
800 * drop on that space. 773 * drop on that space.
801 */ 774 */
802 if (!drop_to_ground 775 if (!drop_to_ground
803 || !map 776 || !map
804 || map->in_memory != MAP_IN_MEMORY 777 || map->in_memory != MAP_IN_MEMORY
805 || map->at (x, y).move_block == MOVE_ALL) 778 || ms ().move_block == MOVE_ALL)
806 { 779 {
807 while (inv) 780 while (inv)
808 { 781 {
809 inv->destroy_inv (drop_to_ground); 782 inv->destroy_inv (drop_to_ground);
810 inv->destroy (); 783 inv->destroy ();
… …
818 791
819 if (op->flag [FLAG_STARTEQUIP] 792 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 793 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 794 || op->type == RUNE
822 || op->type == TRAP 795 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 796 || op->flag [FLAG_IS_A_TEMPLATE]
797 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 798 op->destroy ();
825 else 799 else
826 map->insert (op, x, y); 800 map->insert (op, x, y);
827 } 801 }
828 } 802 }
… …
836} 810}
837 811
838void 812void
839object::do_destroy () 813object::do_destroy ()
840{ 814{
815 attachable::do_destroy ();
816
841 if (flag [FLAG_IS_LINKED]) 817 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this); 818 remove_button_link (this);
843 819
844 if (flag [FLAG_FRIENDLY]) 820 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this); 821 remove_friendly_object (this);
846 822
847 if (!flag [FLAG_REMOVED]) 823 if (!flag [FLAG_REMOVED])
848 remove (); 824 remove ();
849 825
850 if (flag [FLAG_FREED]) 826 destroy_inv (true);
851 return;
852 827
853 set_speed (0); 828 deactivate ();
829 unlink ();
854 830
855 flag [FLAG_FREED] = 1; 831 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861 832
862 // hack to ensure that freed objects still have a valid map 833 // hack to ensure that freed objects still have a valid map
863 { 834 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes 835 static maptile *freed_map; // freed objects are moved here to avoid crashes
865 836
… …
869 840
870 freed_map->name = "/internal/freed_objects_map"; 841 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 842 freed_map->width = 3;
872 freed_map->height = 3; 843 freed_map->height = 3;
873 844
874 freed_map->allocate (); 845 freed_map->alloc ();
846 freed_map->in_memory = MAP_IN_MEMORY;
875 } 847 }
876 848
877 map = freed_map; 849 map = freed_map;
878 x = 1; 850 x = 1;
879 y = 1; 851 y = 1;
… …
889 861
890 // clear those pointers that likely might have circular references to us 862 // clear those pointers that likely might have circular references to us
891 owner = 0; 863 owner = 0;
892 enemy = 0; 864 enemy = 0;
893 attacked_by = 0; 865 attacked_by = 0;
894
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
897} 866}
898 867
899void 868void
900object::destroy (bool destroy_inventory) 869object::destroy (bool destroy_inventory)
901{ 870{
… …
964 * to save cpu time. 933 * to save cpu time.
965 */ 934 */
966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 935 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967 otmp->update_stats (); 936 otmp->update_stats ();
968 937
969 if (above != NULL) 938 if (above)
970 above->below = below; 939 above->below = below;
971 else 940 else
972 env->inv = below; 941 env->inv = below;
973 942
974 if (below != NULL) 943 if (below)
975 below->above = above; 944 below->above = above;
976 945
977 /* we set up values so that it could be inserted into 946 /* we set up values so that it could be inserted into
978 * the map, but we don't actually do that - it is up 947 * the map, but we don't actually do that - it is up
979 * to the caller to decide what we want to do. 948 * to the caller to decide what we want to do.
… …
983 above = 0, below = 0; 952 above = 0, below = 0;
984 env = 0; 953 env = 0;
985 } 954 }
986 else if (map) 955 else if (map)
987 { 956 {
988 /* Re did the following section of code - it looks like it had 957 if (type == PLAYER)
989 * lots of logic for things we no longer care about
990 */ 958 {
959 --map->players;
960 map->touch ();
961 }
962
963 map->dirty = true;
991 964
992 /* link the object above us */ 965 /* link the object above us */
993 if (above) 966 if (above)
994 above->below = below; 967 above->below = below;
995 else 968 else
… …
1046 1019
1047 if (tmp->contr->ns) 1020 if (tmp->contr->ns)
1048 tmp->contr->ns->floorbox_update (); 1021 tmp->contr->ns->floorbox_update ();
1049 } 1022 }
1050 1023
1051 /* See if player moving off should effect something */ 1024 /* See if object moving off should effect something */
1052 if (check_walk_off 1025 if (check_walk_off
1053 && ((move_type & tmp->move_off) 1026 && ((move_type & tmp->move_off)
1054 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1027 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1055 { 1028 {
1056 move_apply (tmp, this, 0); 1029 move_apply (tmp, this, 0);
… …
1058 if (destroyed ()) 1031 if (destroyed ())
1059 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1032 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1060 } 1033 }
1061 1034
1062 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1035 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1063 1036 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1064 if (tmp->above == tmp) 1037 if (tmp->above == tmp)
1065 tmp->above = 0; 1038 tmp->above = 0;
1066 1039
1067 last = tmp; 1040 last = tmp;
1068 } 1041 }
1069 1042
1070 /* last == NULL of there are no objects on this space */ 1043 /* last == NULL if there are no objects on this space */
1044 //TODO: this makes little sense, why only update the topmost object?
1071 if (!last) 1045 if (!last)
1072 map->at (x, y).flags_ = P_NEED_UPDATE; 1046 map->at (x, y).flags_ = 0;
1073 else 1047 else
1074 update_object (last, UP_OBJ_REMOVE); 1048 update_object (last, UP_OBJ_REMOVE);
1075 1049
1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1050 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1077 update_all_los (map, x, y); 1051 update_all_los (map, x, y);
… …
1161 { 1135 {
1162 LOG (llevError, "Trying to insert freed object!\n"); 1136 LOG (llevError, "Trying to insert freed object!\n");
1163 return NULL; 1137 return NULL;
1164 } 1138 }
1165 1139
1166 if (m == NULL) 1140 if (!m)
1167 { 1141 {
1168 char *dump = dump_object (op); 1142 char *dump = dump_object (op);
1169 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1170 free (dump); 1144 free (dump);
1171 return op; 1145 return op;
… …
1198 { 1172 {
1199 /* The part may be on a different map. */ 1173 /* The part may be on a different map. */
1200 1174
1201 object *more = op->more; 1175 object *more = op->more;
1202 1176
1203 /* We really need the caller to normalize coordinates - if 1177 /* We really need the caller to normalise coordinates - if
1204 * we set the map, that doesn't work if the location is within 1178 * we set the map, that doesn't work if the location is within
1205 * a map and this is straddling an edge. So only if coordinate 1179 * a map and this is straddling an edge. So only if coordinate
1206 * is clear wrong do we normalize it. 1180 * is clear wrong do we normalise it.
1207 */ 1181 */
1208 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1182 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1209 more->map = get_map_from_coord (m, &more->x, &more->y); 1183 more->map = get_map_from_coord (m, &more->x, &more->y);
1210 else if (!more->map) 1184 else if (!more->map)
1211 { 1185 {
… …
1235 y = op->y; 1209 y = op->y;
1236 1210
1237 /* this has to be done after we translate the coordinates. 1211 /* this has to be done after we translate the coordinates.
1238 */ 1212 */
1239 if (op->nrof && !(flag & INS_NO_MERGE)) 1213 if (op->nrof && !(flag & INS_NO_MERGE))
1240 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1214 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1241 if (object::can_merge (op, tmp)) 1215 if (object::can_merge (op, tmp))
1242 { 1216 {
1243 op->nrof += tmp->nrof; 1217 op->nrof += tmp->nrof;
1244 tmp->destroy (); 1218 tmp->destroy ();
1245 } 1219 }
… …
1272 else 1246 else
1273 { 1247 {
1274 /* If there are other objects, then */ 1248 /* If there are other objects, then */
1275 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1249 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1276 { 1250 {
1277 object *last = NULL; 1251 object *last = 0;
1278 1252
1279 /* 1253 /*
1280 * If there are multiple objects on this space, we do some trickier handling. 1254 * If there are multiple objects on this space, we do some trickier handling.
1281 * We've already dealt with merging if appropriate. 1255 * We've already dealt with merging if appropriate.
1282 * Generally, we want to put the new object on top. But if 1256 * Generally, we want to put the new object on top. But if
… …
1286 * once we get to them. This reduces the need to traverse over all of 1260 * once we get to them. This reduces the need to traverse over all of
1287 * them when adding another one - this saves quite a bit of cpu time 1261 * them when adding another one - this saves quite a bit of cpu time
1288 * when lots of spells are cast in one area. Currently, it is presumed 1262 * when lots of spells are cast in one area. Currently, it is presumed
1289 * that flying non pickable objects are spell objects. 1263 * that flying non pickable objects are spell objects.
1290 */ 1264 */
1291
1292 while (top != NULL) 1265 while (top)
1293 { 1266 {
1294 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1267 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1295 floor = top; 1268 floor = top;
1296 1269
1297 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1270 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1350 op->above = GET_MAP_OB (op->map, op->x, op->y); 1323 op->above = GET_MAP_OB (op->map, op->x, op->y);
1351 1324
1352 if (op->above) 1325 if (op->above)
1353 op->above->below = op; 1326 op->above->below = op;
1354 1327
1355 op->below = NULL; 1328 op->below = 0;
1356 op->ms ().bot = op; 1329 op->ms ().bot = op;
1357 } 1330 }
1358 else 1331 else
1359 { /* get inserted into the stack above top */ 1332 { /* get inserted into the stack above top */
1360 op->above = top->above; 1333 op->above = top->above;
… …
1364 1337
1365 op->below = top; 1338 op->below = top;
1366 top->above = op; 1339 top->above = op;
1367 } 1340 }
1368 1341
1369 if (op->above == NULL) 1342 if (!op->above)
1370 op->ms ().top = op; 1343 op->ms ().top = op;
1371 } /* else not INS_BELOW_ORIGINATOR */ 1344 } /* else not INS_BELOW_ORIGINATOR */
1372 1345
1373 if (op->type == PLAYER) 1346 if (op->type == PLAYER)
1347 {
1374 op->contr->do_los = 1; 1348 op->contr->do_los = 1;
1349 ++op->map->players;
1350 op->map->touch ();
1351 }
1352
1353 op->map->dirty = true;
1375 1354
1376 /* If we have a floor, we know the player, if any, will be above 1355 /* If we have a floor, we know the player, if any, will be above
1377 * it, so save a few ticks and start from there. 1356 * it, so save a few ticks and start from there.
1378 */ 1357 */
1379 if (!(flag & INS_MAP_LOAD)) 1358 if (!(flag & INS_MAP_LOAD))
… …
1385 * visible to others on this map. But update_all_los is really 1364 * visible to others on this map. But update_all_los is really
1386 * an inefficient way to do this, as it means los for all players 1365 * an inefficient way to do this, as it means los for all players
1387 * on the map will get recalculated. The players could very well 1366 * on the map will get recalculated. The players could very well
1388 * be far away from this change and not affected in any way - 1367 * be far away from this change and not affected in any way -
1389 * this should get redone to only look for players within range, 1368 * this should get redone to only look for players within range,
1390 * or just updating the P_NEED_UPDATE for spaces within this area 1369 * or just updating the P_UPTODATE for spaces within this area
1391 * of effect may be sufficient. 1370 * of effect may be sufficient.
1392 */ 1371 */
1393 if (op->map->darkness && (op->glow_radius != 0)) 1372 if (op->map->darkness && (op->glow_radius != 0))
1394 update_all_los (op->map, op->x, op->y); 1373 update_all_los (op->map, op->x, op->y);
1395 1374
… …
1433{ 1412{
1434 object *tmp, *tmp1; 1413 object *tmp, *tmp1;
1435 1414
1436 /* first search for itself and remove any old instances */ 1415 /* first search for itself and remove any old instances */
1437 1416
1438 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1417 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1439 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1418 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1440 tmp->destroy (); 1419 tmp->destroy ();
1441 1420
1442 tmp1 = arch_to_object (archetype::find (arch_string)); 1421 tmp1 = arch_to_object (archetype::find (arch_string));
1443 1422
… …
1766 1745
1767 /* The objects have to be checked from top to bottom. 1746 /* The objects have to be checked from top to bottom.
1768 * Hence, we first go to the top: 1747 * Hence, we first go to the top:
1769 */ 1748 */
1770 1749
1771 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1750 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1772 { 1751 {
1773 /* Trim the search when we find the first other spell effect 1752 /* Trim the search when we find the first other spell effect
1774 * this helps performance so that if a space has 50 spell objects, 1753 * this helps performance so that if a space has 50 spell objects,
1775 * we don't need to check all of them. 1754 * we don't need to check all of them.
1776 */ 1755 */
… …
1834 * The first matching object is returned, or NULL if none. 1813 * The first matching object is returned, or NULL if none.
1835 */ 1814 */
1836object * 1815object *
1837present_arch (const archetype *at, maptile *m, int x, int y) 1816present_arch (const archetype *at, maptile *m, int x, int y)
1838{ 1817{
1839 if (m == NULL || out_of_map (m, x, y)) 1818 if (!m || out_of_map (m, x, y))
1840 { 1819 {
1841 LOG (llevError, "Present_arch called outside map.\n"); 1820 LOG (llevError, "Present_arch called outside map.\n");
1842 return NULL; 1821 return NULL;
1843 } 1822 }
1844 1823
1845 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1824 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1846 if (tmp->arch == at) 1825 if (tmp->arch == at)
1847 return tmp; 1826 return tmp;
1848 1827
1849 return NULL; 1828 return NULL;
1850} 1829}
… …
1861 { 1840 {
1862 LOG (llevError, "Present called outside map.\n"); 1841 LOG (llevError, "Present called outside map.\n");
1863 return NULL; 1842 return NULL;
1864 } 1843 }
1865 1844
1866 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1845 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1867 if (tmp->type == type) 1846 if (tmp->type == type)
1868 return tmp; 1847 return tmp;
1869 1848
1870 return NULL; 1849 return NULL;
1871} 1850}
… …
2596 } 2575 }
2597 else 2576 else
2598 item = item->env; 2577 item = item->env;
2599} 2578}
2600 2579
2580
2581const char *
2582object::flag_desc (char *desc, int len) const
2583{
2584 char *p = desc;
2585 bool first = true;
2586
2587 *p = 0;
2588
2589 for (int i = 0; i < NUM_FLAGS; i++)
2590 {
2591 if (len <= 10) // magic constant!
2592 {
2593 snprintf (p, len, ",...");
2594 break;
2595 }
2596
2597 if (flag [i])
2598 {
2599 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2600 len -= cnt;
2601 p += cnt;
2602 first = false;
2603 }
2604 }
2605
2606 return desc;
2607}
2608
2601// return a suitable string describing an objetc in enough detail to find it 2609// return a suitable string describing an object in enough detail to find it
2602const char * 2610const char *
2603object::debug_desc (char *info) const 2611object::debug_desc (char *info) const
2604{ 2612{
2613 char flagdesc[512];
2605 char info2[256 * 3]; 2614 char info2[256 * 4];
2606 char *p = info; 2615 char *p = info;
2607 2616
2608 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2617 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2609 count, 2618 count, uuid.seq,
2610 &name, 2619 &name,
2611 title ? " " : "", 2620 title ? "\",title:" : "",
2612 title ? (const char *)title : ""); 2621 title ? (const char *)title : "",
2622 flag_desc (flagdesc, 512), type);
2613 2623
2614 if (env) 2624 if (env)
2615 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2616 2626
2617 if (map) 2627 if (map)
2618 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2628 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2619 2629
2620 return info; 2630 return info;
2621} 2631}
2622 2632
2623const char * 2633const char *
2624object::debug_desc () const 2634object::debug_desc () const
2625{ 2635{
2626 static char info[256 * 3]; 2636 static char info[256 * 4];
2627 return debug_desc (info); 2637 return debug_desc (info);
2628} 2638}
2629 2639

Diff Legend

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