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.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.94 by root, Wed Dec 27 05:22:35 2006 UTC

… …
141 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
143 */ 143 */
144 144
145 /* For each field in wants, */ 145 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 147 {
148 key_value *has_field; 148 key_value *has_field;
149 149
150 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 222
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 225
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 227 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 228 || ob1->name != ob2->name
229 || ob1->title != ob2->title 229 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 230 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 231 || ob1->weight != ob2->weight
… …
364{ 364{
365 if (!op) 365 if (!op)
366 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
367 367
368 object_freezer freezer; 368 object_freezer freezer;
369 save_object (freezer, op, 3); 369 save_object (freezer, op, 1);
370 return freezer.as_string (); 370 return freezer.as_string ();
371} 371}
372 372
373/* 373/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
… …
467 } 467 }
468 468
469 op->key_values = 0; 469 op->key_values = 0;
470} 470}
471 471
472void object::clear ()
473{
474 attachable_base::clear ();
475
476 free_key_values (this);
477
478 owner = 0;
479 name = 0;
480 name_pl = 0;
481 title = 0;
482 race = 0;
483 slaying = 0;
484 skill = 0;
485 msg = 0;
486 lore = 0;
487 custom_name = 0;
488 materialname = 0;
489 contr = 0;
490 below = 0;
491 above = 0;
492 inv = 0;
493 container = 0;
494 env = 0;
495 more = 0;
496 head = 0;
497 map = 0;
498 active_next = 0;
499 active_prev = 0;
500
501 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503 SET_FLAG (this, FLAG_REMOVED);
504
505 /* What is not cleared is next, prev, and count */
506
507 expmul = 1.0;
508 face = blank_face;
509
510 if (settings.casting_time)
511 casting_time = -1;
512}
513
514/* 472/*
515 * copy_to first frees everything allocated by the dst object, 473 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second 474 * and then copies the contents of itself into the second
517 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
518 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
… …
524{ 482{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527 485
528 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533 487
534 if (is_freed) 488 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
536 490
537 if (is_removed) 491 if (is_removed)
… …
568 tail = new_link; 522 tail = new_link;
569 } 523 }
570 } 524 }
571 } 525 }
572 526
573 update_ob_speed (dst); 527 dst->set_speed (dst->speed);
574} 528}
575 529
576object * 530object *
577object::clone () 531object::clone ()
578{ 532{
… …
600 * Updates the speed of an object. If the speed changes from 0 to another 554 * Updates the speed of an object. If the speed changes from 0 to another
601 * value, or vice versa, then add/remove the object from the active list. 555 * value, or vice versa, then add/remove the object from the active list.
602 * This function needs to be called whenever the speed of an object changes. 556 * This function needs to be called whenever the speed of an object changes.
603 */ 557 */
604void 558void
605update_ob_speed (object *op) 559object::set_speed (float speed)
606{ 560{
607 extern int arch_init; 561 extern int arch_init;
608 562
609 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
610 * since they never really need to be updated. 564 * since they never really need to be updated.
611 */ 565 */
612 566 if (flag [FLAG_FREED] && speed)
613 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614 { 567 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0; 569 speed = 0;
620#endif
621 } 570 }
571
572 this->speed = speed;
622 573
623 if (arch_init) 574 if (arch_init)
624 return; 575 return;
625 576
626 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 577 if (FABS (speed) > MIN_ACTIVE_SPEED)
627 { 578 {
628 /* If already on active list, don't do anything */ 579 /* If already on active list, don't do anything */
629 if (op->active_next || op->active_prev || op == active_objects) 580 if (active_next || active_prev || this == active_objects)
630 return; 581 return;
631 582
632 /* process_events() expects us to insert the object at the beginning 583 /* process_events() expects us to insert the object at the beginning
633 * of the list. */ 584 * of the list. */
634 op->active_next = active_objects; 585 active_next = active_objects;
635 586
636 if (op->active_next != NULL) 587 if (active_next)
637 op->active_next->active_prev = op; 588 active_next->active_prev = this;
638 589
639 active_objects = op; 590 active_objects = this;
640 } 591 }
641 else 592 else
642 { 593 {
643 /* If not on the active list, nothing needs to be done */ 594 /* If not on the active list, nothing needs to be done */
644 if (!op->active_next && !op->active_prev && op != active_objects) 595 if (!active_next && !active_prev && this != active_objects)
645 return; 596 return;
646 597
647 if (op->active_prev == NULL) 598 if (!active_prev)
648 { 599 {
649 active_objects = op->active_next; 600 active_objects = active_next;
650 601
651 if (op->active_next != NULL) 602 if (active_next)
652 op->active_next->active_prev = NULL; 603 active_next->active_prev = 0;
653 } 604 }
654 else 605 else
655 { 606 {
656 op->active_prev->active_next = op->active_next; 607 active_prev->active_next = active_next;
657 608
658 if (op->active_next) 609 if (active_next)
659 op->active_next->active_prev = op->active_prev; 610 active_next->active_prev = active_prev;
660 } 611 }
661 612
662 op->active_next = NULL; 613 active_next = 0;
663 op->active_prev = NULL; 614 active_prev = 0;
664 } 615 }
665} 616}
666 617
667/* This function removes object 'op' from the list of active 618/* This function removes object 'op' from the list of active
668 * objects. 619 * objects.
… …
737 */ 688 */
738 if (!op->map || op->map->in_memory == MAP_SAVING) 689 if (!op->map || op->map->in_memory == MAP_SAVING)
739 return; 690 return;
740 691
741 /* make sure the object is within map boundaries */ 692 /* make sure the object is within map boundaries */
742 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 693 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743 { 694 {
744 LOG (llevError, "update_object() called for object out of map!\n"); 695 LOG (llevError, "update_object() called for object out of map!\n");
745#ifdef MANY_CORES 696#ifdef MANY_CORES
746 abort (); 697 abort ();
747#endif 698#endif
748 return; 699 return;
749 } 700 }
750 701
751 mapspace &m = op->map->at (op->x, op->y); 702 mapspace &m = op->ms ();
752 703
753 if (m.flags_ & P_NEED_UPDATE) 704 if (m.flags_ & P_NEED_UPDATE)
754 /* nop */; 705 /* nop */;
755 else if (action == UP_OBJ_INSERT) 706 else if (action == UP_OBJ_INSERT)
756 { 707 {
… …
784 735
785 if (op->more) 736 if (op->more)
786 update_object (op->more, action); 737 update_object (op->more, action);
787} 738}
788 739
789object::vector object::mortals;
790object::vector object::objects; // not yet used 740object::vector object::objects; // not yet used
791object *object::first; 741object *object::first;
792
793void object::free_mortals ()
794{
795 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796 if ((*i)->refcnt)
797 ++i; // further delay freeing
798 else
799 {
800 delete *i;
801 mortals.erase (i);
802 }
803}
804 742
805object::object () 743object::object ()
806{ 744{
807 SET_FLAG (this, FLAG_REMOVED); 745 SET_FLAG (this, FLAG_REMOVED);
808 746
… …
840 778
841 prev = 0; 779 prev = 0;
842 next = 0; 780 next = 0;
843} 781}
844 782
783/*
784 * Remove and free all objects in the inventory of the given object.
785 * object.c ?
786 */
787void
788object::destroy_inv (bool drop_to_ground)
789{
790 // need to check first, because the checks below might segfault
791 // as we might be on an invalid mapspace and crossfire code
792 // is too buggy to ensure that the inventory is empty.
793 // corollary: if you create arrows etc. with stuff in tis inventory,
794 // cf will crash below with off-map x and y
795 if (!inv)
796 return;
797
798 /* Only if the space blocks everything do we not process -
799 * if some form of movement is allowed, let objects
800 * drop on that space.
801 */
802 if (!drop_to_ground
803 || !map
804 || map->in_memory != MAP_IN_MEMORY
805 || map->at (x, y).move_block == MOVE_ALL)
806 {
807 while (inv)
808 {
809 inv->destroy_inv (drop_to_ground);
810 inv->destroy ();
811 }
812 }
813 else
814 { /* Put objects in inventory onto this space */
815 while (inv)
816 {
817 object *op = inv;
818
819 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE
822 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE])
824 op->destroy ();
825 else
826 map->insert (op, x, y);
827 }
828 }
829}
830
845object *object::create () 831object *object::create ()
846{ 832{
847 object *op = new object; 833 object *op = new object;
848 op->link (); 834 op->link ();
849 return op; 835 return op;
850} 836}
851 837
852/* 838void
853 * free_object() frees everything allocated by an object, removes 839object::do_destroy ()
854 * it from the list of used objects, and puts it on the list of
855 * free objects. The IS_FREED() flag is set in the object.
856 * The object must have been removed by remove_ob() first for
857 * this function to succeed.
858 *
859 * If destroy_inventory is set, free inventory as well. Else drop items in
860 * inventory to the ground.
861 */
862void object::destroy (bool destroy_inventory)
863{ 840{
864 if (QUERY_FLAG (this, FLAG_FREED)) 841 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this);
843
844 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this);
846
847 if (!flag [FLAG_REMOVED])
848 remove ();
849
850 if (flag [FLAG_FREED])
865 return; 851 return;
866 852
867 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 853 set_speed (0);
868 remove_friendly_object (this);
869 854
870 if (!QUERY_FLAG (this, FLAG_REMOVED)) 855 flag [FLAG_FREED] = 1;
871 remove ();
872 856
873 SET_FLAG (this, FLAG_FREED); 857 attachable::do_destroy ();
874 858
875 if (more) 859 destroy_inv (true);
876 { 860 unlink ();
877 more->destroy (destroy_inventory);
878 more = 0;
879 }
880
881 if (inv)
882 {
883 /* Only if the space blocks everything do we not process -
884 * if some form of movement is allowed, let objects
885 * drop on that space.
886 */
887 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888 {
889 object *op = inv;
890
891 while (op)
892 {
893 object *tmp = op->below;
894 op->destroy (destroy_inventory);
895 op = tmp;
896 }
897 }
898 else
899 { /* Put objects in inventory onto this space */
900 object *op = inv;
901
902 while (op)
903 {
904 object *tmp = op->below;
905
906 op->remove ();
907
908 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910 op->destroy ();
911 else
912 {
913 op->x = x;
914 op->y = y;
915 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916 }
917
918 op = tmp;
919 }
920 }
921 }
922 861
923 // hack to ensure that freed objects still have a valid map 862 // hack to ensure that freed objects still have a valid map
924 { 863 {
925 static maptile *freed_map; // freed objects are moved here to avoid crashes 864 static maptile *freed_map; // freed objects are moved here to avoid crashes
926 865
… …
938 map = freed_map; 877 map = freed_map;
939 x = 1; 878 x = 1;
940 y = 1; 879 y = 1;
941 } 880 }
942 881
882 head = 0;
883
884 if (more)
885 {
886 more->destroy ();
887 more = 0;
888 }
889
943 // clear those pointers that likely might have circular references to us 890 // clear those pointers that likely might have circular references to us
944 owner = 0; 891 owner = 0;
945 enemy = 0; 892 enemy = 0;
946 attacked_by = 0; 893 attacked_by = 0;
947 894
948 // only relevant for players(?), but make sure of it anyways 895 // only relevant for players(?), but make sure of it anyways
949 contr = 0; 896 contr = 0;
897}
950 898
951 /* Remove object from the active list */ 899void
952 speed = 0; 900object::destroy (bool destroy_inventory)
953 update_ob_speed (this); 901{
902 if (destroyed ())
903 return;
954 904
955 unlink (); 905 if (destroy_inventory)
906 destroy_inv (false);
956 907
957 mortals.push_back (this); 908 attachable::destroy ();
958} 909}
959 910
960/* 911/*
961 * sub_weight() recursively (outwards) subtracts a number from the 912 * sub_weight() recursively (outwards) subtracts a number from the
962 * weight of an object (and what is carried by it's environment(s)). 913 * weight of an object (and what is carried by it's environment(s)).
… …
986object::remove () 937object::remove ()
987{ 938{
988 object *tmp, *last = 0; 939 object *tmp, *last = 0;
989 object *otmp; 940 object *otmp;
990 941
991 int check_walk_off;
992
993 if (QUERY_FLAG (this, FLAG_REMOVED)) 942 if (QUERY_FLAG (this, FLAG_REMOVED))
994 return; 943 return;
995 944
996 SET_FLAG (this, FLAG_REMOVED); 945 SET_FLAG (this, FLAG_REMOVED);
946 INVOKE_OBJECT (REMOVE, this);
997 947
998 if (more) 948 if (more)
999 more->remove (); 949 more->remove ();
1000 950
1001 /* 951 /*
… …
1012 /* NO_FIX_PLAYER is set when a great many changes are being 962 /* NO_FIX_PLAYER is set when a great many changes are being
1013 * made to players inventory. If set, avoiding the call 963 * made to players inventory. If set, avoiding the call
1014 * to save cpu time. 964 * to save cpu time.
1015 */ 965 */
1016 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017 fix_player (otmp); 967 otmp->update_stats ();
1018 968
1019 if (above != NULL) 969 if (above != NULL)
1020 above->below = below; 970 above->below = below;
1021 else 971 else
1022 env->inv = below; 972 env->inv = below;
… …
1063 dump = dump_object (GET_MAP_OB (map, x, y)); 1013 dump = dump_object (GET_MAP_OB (map, x, y));
1064 LOG (llevError, "%s\n", dump); 1014 LOG (llevError, "%s\n", dump);
1065 free (dump); 1015 free (dump);
1066 } 1016 }
1067 1017
1068 map->at (x, y).bottom = above; /* goes on above it. */ 1018 map->at (x, y).bot = above; /* goes on above it. */
1069 } 1019 }
1070 1020
1071 above = 0; 1021 above = 0;
1072 below = 0; 1022 below = 0;
1073 1023
1074 if (map->in_memory == MAP_SAVING) 1024 if (map->in_memory == MAP_SAVING)
1075 return; 1025 return;
1076 1026
1077 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1027 int check_walk_off = !flag [FLAG_NO_APPLY];
1078 1028
1079 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1029 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1080 { 1030 {
1081 /* No point updating the players look faces if he is the object 1031 /* No point updating the players look faces if he is the object
1082 * being removed. 1032 * being removed.
1083 */ 1033 */
1084 1034
… …
1088 * removed (most likely destroyed), update the player view 1038 * removed (most likely destroyed), update the player view
1089 * appropriately. 1039 * appropriately.
1090 */ 1040 */
1091 if (tmp->container == this) 1041 if (tmp->container == this)
1092 { 1042 {
1093 CLEAR_FLAG (this, FLAG_APPLIED); 1043 flag [FLAG_APPLIED] = 0;
1094 tmp->container = 0; 1044 tmp->container = 0;
1095 } 1045 }
1096 1046
1047 if (tmp->contr->ns)
1097 tmp->contr->socket->floorbox_update (); 1048 tmp->contr->ns->floorbox_update ();
1098 } 1049 }
1099 1050
1100 /* See if player moving off should effect something */ 1051 /* See if player moving off should effect something */
1101 if (check_walk_off 1052 if (check_walk_off
1102 && ((move_type & tmp->move_off) 1053 && ((move_type & tmp->move_off)
… …
1120 if (!last) 1071 if (!last)
1121 map->at (x, y).flags_ = P_NEED_UPDATE; 1072 map->at (x, y).flags_ = P_NEED_UPDATE;
1122 else 1073 else
1123 update_object (last, UP_OBJ_REMOVE); 1074 update_object (last, UP_OBJ_REMOVE);
1124 1075
1125 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126 update_all_los (map, x, y); 1077 update_all_los (map, x, y);
1127 } 1078 }
1128} 1079}
1129 1080
1130/* 1081/*
… …
1139merge_ob (object *op, object *top) 1090merge_ob (object *op, object *top)
1140{ 1091{
1141 if (!op->nrof) 1092 if (!op->nrof)
1142 return 0; 1093 return 0;
1143 1094
1144 if (top == NULL) 1095 if (top)
1145 for (top = op; top != NULL && top->above != NULL; top = top->above); 1096 for (top = op; top && top->above; top = top->above)
1097 ;
1146 1098
1147 for (; top != NULL; top = top->below) 1099 for (; top; top = top->below)
1148 { 1100 {
1149 if (top == op) 1101 if (top == op)
1150 continue; 1102 continue;
1151 1103
1152 if (object::can_merge (op, top)) 1104 if (object::can_merge (op, top))
… …
1168 * job preparing multi-part monsters 1120 * job preparing multi-part monsters
1169 */ 1121 */
1170object * 1122object *
1171insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1123insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1172{ 1124{
1173 object *tmp;
1174
1175 if (op->head)
1176 op = op->head;
1177
1178 for (tmp = op; tmp; tmp = tmp->more) 1125 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179 { 1126 {
1180 tmp->x = x + tmp->arch->clone.x; 1127 tmp->x = x + tmp->arch->clone.x;
1181 tmp->y = y + tmp->arch->clone.y; 1128 tmp->y = y + tmp->arch->clone.y;
1182 } 1129 }
1183 1130
… …
1202 * Return value: 1149 * Return value:
1203 * new object if 'op' was merged with other object 1150 * new object if 'op' was merged with other object
1204 * NULL if 'op' was destroyed 1151 * NULL if 'op' was destroyed
1205 * just 'op' otherwise 1152 * just 'op' otherwise
1206 */ 1153 */
1207
1208object * 1154object *
1209insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1155insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210{ 1156{
1211 object *tmp, *top, *floor = NULL; 1157 object *tmp, *top, *floor = NULL;
1212 sint16 x, y; 1158 sint16 x, y;
… …
1246 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1192 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247 free (dump); 1193 free (dump);
1248 return op; 1194 return op;
1249 } 1195 }
1250 1196
1251 if (op->more != NULL) 1197 if (op->more)
1252 { 1198 {
1253 /* The part may be on a different map. */ 1199 /* The part may be on a different map. */
1254 1200
1255 object *more = op->more; 1201 object *more = op->more;
1256 1202
… …
1272 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1218 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273 { 1219 {
1274 if (!op->head) 1220 if (!op->head)
1275 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1221 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276 1222
1277 return NULL; 1223 return 0;
1278 } 1224 }
1279 } 1225 }
1280 1226
1281 CLEAR_FLAG (op, FLAG_REMOVED); 1227 CLEAR_FLAG (op, FLAG_REMOVED);
1282 1228
… …
1316 op->below = originator->below; 1262 op->below = originator->below;
1317 1263
1318 if (op->below) 1264 if (op->below)
1319 op->below->above = op; 1265 op->below->above = op;
1320 else 1266 else
1321 op->map->at (op->x, op->y).bottom = op; 1267 op->ms ().bot = op;
1322 1268
1323 /* since *below* originator, no need to update top */ 1269 /* since *below* originator, no need to update top */
1324 originator->below = op; 1270 originator->below = op;
1325 } 1271 }
1326 else 1272 else
… …
1405 1351
1406 if (op->above) 1352 if (op->above)
1407 op->above->below = op; 1353 op->above->below = op;
1408 1354
1409 op->below = NULL; 1355 op->below = NULL;
1410 op->map->at (op->x, op->y).bottom = op; 1356 op->ms ().bot = op;
1411 } 1357 }
1412 else 1358 else
1413 { /* get inserted into the stack above top */ 1359 { /* get inserted into the stack above top */
1414 op->above = top->above; 1360 op->above = top->above;
1415 1361
… …
1419 op->below = top; 1365 op->below = top;
1420 top->above = op; 1366 top->above = op;
1421 } 1367 }
1422 1368
1423 if (op->above == NULL) 1369 if (op->above == NULL)
1424 op->map->at (op->x, op->y).top = op; 1370 op->ms ().top = op;
1425 } /* else not INS_BELOW_ORIGINATOR */ 1371 } /* else not INS_BELOW_ORIGINATOR */
1426 1372
1427 if (op->type == PLAYER) 1373 if (op->type == PLAYER)
1428 op->contr->do_los = 1; 1374 op->contr->do_los = 1;
1429 1375
1430 /* If we have a floor, we know the player, if any, will be above 1376 /* If we have a floor, we know the player, if any, will be above
1431 * it, so save a few ticks and start from there. 1377 * it, so save a few ticks and start from there.
1432 */ 1378 */
1433 if (!(flag & INS_MAP_LOAD)) 1379 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = op->map->at (op->x, op->y).player ()) 1380 if (object *pl = op->ms ().player ())
1381 if (pl->contr->ns)
1435 pl->contr->socket->floorbox_update (); 1382 pl->contr->ns->floorbox_update ();
1436 1383
1437 /* If this object glows, it may affect lighting conditions that are 1384 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1385 * visible to others on this map. But update_all_los is really
1439 * an inefficient way to do this, as it means los for all players 1386 * an inefficient way to do this, as it means los for all players
1440 * on the map will get recalculated. The players could very well 1387 * on the map will get recalculated. The players could very well
1441 * be far away from this change and not affected in any way - 1388 * be far away from this change and not affected in any way -
1442 * this should get redone to only look for players within range, 1389 * this should get redone to only look for players within range,
1443 * or just updating the P_NEED_UPDATE for spaces within this area 1390 * or just updating the P_NEED_UPDATE for spaces within this area
1444 * of effect may be sufficient. 1391 * of effect may be sufficient.
1445 */ 1392 */
1446 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1393 if (op->map->darkness && (op->glow_radius != 0))
1447 update_all_los (op->map, op->x, op->y); 1394 update_all_los (op->map, op->x, op->y);
1448 1395
1449 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1396 /* updates flags (blocked, alive, no magic, etc) for this map space */
1450 update_object (op, UP_OBJ_INSERT); 1397 update_object (op, UP_OBJ_INSERT);
1398
1399 INVOKE_OBJECT (INSERT, op);
1451 1400
1452 /* Don't know if moving this to the end will break anything. However, 1401 /* Don't know if moving this to the end will break anything. However,
1453 * we want to have floorbox_update called before calling this. 1402 * we want to have floorbox_update called before calling this.
1454 * 1403 *
1455 * check_move_on() must be after this because code called from 1404 * check_move_on() must be after this because code called from
… …
1460 1409
1461 /* if this is not the head or flag has been passed, don't check walk on status */ 1410 /* if this is not the head or flag has been passed, don't check walk on status */
1462 if (!(flag & INS_NO_WALK_ON) && !op->head) 1411 if (!(flag & INS_NO_WALK_ON) && !op->head)
1463 { 1412 {
1464 if (check_move_on (op, originator)) 1413 if (check_move_on (op, originator))
1465 return NULL; 1414 return 0;
1466 1415
1467 /* If we are a multi part object, lets work our way through the check 1416 /* If we are a multi part object, lets work our way through the check
1468 * walk on's. 1417 * walk on's.
1469 */ 1418 */
1470 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1419 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471 if (check_move_on (tmp, originator)) 1420 if (check_move_on (tmp, originator))
1472 return NULL; 1421 return 0;
1473 } 1422 }
1474 1423
1475 return op; 1424 return op;
1476} 1425}
1477 1426
… …
1493 tmp1 = arch_to_object (archetype::find (arch_string)); 1442 tmp1 = arch_to_object (archetype::find (arch_string));
1494 1443
1495 tmp1->x = op->x; 1444 tmp1->x = op->x;
1496 tmp1->y = op->y; 1445 tmp1->y = op->y;
1497 insert_ob_in_map (tmp1, op->map, op, 0); 1446 insert_ob_in_map (tmp1, op->map, op, 0);
1447}
1448
1449object *
1450object::insert_at (object *where, object *originator, int flags)
1451{
1452 where->map->insert (this, where->x, where->y, originator, flags);
1498} 1453}
1499 1454
1500/* 1455/*
1501 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1456 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1502 * is returned contains nr objects, and the remaining parts contains 1457 * is returned contains nr objects, and the remaining parts contains
1503 * the rest (or is removed and freed if that number is 0). 1458 * the rest (or is removed and freed if that number is 0).
1504 * On failure, NULL is returned, and the reason put into the 1459 * On failure, NULL is returned, and the reason put into the
1505 * global static errmsg array. 1460 * global static errmsg array.
1506 */ 1461 */
1507
1508object * 1462object *
1509get_split_ob (object *orig_ob, uint32 nr) 1463get_split_ob (object *orig_ob, uint32 nr)
1510{ 1464{
1511 object *newob; 1465 object *newob;
1512 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1466 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1548 1502
1549object * 1503object *
1550decrease_ob_nr (object *op, uint32 i) 1504decrease_ob_nr (object *op, uint32 i)
1551{ 1505{
1552 object *tmp; 1506 object *tmp;
1553 player *pl;
1554 1507
1555 if (i == 0) /* objects with op->nrof require this check */ 1508 if (i == 0) /* objects with op->nrof require this check */
1556 return op; 1509 return op;
1557 1510
1558 if (i > op->nrof) 1511 if (i > op->nrof)
… …
1571 * IMO, searching through all the players will mostly 1524 * IMO, searching through all the players will mostly
1572 * likely be quicker than following op->env to the map, 1525 * likely be quicker than following op->env to the map,
1573 * and then searching the map for a player. 1526 * and then searching the map for a player.
1574 */ 1527 */
1575 if (!tmp) 1528 if (!tmp)
1576 { 1529 for_all_players (pl)
1577 for (pl = first_player; pl; pl = pl->next)
1578 if (pl->ob->container == op->env) 1530 if (pl->ob->container == op->env)
1579 { 1531 {
1580 tmp = pl->ob; 1532 tmp = pl->ob;
1581 break; 1533 break;
1582 } 1534 }
1583 }
1584 1535
1585 if (i < op->nrof) 1536 if (i < op->nrof)
1586 { 1537 {
1587 sub_weight (op->env, op->weight * i); 1538 sub_weight (op->env, op->weight * i);
1588 op->nrof -= i; 1539 op->nrof -= i;
… …
1724 add_weight (this, (op->weight + op->carrying)); 1675 add_weight (this, (op->weight + op->carrying));
1725 1676
1726 otmp = this->in_player (); 1677 otmp = this->in_player ();
1727 if (otmp && otmp->contr) 1678 if (otmp && otmp->contr)
1728 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1679 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729 fix_player (otmp); 1680 otmp->update_stats ();
1730 1681
1731 op->map = 0; 1682 op->map = 0;
1732 op->env = this; 1683 op->env = this;
1733 op->above = 0; 1684 op->above = 0;
1734 op->below = 0; 1685 op->below = 0;
… …
1738 if ((op->glow_radius != 0) && map) 1689 if ((op->glow_radius != 0) && map)
1739 { 1690 {
1740#ifdef DEBUG_LIGHTS 1691#ifdef DEBUG_LIGHTS
1741 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1692 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742#endif /* DEBUG_LIGHTS */ 1693#endif /* DEBUG_LIGHTS */
1743 if (MAP_DARKNESS (map)) 1694 if (map->darkness)
1744 update_all_los (map, x, y); 1695 update_all_los (map, x, y);
1745 } 1696 }
1746 1697
1747 /* Client has no idea of ordering so lets not bother ordering it here. 1698 /* Client has no idea of ordering so lets not bother ordering it here.
1748 * It sure simplifies this function... 1699 * It sure simplifies this function...
… …
1753 { 1704 {
1754 op->below = inv; 1705 op->below = inv;
1755 op->below->above = op; 1706 op->below->above = op;
1756 inv = op; 1707 inv = op;
1757 } 1708 }
1709
1710 INVOKE_OBJECT (INSERT, this);
1758 1711
1759 return op; 1712 return op;
1760} 1713}
1761 1714
1762/* 1715/*
… …
1777 * 1730 *
1778 * MSW 2001-07-08: Check all objects on space, not just those below 1731 * MSW 2001-07-08: Check all objects on space, not just those below
1779 * object being inserted. insert_ob_in_map may not put new objects 1732 * object being inserted. insert_ob_in_map may not put new objects
1780 * on top. 1733 * on top.
1781 */ 1734 */
1782
1783int 1735int
1784check_move_on (object *op, object *originator) 1736check_move_on (object *op, object *originator)
1785{ 1737{
1786 object *tmp; 1738 object *tmp;
1787 maptile *m = op->map; 1739 maptile *m = op->map;
… …
1814 1766
1815 /* The objects have to be checked from top to bottom. 1767 /* The objects have to be checked from top to bottom.
1816 * Hence, we first go to the top: 1768 * Hence, we first go to the top:
1817 */ 1769 */
1818 1770
1819 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1771 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1820 { 1772 {
1821 /* Trim the search when we find the first other spell effect 1773 /* Trim the search when we find the first other spell effect
1822 * this helps performance so that if a space has 50 spell objects, 1774 * this helps performance so that if a space has 50 spell objects,
1823 * we don't need to check all of them. 1775 * we don't need to check all of them.
1824 */ 1776 */
… …
1879/* 1831/*
1880 * present_arch(arch, map, x, y) searches for any objects with 1832 * present_arch(arch, map, x, y) searches for any objects with
1881 * a matching archetype at the given map and coordinates. 1833 * a matching archetype at the given map and coordinates.
1882 * The first matching object is returned, or NULL if none. 1834 * The first matching object is returned, or NULL if none.
1883 */ 1835 */
1884
1885object * 1836object *
1886present_arch (const archetype *at, maptile *m, int x, int y) 1837present_arch (const archetype *at, maptile *m, int x, int y)
1887{ 1838{
1888 object *
1889 tmp;
1890
1891 if (m == NULL || out_of_map (m, x, y)) 1839 if (m == NULL || out_of_map (m, x, y))
1892 { 1840 {
1893 LOG (llevError, "Present_arch called outside map.\n"); 1841 LOG (llevError, "Present_arch called outside map.\n");
1894 return NULL; 1842 return NULL;
1895 } 1843 }
1844
1896 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1845 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1897 if (tmp->arch == at) 1846 if (tmp->arch == at)
1898 return tmp; 1847 return tmp;
1848
1899 return NULL; 1849 return NULL;
1900} 1850}
1901 1851
1902/* 1852/*
1903 * present(type, map, x, y) searches for any objects with 1853 * present(type, map, x, y) searches for any objects with
1904 * a matching type variable at the given map and coordinates. 1854 * a matching type variable at the given map and coordinates.
1905 * The first matching object is returned, or NULL if none. 1855 * The first matching object is returned, or NULL if none.
1906 */ 1856 */
1907
1908object * 1857object *
1909present (unsigned char type, maptile *m, int x, int y) 1858present (unsigned char type, maptile *m, int x, int y)
1910{ 1859{
1911 object *
1912 tmp;
1913
1914 if (out_of_map (m, x, y)) 1860 if (out_of_map (m, x, y))
1915 { 1861 {
1916 LOG (llevError, "Present called outside map.\n"); 1862 LOG (llevError, "Present called outside map.\n");
1917 return NULL; 1863 return NULL;
1918 } 1864 }
1865
1919 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1866 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1920 if (tmp->type == type) 1867 if (tmp->type == type)
1921 return tmp; 1868 return tmp;
1869
1922 return NULL; 1870 return NULL;
1923} 1871}
1924 1872
1925/* 1873/*
1926 * present_in_ob(type, object) searches for any objects with 1874 * present_in_ob(type, object) searches for any objects with
1927 * a matching type variable in the inventory of the given object. 1875 * a matching type variable in the inventory of the given object.
1928 * The first matching object is returned, or NULL if none. 1876 * The first matching object is returned, or NULL if none.
1929 */ 1877 */
1930
1931object * 1878object *
1932present_in_ob (unsigned char type, const object *op) 1879present_in_ob (unsigned char type, const object *op)
1933{ 1880{
1934 object *
1935 tmp;
1936
1937 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1881 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938 if (tmp->type == type) 1882 if (tmp->type == type)
1939 return tmp; 1883 return tmp;
1884
1940 return NULL; 1885 return NULL;
1941} 1886}
1942 1887
1943/* 1888/*
1944 * present_in_ob (type, str, object) searches for any objects with 1889 * present_in_ob (type, str, object) searches for any objects with
… …
1952 * str is the string to match against. Note that we match against 1897 * str is the string to match against. Note that we match against
1953 * the object name, not the archetype name. this is so that the 1898 * the object name, not the archetype name. this is so that the
1954 * spell code can use one object type (force), but change it's name 1899 * spell code can use one object type (force), but change it's name
1955 * to be unique. 1900 * to be unique.
1956 */ 1901 */
1957
1958object * 1902object *
1959present_in_ob_by_name (int type, const char *str, const object *op) 1903present_in_ob_by_name (int type, const char *str, const object *op)
1960{ 1904{
1961 object *
1962 tmp;
1963
1964 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1905 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 {
1966 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1906 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967 return tmp; 1907 return tmp;
1968 } 1908
1969 return NULL; 1909 return 0;
1970} 1910}
1971 1911
1972/* 1912/*
1973 * present_arch_in_ob(archetype, object) searches for any objects with 1913 * present_arch_in_ob(archetype, object) searches for any objects with
1974 * a matching archetype in the inventory of the given object. 1914 * a matching archetype in the inventory of the given object.
1975 * The first matching object is returned, or NULL if none. 1915 * The first matching object is returned, or NULL if none.
1976 */ 1916 */
1977
1978object * 1917object *
1979present_arch_in_ob (const archetype *at, const object *op) 1918present_arch_in_ob (const archetype *at, const object *op)
1980{ 1919{
1981 object *
1982 tmp;
1983
1984 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1920 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985 if (tmp->arch == at) 1921 if (tmp->arch == at)
1986 return tmp; 1922 return tmp;
1923
1987 return NULL; 1924 return NULL;
1988} 1925}
1989 1926
1990/* 1927/*
1991 * activate recursively a flag on an object inventory 1928 * activate recursively a flag on an object inventory
1992 */ 1929 */
1993void 1930void
1994flag_inv (object *op, int flag) 1931flag_inv (object *op, int flag)
1995{ 1932{
1996 object *
1997 tmp;
1998
1999 if (op->inv) 1933 if (op->inv)
2000 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1934 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001 { 1935 {
2002 SET_FLAG (tmp, flag); 1936 SET_FLAG (tmp, flag);
2003 flag_inv (tmp, flag); 1937 flag_inv (tmp, flag);
2004 } 1938 }
2005} /* 1939}
1940
1941/*
2006 * desactivate recursively a flag on an object inventory 1942 * deactivate recursively a flag on an object inventory
2007 */ 1943 */
2008void 1944void
2009unflag_inv (object *op, int flag) 1945unflag_inv (object *op, int flag)
2010{ 1946{
2011 object *
2012 tmp;
2013
2014 if (op->inv) 1947 if (op->inv)
2015 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1948 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016 { 1949 {
2017 CLEAR_FLAG (tmp, flag); 1950 CLEAR_FLAG (tmp, flag);
2018 unflag_inv (tmp, flag); 1951 unflag_inv (tmp, flag);
2019 } 1952 }
2020} 1953}
… …
2023 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1956 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024 * all it's inventory (recursively). 1957 * all it's inventory (recursively).
2025 * If checksums are used, a player will get set_cheat called for 1958 * If checksums are used, a player will get set_cheat called for
2026 * him/her-self and all object carried by a call to this function. 1959 * him/her-self and all object carried by a call to this function.
2027 */ 1960 */
2028
2029void 1961void
2030set_cheat (object *op) 1962set_cheat (object *op)
2031{ 1963{
2032 SET_FLAG (op, FLAG_WAS_WIZ); 1964 SET_FLAG (op, FLAG_WAS_WIZ);
2033 flag_inv (op, FLAG_WAS_WIZ); 1965 flag_inv (op, FLAG_WAS_WIZ);
… …
2052 * because arch_blocked (now ob_blocked) needs to know the movement type 1984 * because arch_blocked (now ob_blocked) needs to know the movement type
2053 * to know if the space in question will block the object. We can't use 1985 * to know if the space in question will block the object. We can't use
2054 * the archetype because that isn't correct if the monster has been 1986 * the archetype because that isn't correct if the monster has been
2055 * customized, changed states, etc. 1987 * customized, changed states, etc.
2056 */ 1988 */
2057
2058int 1989int
2059find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1990find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060{ 1991{
2061 int
2062 i,
2063 index = 0, flag; 1992 int index = 0, flag;
2064 static int
2065 altern[SIZEOFFREE]; 1993 int altern[SIZEOFFREE];
2066 1994
2067 for (i = start; i < stop; i++) 1995 for (int i = start; i < stop; i++)
2068 { 1996 {
2069 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1997 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070 if (!flag) 1998 if (!flag)
2071 altern[index++] = i; 1999 altern [index++] = i;
2072 2000
2073 /* Basically, if we find a wall on a space, we cut down the search size. 2001 /* Basically, if we find a wall on a space, we cut down the search size.
2074 * In this way, we won't return spaces that are on another side of a wall. 2002 * In this way, we won't return spaces that are on another side of a wall.
2075 * This mostly work, but it cuts down the search size in all directions - 2003 * This mostly work, but it cuts down the search size in all directions -
2076 * if the space being examined only has a wall to the north and empty 2004 * if the space being examined only has a wall to the north and empty
… …
2092 * find_first_free_spot(archetype, maptile, x, y) works like 2020 * find_first_free_spot(archetype, maptile, x, y) works like
2093 * find_free_spot(), but it will search max number of squares. 2021 * find_free_spot(), but it will search max number of squares.
2094 * But it will return the first available spot, not a random choice. 2022 * But it will return the first available spot, not a random choice.
2095 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2023 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2096 */ 2024 */
2097
2098int 2025int
2099find_first_free_spot (const object *ob, maptile *m, int x, int y) 2026find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100{ 2027{
2101 int
2102 i;
2103
2104 for (i = 0; i < SIZEOFFREE; i++) 2028 for (int i = 0; i < SIZEOFFREE; i++)
2105 {
2106 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2029 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107 return i; 2030 return i;
2108 } 2031
2109 return -1; 2032 return -1;
2110} 2033}
2111 2034
2112/* 2035/*
2113 * The function permute(arr, begin, end) randomly reorders the array 2036 * The function permute(arr, begin, end) randomly reorders the array
2114 * arr[begin..end-1]. 2037 * arr[begin..end-1].
2038 * now uses a fisher-yates shuffle, old permute was broken
2115 */ 2039 */
2116static void 2040static void
2117permute (int *arr, int begin, int end) 2041permute (int *arr, int begin, int end)
2118{ 2042{
2119 int 2043 arr += begin;
2120 i,
2121 j,
2122 tmp,
2123 len;
2124
2125 len = end - begin; 2044 end -= begin;
2126 for (i = begin; i < end; i++)
2127 {
2128 j = begin + RANDOM () % len;
2129 2045
2130 tmp = arr[i]; 2046 while (--end)
2131 arr[i] = arr[j]; 2047 swap (arr [end], arr [RANDOM () % (end + 1)]);
2132 arr[j] = tmp;
2133 }
2134} 2048}
2135 2049
2136/* new function to make monster searching more efficient, and effective! 2050/* new function to make monster searching more efficient, and effective!
2137 * This basically returns a randomized array (in the passed pointer) of 2051 * This basically returns a randomized array (in the passed pointer) of
2138 * the spaces to find monsters. In this way, it won't always look for 2052 * the spaces to find monsters. In this way, it won't always look for
… …
2141 * the 3x3 area will be searched, just not in a predictable order. 2055 * the 3x3 area will be searched, just not in a predictable order.
2142 */ 2056 */
2143void 2057void
2144get_search_arr (int *search_arr) 2058get_search_arr (int *search_arr)
2145{ 2059{
2146 int 2060 int i;
2147 i;
2148 2061
2149 for (i = 0; i < SIZEOFFREE; i++) 2062 for (i = 0; i < SIZEOFFREE; i++)
2150 {
2151 search_arr[i] = i; 2063 search_arr[i] = i;
2152 }
2153 2064
2154 permute (search_arr, 1, SIZEOFFREE1 + 1); 2065 permute (search_arr, 1, SIZEOFFREE1 + 1);
2155 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2066 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2067 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157} 2068}
… …
2166 * Perhaps incorrectly, but I'm making the assumption that exclude 2077 * Perhaps incorrectly, but I'm making the assumption that exclude
2167 * is actually want is going to try and move there. We need this info 2078 * is actually want is going to try and move there. We need this info
2168 * because we have to know what movement the thing looking to move 2079 * because we have to know what movement the thing looking to move
2169 * there is capable of. 2080 * there is capable of.
2170 */ 2081 */
2171
2172int 2082int
2173find_dir (maptile *m, int x, int y, object *exclude) 2083find_dir (maptile *m, int x, int y, object *exclude)
2174{ 2084{
2175 int
2176 i,
2177 max = SIZEOFFREE, mflags; 2085 int i, max = SIZEOFFREE, mflags;
2178 2086
2179 sint16 nx, ny; 2087 sint16 nx, ny;
2180 object * 2088 object *tmp;
2181 tmp;
2182 maptile * 2089 maptile *mp;
2183 mp;
2184 2090
2185 MoveType blocked, move_type; 2091 MoveType blocked, move_type;
2186 2092
2187 if (exclude && exclude->head) 2093 if (exclude && exclude->head)
2188 { 2094 {
… …
2205 2111
2206 if (mflags & P_OUT_OF_MAP) 2112 if (mflags & P_OUT_OF_MAP)
2207 max = maxfree[i]; 2113 max = maxfree[i];
2208 else 2114 else
2209 { 2115 {
2210 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2116 mapspace &ms = mp->at (nx, ny);
2117
2118 blocked = ms.move_block;
2211 2119
2212 if ((move_type & blocked) == move_type) 2120 if ((move_type & blocked) == move_type)
2213 max = maxfree[i]; 2121 max = maxfree[i];
2214 else if (mflags & P_IS_ALIVE) 2122 else if (mflags & P_IS_ALIVE)
2215 { 2123 {
2216 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2124 for (tmp = ms.bot; tmp; tmp = tmp->above)
2217 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2125 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2126 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2218 break; 2127 break;
2219 2128
2220 if (tmp) 2129 if (tmp)
2221 return freedir[i]; 2130 return freedir[i];
2222 } 2131 }
… …
2228 2137
2229/* 2138/*
2230 * distance(object 1, object 2) will return the square of the 2139 * distance(object 1, object 2) will return the square of the
2231 * distance between the two given objects. 2140 * distance between the two given objects.
2232 */ 2141 */
2233
2234int 2142int
2235distance (const object *ob1, const object *ob2) 2143distance (const object *ob1, const object *ob2)
2236{ 2144{
2237 int i;
2238
2239 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2145 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240 return i;
2241} 2146}
2242 2147
2243/* 2148/*
2244 * find_dir_2(delta-x,delta-y) will return a direction in which 2149 * find_dir_2(delta-x,delta-y) will return a direction in which
2245 * an object which has subtracted the x and y coordinates of another 2150 * an object which has subtracted the x and y coordinates of another
2246 * object, needs to travel toward it. 2151 * object, needs to travel toward it.
2247 */ 2152 */
2248
2249int 2153int
2250find_dir_2 (int x, int y) 2154find_dir_2 (int x, int y)
2251{ 2155{
2252 int q; 2156 int q;
2253 2157
… …
2292int 2196int
2293absdir (int d) 2197absdir (int d)
2294{ 2198{
2295 while (d < 1) 2199 while (d < 1)
2296 d += 8; 2200 d += 8;
2201
2297 while (d > 8) 2202 while (d > 8)
2298 d -= 8; 2203 d -= 8;
2204
2299 return d; 2205 return d;
2300} 2206}
2301 2207
2302/* 2208/*
2303 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2209 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2305 */ 2211 */
2306 2212
2307int 2213int
2308dirdiff (int dir1, int dir2) 2214dirdiff (int dir1, int dir2)
2309{ 2215{
2310 int 2216 int d;
2311 d;
2312 2217
2313 d = abs (dir1 - dir2); 2218 d = abs (dir1 - dir2);
2314 if (d > 4) 2219 if (d > 4)
2315 d = 8 - d; 2220 d = 8 - d;
2221
2316 return d; 2222 return d;
2317} 2223}
2318 2224
2319/* peterm: 2225/* peterm:
2320 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2226 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2323 * This basically means that if direction is 15, then it could either go 2229 * This basically means that if direction is 15, then it could either go
2324 * direction 4, 14, or 16 to get back to where we are. 2230 * direction 4, 14, or 16 to get back to where we are.
2325 * Moved from spell_util.c to object.c with the other related direction 2231 * Moved from spell_util.c to object.c with the other related direction
2326 * functions. 2232 * functions.
2327 */ 2233 */
2328
2329int
2330 reduction_dir[SIZEOFFREE][3] = { 2234int reduction_dir[SIZEOFFREE][3] = {
2331 {0, 0, 0}, /* 0 */ 2235 {0, 0, 0}, /* 0 */
2332 {0, 0, 0}, /* 1 */ 2236 {0, 0, 0}, /* 1 */
2333 {0, 0, 0}, /* 2 */ 2237 {0, 0, 0}, /* 2 */
2334 {0, 0, 0}, /* 3 */ 2238 {0, 0, 0}, /* 3 */
2335 {0, 0, 0}, /* 4 */ 2239 {0, 0, 0}, /* 4 */
… …
2485/* Basically, we save the content of the string to a temp file, then call */ 2389/* Basically, we save the content of the string to a temp file, then call */
2486/* load_object on it. I admit it is a highly inefficient way to make things, */ 2390/* load_object on it. I admit it is a highly inefficient way to make things, */
2487/* but it was simple to make and allows reusing the load_object function. */ 2391/* but it was simple to make and allows reusing the load_object function. */
2488/* Remember not to use load_object_str in a time-critical situation. */ 2392/* Remember not to use load_object_str in a time-critical situation. */
2489/* Also remember that multiparts objects are not supported for now. */ 2393/* Also remember that multiparts objects are not supported for now. */
2490
2491object * 2394object *
2492load_object_str (const char *obstr) 2395load_object_str (const char *obstr)
2493{ 2396{
2494 object *op; 2397 object *op;
2495 char filename[MAX_BUF]; 2398 char filename[MAX_BUF];
… …
2525 * returns NULL if no match. 2428 * returns NULL if no match.
2526 */ 2429 */
2527object * 2430object *
2528find_obj_by_type_subtype (const object *who, int type, int subtype) 2431find_obj_by_type_subtype (const object *who, int type, int subtype)
2529{ 2432{
2530 object *tmp;
2531
2532 for (tmp = who->inv; tmp; tmp = tmp->below) 2433 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533 if (tmp->type == type && tmp->subtype == subtype) 2434 if (tmp->type == type && tmp->subtype == subtype)
2534 return tmp; 2435 return tmp;
2535 2436
2536 return NULL; 2437 return 0;
2537} 2438}
2538 2439
2539/* If ob has a field named key, return the link from the list, 2440/* If ob has a field named key, return the link from the list,
2540 * otherwise return NULL. 2441 * otherwise return NULL.
2541 * 2442 *
… …
2543 * do the desired thing. 2444 * do the desired thing.
2544 */ 2445 */
2545key_value * 2446key_value *
2546get_ob_key_link (const object *ob, const char *key) 2447get_ob_key_link (const object *ob, const char *key)
2547{ 2448{
2548 key_value *link;
2549
2550 for (link = ob->key_values; link != NULL; link = link->next) 2449 for (key_value *link = ob->key_values; link; link = link->next)
2551 if (link->key == key) 2450 if (link->key == key)
2552 return link; 2451 return link;
2553 2452
2554 return NULL; 2453 return 0;
2555} 2454}
2556 2455
2557/* 2456/*
2558 * Returns the value of op has an extra_field for key, or NULL. 2457 * Returns the value of op has an extra_field for key, or NULL.
2559 * 2458 *
… …
2599 * Returns TRUE on success. 2498 * Returns TRUE on success.
2600 */ 2499 */
2601int 2500int
2602set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2501set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603{ 2502{
2604 key_value *
2605 field = NULL, *last = NULL; 2503 key_value *field = NULL, *last = NULL;
2606 2504
2607 for (field = op->key_values; field != NULL; field = field->next) 2505 for (field = op->key_values; field != NULL; field = field->next)
2608 { 2506 {
2609 if (field->key != canonical_key) 2507 if (field->key != canonical_key)
2610 { 2508 {
… …
2638 /* IF we get here, key doesn't exist */ 2536 /* IF we get here, key doesn't exist */
2639 2537
2640 /* No field, we'll have to add it. */ 2538 /* No field, we'll have to add it. */
2641 2539
2642 if (!add_key) 2540 if (!add_key)
2643 {
2644 return FALSE; 2541 return FALSE;
2645 } 2542
2646 /* There isn't any good reason to store a null 2543 /* There isn't any good reason to store a null
2647 * value in the key/value list. If the archetype has 2544 * value in the key/value list. If the archetype has
2648 * this key, then we should also have it, so shouldn't 2545 * this key, then we should also have it, so shouldn't
2649 * be here. If user wants to store empty strings, 2546 * be here. If user wants to store empty strings,
2650 * should pass in "" 2547 * should pass in ""

Diff Legend

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