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.95 by root, Wed Dec 27 05:42:08 2006 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 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 return ((unsigned int)i) < objects.size ()
401 if (op->count == i) 401 ? objects [i]
402 return op; 402 : 0;
403
404 return 0;
405} 403}
406 404
407/* 405/*
408 * Returns the first object which has a name equal to the argument. 406 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 407 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 408 * Enables features like "patch <name-of-other-player> food 999"
411 */ 409 */
412
413object * 410object *
414find_object_name (const char *str) 411find_object_name (const char *str)
415{ 412{
416 shstr_cmp str_ (str); 413 shstr_cmp str_ (str);
417 object *op; 414 object *op;
418 415
419 for (op = object::first; op != NULL; op = op->next) 416 for_all_objects (op)
420 if (op->name == str_) 417 if (op->name == str_)
421 break; 418 break;
422 419
423 return op; 420 return op;
424} 421}
… …
538/* 535/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 536 * 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 537 * 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. 538 * be called to update the face variable, _and_ how it looks on the map.
542 */ 539 */
543
544void 540void
545update_turn_face (object *op) 541update_turn_face (object *op)
546{ 542{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 543 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 544 return;
545
549 SET_ANIMATION (op, op->direction); 546 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 547 update_object (op, UP_OBJ_FACE);
551} 548}
552 549
553/* 550/*
… …
556 * This function needs to be called whenever the speed of an object changes. 553 * This function needs to be called whenever the speed of an object changes.
557 */ 554 */
558void 555void
559object::set_speed (float speed) 556object::set_speed (float speed)
560{ 557{
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) 558 if (flag [FLAG_FREED] && speed)
567 { 559 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name); 560 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0; 561 speed = 0;
570 } 562 }
571 563
572 this->speed = speed; 564 this->speed = speed;
573 565
574 if (arch_init) 566 if (has_active_speed ())
575 return; 567 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 568 else
593 { 569 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} 570}
648 571
649/* 572/*
650 * update_object() updates the the map. 573 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 574 * It takes into account invisible objects (and represent squares covered
… …
699 return; 622 return;
700 } 623 }
701 624
702 mapspace &m = op->ms (); 625 mapspace &m = op->ms ();
703 626
704 if (m.flags_ & P_NEED_UPDATE) 627 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 628 /* nop */;
706 else if (action == UP_OBJ_INSERT) 629 else if (action == UP_OBJ_INSERT)
707 { 630 {
708 // this is likely overkill, TODO: revisit (schmorp) 631 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 632 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 641 /* This isn't perfect, but I don't expect a lot of objects to
719 * to have move_allow right now. 642 * to have move_allow right now.
720 */ 643 */
721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 644 || ((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) 645 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723 m.flags_ = P_NEED_UPDATE; 646 m.flags_ = 0;
724 } 647 }
725 /* if the object is being removed, we can't make intelligent 648 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 649 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 650 * that is being removed.
728 */ 651 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 652 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 653 m.flags_ = 0;
731 else if (action == UP_OBJ_FACE) 654 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 655 /* Nothing to do for that case */ ;
733 else 656 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 657 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 658
736 if (op->more) 659 if (op->more)
737 update_object (op->more, action); 660 update_object (op->more, action);
738} 661}
739 662
740object::vector object::objects; // not yet used
741object *object::first; 663object *object::first;
742 664
743object::object () 665object::object ()
744{ 666{
745 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
… …
753 free_key_values (this); 675 free_key_values (this);
754} 676}
755 677
756void object::link () 678void object::link ()
757{ 679{
758 count = ++ob_count;
759 uuid = gen_uuid (); 680 uuid = gen_uuid ();
760 681
761 prev = 0; 682 refcnt_inc ();
762 next = object::first; 683 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 684}
769 685
770void object::unlink () 686void object::unlink ()
771{ 687{
772 if (this == object::first) 688 objects.erase (this);
773 object::first = next; 689 refcnt_dec ();
690}
774 691
775 /* Remove this object from the list of used objects */ 692void
776 if (prev) prev->next = next; 693object::activate ()
777 if (next) next->prev = prev; 694{
695 /* If already on active list, don't do anything */
696 if (active)
697 return;
778 698
779 prev = 0; 699 if (has_active_speed ())
780 next = 0; 700 actives.insert (this);
701}
702
703void
704object::activate_recursive ()
705{
706 activate ();
707
708 for (object *op = inv; op; op = op->below)
709 op->activate_recursive ();
710}
711
712/* This function removes object 'op' from the list of active
713 * objects.
714 * This should only be used for style maps or other such
715 * reference maps where you don't want an object that isn't
716 * in play chewing up cpu time getting processed.
717 * The reverse of this is to call update_ob_speed, which
718 * will do the right thing based on the speed of the object.
719 */
720void
721object::deactivate ()
722{
723 /* If not on the active list, nothing needs to be done */
724 if (!active)
725 return;
726
727 actives.erase (this);
728}
729
730void
731object::deactivate_recursive ()
732{
733 for (object *op = inv; op; op = op->below)
734 op->deactivate_recursive ();
735
736 deactivate ();
737}
738
739void
740object::set_flag_inv (int flag, int value)
741{
742 for (object *op = inv; op; op = op->below)
743 {
744 op->flag [flag] = value;
745 op->set_flag_inv (flag, value);
746 }
781} 747}
782 748
783/* 749/*
784 * Remove and free all objects in the inventory of the given object. 750 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 751 * object.c ?
… …
818 784
819 if (op->flag [FLAG_STARTEQUIP] 785 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 786 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 787 || op->type == RUNE
822 || op->type == TRAP 788 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 789 || op->flag [FLAG_IS_A_TEMPLATE]
790 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 791 op->destroy ();
825 else 792 else
826 map->insert (op, x, y); 793 map->insert (op, x, y);
827 } 794 }
828 } 795 }
… …
869 836
870 freed_map->name = "/internal/freed_objects_map"; 837 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 838 freed_map->width = 3;
872 freed_map->height = 3; 839 freed_map->height = 3;
873 840
874 freed_map->allocate (); 841 freed_map->alloc ();
842 freed_map->in_memory = MAP_IN_MEMORY;
875 } 843 }
876 844
877 map = freed_map; 845 map = freed_map;
878 x = 1; 846 x = 1;
879 y = 1; 847 y = 1;
… …
889 857
890 // clear those pointers that likely might have circular references to us 858 // clear those pointers that likely might have circular references to us
891 owner = 0; 859 owner = 0;
892 enemy = 0; 860 enemy = 0;
893 attacked_by = 0; 861 attacked_by = 0;
894
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
897} 862}
898 863
899void 864void
900object::destroy (bool destroy_inventory) 865object::destroy (bool destroy_inventory)
901{ 866{
… …
964 * to save cpu time. 929 * to save cpu time.
965 */ 930 */
966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 931 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967 otmp->update_stats (); 932 otmp->update_stats ();
968 933
969 if (above != NULL) 934 if (above)
970 above->below = below; 935 above->below = below;
971 else 936 else
972 env->inv = below; 937 env->inv = below;
973 938
974 if (below != NULL) 939 if (below)
975 below->above = above; 940 below->above = above;
976 941
977 /* we set up values so that it could be inserted into 942 /* we set up values so that it could be inserted into
978 * the map, but we don't actually do that - it is up 943 * the map, but we don't actually do that - it is up
979 * to the caller to decide what we want to do. 944 * to the caller to decide what we want to do.
… …
983 above = 0, below = 0; 948 above = 0, below = 0;
984 env = 0; 949 env = 0;
985 } 950 }
986 else if (map) 951 else if (map)
987 { 952 {
988 /* Re did the following section of code - it looks like it had 953 if (type == PLAYER)
989 * lots of logic for things we no longer care about
990 */ 954 {
955 --map->players;
956 map->touch ();
957 }
958
959 map->dirty = true;
991 960
992 /* link the object above us */ 961 /* link the object above us */
993 if (above) 962 if (above)
994 above->below = below; 963 above->below = below;
995 else 964 else
… …
1046 1015
1047 if (tmp->contr->ns) 1016 if (tmp->contr->ns)
1048 tmp->contr->ns->floorbox_update (); 1017 tmp->contr->ns->floorbox_update ();
1049 } 1018 }
1050 1019
1051 /* See if player moving off should effect something */ 1020 /* See if object moving off should effect something */
1052 if (check_walk_off 1021 if (check_walk_off
1053 && ((move_type & tmp->move_off) 1022 && ((move_type & tmp->move_off)
1054 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1023 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1055 { 1024 {
1056 move_apply (tmp, this, 0); 1025 move_apply (tmp, this, 0);
… …
1058 if (destroyed ()) 1027 if (destroyed ())
1059 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1028 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1060 } 1029 }
1061 1030
1062 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1031 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1063 1032 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1064 if (tmp->above == tmp) 1033 if (tmp->above == tmp)
1065 tmp->above = 0; 1034 tmp->above = 0;
1066 1035
1067 last = tmp; 1036 last = tmp;
1068 } 1037 }
1069 1038
1070 /* last == NULL of there are no objects on this space */ 1039 /* last == NULL if there are no objects on this space */
1040 //TODO: this makes little sense, why only update the topmost object?
1071 if (!last) 1041 if (!last)
1072 map->at (x, y).flags_ = P_NEED_UPDATE; 1042 map->at (x, y).flags_ = 0;
1073 else 1043 else
1074 update_object (last, UP_OBJ_REMOVE); 1044 update_object (last, UP_OBJ_REMOVE);
1075 1045
1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1046 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1077 update_all_los (map, x, y); 1047 update_all_los (map, x, y);
… …
1161 { 1131 {
1162 LOG (llevError, "Trying to insert freed object!\n"); 1132 LOG (llevError, "Trying to insert freed object!\n");
1163 return NULL; 1133 return NULL;
1164 } 1134 }
1165 1135
1166 if (m == NULL) 1136 if (!m)
1167 { 1137 {
1168 char *dump = dump_object (op); 1138 char *dump = dump_object (op);
1169 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1139 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1170 free (dump); 1140 free (dump);
1171 return op; 1141 return op;
… …
1198 { 1168 {
1199 /* The part may be on a different map. */ 1169 /* The part may be on a different map. */
1200 1170
1201 object *more = op->more; 1171 object *more = op->more;
1202 1172
1203 /* We really need the caller to normalize coordinates - if 1173 /* We really need the caller to normalise coordinates - if
1204 * we set the map, that doesn't work if the location is within 1174 * 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 1175 * a map and this is straddling an edge. So only if coordinate
1206 * is clear wrong do we normalize it. 1176 * is clear wrong do we normalise it.
1207 */ 1177 */
1208 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1178 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1209 more->map = get_map_from_coord (m, &more->x, &more->y); 1179 more->map = get_map_from_coord (m, &more->x, &more->y);
1210 else if (!more->map) 1180 else if (!more->map)
1211 { 1181 {
… …
1235 y = op->y; 1205 y = op->y;
1236 1206
1237 /* this has to be done after we translate the coordinates. 1207 /* this has to be done after we translate the coordinates.
1238 */ 1208 */
1239 if (op->nrof && !(flag & INS_NO_MERGE)) 1209 if (op->nrof && !(flag & INS_NO_MERGE))
1240 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1210 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1241 if (object::can_merge (op, tmp)) 1211 if (object::can_merge (op, tmp))
1242 { 1212 {
1243 op->nrof += tmp->nrof; 1213 op->nrof += tmp->nrof;
1244 tmp->destroy (); 1214 tmp->destroy ();
1245 } 1215 }
… …
1272 else 1242 else
1273 { 1243 {
1274 /* If there are other objects, then */ 1244 /* If there are other objects, then */
1275 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1245 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1276 { 1246 {
1277 object *last = NULL; 1247 object *last = 0;
1278 1248
1279 /* 1249 /*
1280 * If there are multiple objects on this space, we do some trickier handling. 1250 * If there are multiple objects on this space, we do some trickier handling.
1281 * We've already dealt with merging if appropriate. 1251 * We've already dealt with merging if appropriate.
1282 * Generally, we want to put the new object on top. But if 1252 * 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 1256 * 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 1257 * 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 1258 * when lots of spells are cast in one area. Currently, it is presumed
1289 * that flying non pickable objects are spell objects. 1259 * that flying non pickable objects are spell objects.
1290 */ 1260 */
1291
1292 while (top != NULL) 1261 while (top)
1293 { 1262 {
1294 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1263 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1295 floor = top; 1264 floor = top;
1296 1265
1297 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1266 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); 1319 op->above = GET_MAP_OB (op->map, op->x, op->y);
1351 1320
1352 if (op->above) 1321 if (op->above)
1353 op->above->below = op; 1322 op->above->below = op;
1354 1323
1355 op->below = NULL; 1324 op->below = 0;
1356 op->ms ().bot = op; 1325 op->ms ().bot = op;
1357 } 1326 }
1358 else 1327 else
1359 { /* get inserted into the stack above top */ 1328 { /* get inserted into the stack above top */
1360 op->above = top->above; 1329 op->above = top->above;
… …
1364 1333
1365 op->below = top; 1334 op->below = top;
1366 top->above = op; 1335 top->above = op;
1367 } 1336 }
1368 1337
1369 if (op->above == NULL) 1338 if (!op->above)
1370 op->ms ().top = op; 1339 op->ms ().top = op;
1371 } /* else not INS_BELOW_ORIGINATOR */ 1340 } /* else not INS_BELOW_ORIGINATOR */
1372 1341
1373 if (op->type == PLAYER) 1342 if (op->type == PLAYER)
1343 {
1374 op->contr->do_los = 1; 1344 op->contr->do_los = 1;
1345 ++op->map->players;
1346 op->map->touch ();
1347 }
1348
1349 op->map->dirty = true;
1375 1350
1376 /* If we have a floor, we know the player, if any, will be above 1351 /* 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. 1352 * it, so save a few ticks and start from there.
1378 */ 1353 */
1379 if (!(flag & INS_MAP_LOAD)) 1354 if (!(flag & INS_MAP_LOAD))
… …
1385 * visible to others on this map. But update_all_los is really 1360 * 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 1361 * 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 1362 * on the map will get recalculated. The players could very well
1388 * be far away from this change and not affected in any way - 1363 * be far away from this change and not affected in any way -
1389 * this should get redone to only look for players within range, 1364 * this should get redone to only look for players within range,
1390 * or just updating the P_NEED_UPDATE for spaces within this area 1365 * or just updating the P_UPTODATE for spaces within this area
1391 * of effect may be sufficient. 1366 * of effect may be sufficient.
1392 */ 1367 */
1393 if (op->map->darkness && (op->glow_radius != 0)) 1368 if (op->map->darkness && (op->glow_radius != 0))
1394 update_all_los (op->map, op->x, op->y); 1369 update_all_los (op->map, op->x, op->y);
1395 1370
… …
1433{ 1408{
1434 object *tmp, *tmp1; 1409 object *tmp, *tmp1;
1435 1410
1436 /* first search for itself and remove any old instances */ 1411 /* first search for itself and remove any old instances */
1437 1412
1438 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1413 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1439 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1414 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1440 tmp->destroy (); 1415 tmp->destroy ();
1441 1416
1442 tmp1 = arch_to_object (archetype::find (arch_string)); 1417 tmp1 = arch_to_object (archetype::find (arch_string));
1443 1418
… …
1766 1741
1767 /* The objects have to be checked from top to bottom. 1742 /* The objects have to be checked from top to bottom.
1768 * Hence, we first go to the top: 1743 * Hence, we first go to the top:
1769 */ 1744 */
1770 1745
1771 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1746 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1772 { 1747 {
1773 /* Trim the search when we find the first other spell effect 1748 /* Trim the search when we find the first other spell effect
1774 * this helps performance so that if a space has 50 spell objects, 1749 * this helps performance so that if a space has 50 spell objects,
1775 * we don't need to check all of them. 1750 * we don't need to check all of them.
1776 */ 1751 */
… …
1834 * The first matching object is returned, or NULL if none. 1809 * The first matching object is returned, or NULL if none.
1835 */ 1810 */
1836object * 1811object *
1837present_arch (const archetype *at, maptile *m, int x, int y) 1812present_arch (const archetype *at, maptile *m, int x, int y)
1838{ 1813{
1839 if (m == NULL || out_of_map (m, x, y)) 1814 if (!m || out_of_map (m, x, y))
1840 { 1815 {
1841 LOG (llevError, "Present_arch called outside map.\n"); 1816 LOG (llevError, "Present_arch called outside map.\n");
1842 return NULL; 1817 return NULL;
1843 } 1818 }
1844 1819
1845 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1820 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1846 if (tmp->arch == at) 1821 if (tmp->arch == at)
1847 return tmp; 1822 return tmp;
1848 1823
1849 return NULL; 1824 return NULL;
1850} 1825}
… …
1861 { 1836 {
1862 LOG (llevError, "Present called outside map.\n"); 1837 LOG (llevError, "Present called outside map.\n");
1863 return NULL; 1838 return NULL;
1864 } 1839 }
1865 1840
1866 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1841 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1867 if (tmp->type == type) 1842 if (tmp->type == type)
1868 return tmp; 1843 return tmp;
1869 1844
1870 return NULL; 1845 return NULL;
1871} 1846}
… …
2596 } 2571 }
2597 else 2572 else
2598 item = item->env; 2573 item = item->env;
2599} 2574}
2600 2575
2576
2577const char *
2578object::flag_desc (char *desc, int len) const
2579{
2580 char *p = desc;
2581 bool first = true;
2582
2583 *p = 0;
2584
2585 for (int i = 0; i < NUM_FLAGS; i++)
2586 {
2587 if (len <= 10) // magic constant!
2588 {
2589 snprintf (p, len, ",...");
2590 break;
2591 }
2592
2593 if (flag [i])
2594 {
2595 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2596 len -= cnt;
2597 p += cnt;
2598 first = false;
2599 }
2600 }
2601
2602 return desc;
2603}
2604
2601// return a suitable string describing an objetc in enough detail to find it 2605// return a suitable string describing an object in enough detail to find it
2602const char * 2606const char *
2603object::debug_desc (char *info) const 2607object::debug_desc (char *info) const
2604{ 2608{
2609 char flagdesc[512];
2605 char info2[256 * 3]; 2610 char info2[256 * 4];
2606 char *p = info; 2611 char *p = info;
2607 2612
2608 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2609 count, 2614 count, uuid.seq,
2610 &name, 2615 &name,
2611 title ? " " : "", 2616 title ? "\",title:" : "",
2612 title ? (const char *)title : ""); 2617 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type);
2613 2619
2614 if (env) 2620 if (env)
2615 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2616 2622
2617 if (map) 2623 if (map)
2618 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2619 2625
2620 return info; 2626 return info;
2621} 2627}
2622 2628
2623const char * 2629const char *
2624object::debug_desc () const 2630object::debug_desc () const
2625{ 2631{
2626 static char info[256 * 3]; 2632 static char info[256 * 4];
2627 return debug_desc (info); 2633 return debug_desc (info);
2628} 2634}
2629 2635

Diff Legend

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