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.79 by root, Sat Dec 23 06:30:49 2006 UTC vs.
Revision 1.92 by root, Tue Dec 26 17:39:29 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
… …
482{ 482{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
485 485
486 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
487
488 if (self || cb)
489 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
490 487
491 if (is_freed) 488 if (is_freed)
492 SET_FLAG (dst, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
493 490
494 if (is_removed) 491 if (is_removed)
… …
525 tail = new_link; 522 tail = new_link;
526 } 523 }
527 } 524 }
528 } 525 }
529 526
530 update_ob_speed (dst); 527 dst->set_speed (dst->speed);
531} 528}
532 529
533object * 530object *
534object::clone () 531object::clone ()
535{ 532{
… …
557 * 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
558 * 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.
559 * 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.
560 */ 557 */
561void 558void
562update_ob_speed (object *op) 559object::set_speed (float speed)
563{ 560{
564 extern int arch_init; 561 extern int arch_init;
565 562
566 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
567 * since they never really need to be updated. 564 * since they never really need to be updated.
568 */ 565 */
569 566 if (flag [FLAG_FREED] && speed)
570 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571 { 567 {
572 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &name);
573#ifdef MANY_CORES
574 abort ();
575#else
576 op->speed = 0; 569 speed = 0;
577#endif
578 } 570 }
571
572 this->speed = speed;
579 573
580 if (arch_init) 574 if (arch_init)
581 return; 575 return;
582 576
583 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 577 if (FABS (speed) > MIN_ACTIVE_SPEED)
584 { 578 {
585 /* If already on active list, don't do anything */ 579 /* If already on active list, don't do anything */
586 if (op->active_next || op->active_prev || op == active_objects) 580 if (active_next || active_prev || this == active_objects)
587 return; 581 return;
588 582
589 /* process_events() expects us to insert the object at the beginning 583 /* process_events() expects us to insert the object at the beginning
590 * of the list. */ 584 * of the list. */
591 op->active_next = active_objects; 585 active_next = active_objects;
592 586
593 if (op->active_next != NULL) 587 if (active_next)
594 op->active_next->active_prev = op; 588 active_next->active_prev = this;
595 589
596 active_objects = op; 590 active_objects = this;
597 } 591 }
598 else 592 else
599 { 593 {
600 /* If not on the active list, nothing needs to be done */ 594 /* If not on the active list, nothing needs to be done */
601 if (!op->active_next && !op->active_prev && op != active_objects) 595 if (!active_next && !active_prev && this != active_objects)
602 return; 596 return;
603 597
604 if (op->active_prev == NULL) 598 if (!active_prev)
605 { 599 {
606 active_objects = op->active_next; 600 active_objects = active_next;
607 601
608 if (op->active_next != NULL) 602 if (active_next)
609 op->active_next->active_prev = NULL; 603 active_next->active_prev = 0;
610 } 604 }
611 else 605 else
612 { 606 {
613 op->active_prev->active_next = op->active_next; 607 active_prev->active_next = active_next;
614 608
615 if (op->active_next) 609 if (active_next)
616 op->active_next->active_prev = op->active_prev; 610 active_next->active_prev = active_prev;
617 } 611 }
618 612
619 op->active_next = NULL; 613 active_next = 0;
620 op->active_prev = NULL; 614 active_prev = 0;
621 } 615 }
622} 616}
623 617
624/* This function removes object 'op' from the list of active 618/* This function removes object 'op' from the list of active
625 * objects. 619 * objects.
… …
694 */ 688 */
695 if (!op->map || op->map->in_memory == MAP_SAVING) 689 if (!op->map || op->map->in_memory == MAP_SAVING)
696 return; 690 return;
697 691
698 /* make sure the object is within map boundaries */ 692 /* make sure the object is within map boundaries */
699 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)
700 { 694 {
701 LOG (llevError, "update_object() called for object out of map!\n"); 695 LOG (llevError, "update_object() called for object out of map!\n");
702#ifdef MANY_CORES 696#ifdef MANY_CORES
703 abort (); 697 abort ();
704#endif 698#endif
… …
741 735
742 if (op->more) 736 if (op->more)
743 update_object (op->more, action); 737 update_object (op->more, action);
744} 738}
745 739
746object::vector object::mortals;
747object::vector object::objects; // not yet used 740object::vector object::objects; // not yet used
748object *object::first; 741object *object::first;
749
750void object::free_mortals ()
751{
752 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753 if ((*i)->refcnt)
754 ++i; // further delay freeing
755 else
756 {
757 delete *i;
758 mortals.erase (i);
759 }
760}
761 742
762object::object () 743object::object ()
763{ 744{
764 SET_FLAG (this, FLAG_REMOVED); 745 SET_FLAG (this, FLAG_REMOVED);
765 746
… …
797 778
798 prev = 0; 779 prev = 0;
799 next = 0; 780 next = 0;
800} 781}
801 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 /* Only if the space blocks everything do we not process -
791 * if some form of movement is allowed, let objects
792 * drop on that space.
793 */
794 if (!drop_to_ground
795 || !map
796 || map->in_memory != MAP_IN_MEMORY
797 || map->at (x, y).move_block == MOVE_ALL)
798 {
799 while (inv)
800 {
801 inv->destroy_inv (drop_to_ground);
802 inv->destroy ();
803 }
804 }
805 else
806 { /* Put objects in inventory onto this space */
807 while (inv)
808 {
809 object *op = inv;
810
811 if (op->flag [FLAG_STARTEQUIP]
812 || op->flag [FLAG_NO_DROP]
813 || op->type == RUNE
814 || op->type == TRAP
815 || op->flag [FLAG_IS_A_TEMPLATE])
816 op->destroy ();
817 else
818 {
819 op->remove ();
820 op->x = x;
821 op->y = y;
822 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
823 }
824 }
825 }
826}
827
802object *object::create () 828object *object::create ()
803{ 829{
804 object *op = new object; 830 object *op = new object;
805 op->link (); 831 op->link ();
806 return op; 832 return op;
807} 833}
808 834
809/* 835void
810 * free_object() frees everything allocated by an object, removes 836object::do_destroy ()
811 * it from the list of used objects, and puts it on the list of
812 * free objects. The IS_FREED() flag is set in the object.
813 * The object must have been removed by remove_ob() first for
814 * this function to succeed.
815 *
816 * If destroy_inventory is set, free inventory as well. Else drop items in
817 * inventory to the ground.
818 */
819void object::destroy (bool destroy_inventory)
820{ 837{
821 if (QUERY_FLAG (this, FLAG_FREED)) 838 if (flag [FLAG_IS_LINKED])
839 remove_button_link (this);
840
841 if (flag [FLAG_FRIENDLY])
842 remove_friendly_object (this);
843
844 if (!flag [FLAG_REMOVED])
845 remove ();
846
847 if (flag [FLAG_FREED])
822 return; 848 return;
823 849
824 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 850 set_speed (0);
825 remove_friendly_object (this);
826 851
827 if (!QUERY_FLAG (this, FLAG_REMOVED)) 852 flag [FLAG_FREED] = 1;
828 remove ();
829 853
830 SET_FLAG (this, FLAG_FREED); 854 attachable::do_destroy ();
831 855
832 if (more) 856 destroy_inv (true);
833 { 857 unlink ();
834 more->destroy (destroy_inventory);
835 more = 0;
836 }
837
838 if (inv)
839 {
840 /* Only if the space blocks everything do we not process -
841 * if some form of movement is allowed, let objects
842 * drop on that space.
843 */
844 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845 {
846 object *op = inv;
847
848 while (op)
849 {
850 object *tmp = op->below;
851 op->destroy (destroy_inventory);
852 op = tmp;
853 }
854 }
855 else
856 { /* Put objects in inventory onto this space */
857 object *op = inv;
858
859 while (op)
860 {
861 object *tmp = op->below;
862
863 op->remove ();
864
865 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867 op->destroy ();
868 else
869 {
870 op->x = x;
871 op->y = y;
872 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873 }
874
875 op = tmp;
876 }
877 }
878 }
879 858
880 // hack to ensure that freed objects still have a valid map 859 // hack to ensure that freed objects still have a valid map
881 { 860 {
882 static maptile *freed_map; // freed objects are moved here to avoid crashes 861 static maptile *freed_map; // freed objects are moved here to avoid crashes
883 862
… …
895 map = freed_map; 874 map = freed_map;
896 x = 1; 875 x = 1;
897 y = 1; 876 y = 1;
898 } 877 }
899 878
879 head = 0;
880
881 if (more)
882 {
883 more->destroy ();
884 more = 0;
885 }
886
900 // clear those pointers that likely might have circular references to us 887 // clear those pointers that likely might have circular references to us
901 owner = 0; 888 owner = 0;
902 enemy = 0; 889 enemy = 0;
903 attacked_by = 0; 890 attacked_by = 0;
904 891
905 // only relevant for players(?), but make sure of it anyways 892 // only relevant for players(?), but make sure of it anyways
906 contr = 0; 893 contr = 0;
894}
907 895
908 /* Remove object from the active list */ 896void
909 speed = 0; 897object::destroy (bool destroy_inventory)
910 update_ob_speed (this); 898{
899 if (destroyed ())
900 return;
911 901
912 unlink (); 902 if (destroy_inventory)
903 destroy_inv (false);
913 904
914 mortals.push_back (this); 905 attachable::destroy ();
915} 906}
916 907
917/* 908/*
918 * sub_weight() recursively (outwards) subtracts a number from the 909 * sub_weight() recursively (outwards) subtracts a number from the
919 * weight of an object (and what is carried by it's environment(s)). 910 * weight of an object (and what is carried by it's environment(s)).
… …
943object::remove () 934object::remove ()
944{ 935{
945 object *tmp, *last = 0; 936 object *tmp, *last = 0;
946 object *otmp; 937 object *otmp;
947 938
948 int check_walk_off;
949
950 if (QUERY_FLAG (this, FLAG_REMOVED)) 939 if (QUERY_FLAG (this, FLAG_REMOVED))
951 return; 940 return;
952 941
953 SET_FLAG (this, FLAG_REMOVED); 942 SET_FLAG (this, FLAG_REMOVED);
943 INVOKE_OBJECT (REMOVE, this);
954 944
955 if (more) 945 if (more)
956 more->remove (); 946 more->remove ();
957 947
958 /* 948 /*
… …
1020 dump = dump_object (GET_MAP_OB (map, x, y)); 1010 dump = dump_object (GET_MAP_OB (map, x, y));
1021 LOG (llevError, "%s\n", dump); 1011 LOG (llevError, "%s\n", dump);
1022 free (dump); 1012 free (dump);
1023 } 1013 }
1024 1014
1025 map->at (x, y).bottom = above; /* goes on above it. */ 1015 map->at (x, y).bot = above; /* goes on above it. */
1026 } 1016 }
1027 1017
1028 above = 0; 1018 above = 0;
1029 below = 0; 1019 below = 0;
1030 1020
1031 if (map->in_memory == MAP_SAVING) 1021 if (map->in_memory == MAP_SAVING)
1032 return; 1022 return;
1033 1023
1034 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1024 int check_walk_off = !flag [FLAG_NO_APPLY];
1035 1025
1036 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1026 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1037 { 1027 {
1038 /* No point updating the players look faces if he is the object 1028 /* No point updating the players look faces if he is the object
1039 * being removed. 1029 * being removed.
1040 */ 1030 */
1041 1031
… …
1045 * removed (most likely destroyed), update the player view 1035 * removed (most likely destroyed), update the player view
1046 * appropriately. 1036 * appropriately.
1047 */ 1037 */
1048 if (tmp->container == this) 1038 if (tmp->container == this)
1049 { 1039 {
1050 CLEAR_FLAG (this, FLAG_APPLIED); 1040 flag [FLAG_APPLIED] = 0;
1051 tmp->container = 0; 1041 tmp->container = 0;
1052 } 1042 }
1053 1043
1044 if (tmp->contr->ns)
1054 tmp->contr->ns->floorbox_update (); 1045 tmp->contr->ns->floorbox_update ();
1055 } 1046 }
1056 1047
1057 /* See if player moving off should effect something */ 1048 /* See if player moving off should effect something */
1058 if (check_walk_off 1049 if (check_walk_off
1059 && ((move_type & tmp->move_off) 1050 && ((move_type & tmp->move_off)
… …
1077 if (!last) 1068 if (!last)
1078 map->at (x, y).flags_ = P_NEED_UPDATE; 1069 map->at (x, y).flags_ = P_NEED_UPDATE;
1079 else 1070 else
1080 update_object (last, UP_OBJ_REMOVE); 1071 update_object (last, UP_OBJ_REMOVE);
1081 1072
1082 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1073 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083 update_all_los (map, x, y); 1074 update_all_los (map, x, y);
1084 } 1075 }
1085} 1076}
1086 1077
1087/* 1078/*
… …
1096merge_ob (object *op, object *top) 1087merge_ob (object *op, object *top)
1097{ 1088{
1098 if (!op->nrof) 1089 if (!op->nrof)
1099 return 0; 1090 return 0;
1100 1091
1101 if (top == NULL) 1092 if (top)
1102 for (top = op; top != NULL && top->above != NULL; top = top->above); 1093 for (top = op; top && top->above; top = top->above)
1094 ;
1103 1095
1104 for (; top != NULL; top = top->below) 1096 for (; top; top = top->below)
1105 { 1097 {
1106 if (top == op) 1098 if (top == op)
1107 continue; 1099 continue;
1108 1100
1109 if (object::can_merge (op, top)) 1101 if (object::can_merge (op, top))
… …
1159 * Return value: 1151 * Return value:
1160 * new object if 'op' was merged with other object 1152 * new object if 'op' was merged with other object
1161 * NULL if 'op' was destroyed 1153 * NULL if 'op' was destroyed
1162 * just 'op' otherwise 1154 * just 'op' otherwise
1163 */ 1155 */
1164
1165object * 1156object *
1166insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1157insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167{ 1158{
1168 object *tmp, *top, *floor = NULL; 1159 object *tmp, *top, *floor = NULL;
1169 sint16 x, y; 1160 sint16 x, y;
… …
1203 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1194 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204 free (dump); 1195 free (dump);
1205 return op; 1196 return op;
1206 } 1197 }
1207 1198
1208 if (op->more != NULL) 1199 if (op->more)
1209 { 1200 {
1210 /* The part may be on a different map. */ 1201 /* The part may be on a different map. */
1211 1202
1212 object *more = op->more; 1203 object *more = op->more;
1213 1204
… …
1229 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1220 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1230 { 1221 {
1231 if (!op->head) 1222 if (!op->head)
1232 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1223 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233 1224
1234 return NULL; 1225 return 0;
1235 } 1226 }
1236 } 1227 }
1237 1228
1238 CLEAR_FLAG (op, FLAG_REMOVED); 1229 CLEAR_FLAG (op, FLAG_REMOVED);
1239 1230
… …
1273 op->below = originator->below; 1264 op->below = originator->below;
1274 1265
1275 if (op->below) 1266 if (op->below)
1276 op->below->above = op; 1267 op->below->above = op;
1277 else 1268 else
1278 op->ms ().bottom = op; 1269 op->ms ().bot = op;
1279 1270
1280 /* since *below* originator, no need to update top */ 1271 /* since *below* originator, no need to update top */
1281 originator->below = op; 1272 originator->below = op;
1282 } 1273 }
1283 else 1274 else
… …
1362 1353
1363 if (op->above) 1354 if (op->above)
1364 op->above->below = op; 1355 op->above->below = op;
1365 1356
1366 op->below = NULL; 1357 op->below = NULL;
1367 op->ms ().bottom = op; 1358 op->ms ().bot = op;
1368 } 1359 }
1369 else 1360 else
1370 { /* get inserted into the stack above top */ 1361 { /* get inserted into the stack above top */
1371 op->above = top->above; 1362 op->above = top->above;
1372 1363
… …
1387 /* If we have a floor, we know the player, if any, will be above 1378 /* If we have a floor, we know the player, if any, will be above
1388 * it, so save a few ticks and start from there. 1379 * it, so save a few ticks and start from there.
1389 */ 1380 */
1390 if (!(flag & INS_MAP_LOAD)) 1381 if (!(flag & INS_MAP_LOAD))
1391 if (object *pl = op->ms ().player ()) 1382 if (object *pl = op->ms ().player ())
1383 if (pl->contr->ns)
1392 pl->contr->ns->floorbox_update (); 1384 pl->contr->ns->floorbox_update ();
1393 1385
1394 /* If this object glows, it may affect lighting conditions that are 1386 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1387 * visible to others on this map. But update_all_los is really
1396 * an inefficient way to do this, as it means los for all players 1388 * an inefficient way to do this, as it means los for all players
1397 * on the map will get recalculated. The players could very well 1389 * on the map will get recalculated. The players could very well
1398 * be far away from this change and not affected in any way - 1390 * be far away from this change and not affected in any way -
1399 * this should get redone to only look for players within range, 1391 * this should get redone to only look for players within range,
1400 * or just updating the P_NEED_UPDATE for spaces within this area 1392 * or just updating the P_NEED_UPDATE for spaces within this area
1401 * of effect may be sufficient. 1393 * of effect may be sufficient.
1402 */ 1394 */
1403 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1395 if (op->map->darkness && (op->glow_radius != 0))
1404 update_all_los (op->map, op->x, op->y); 1396 update_all_los (op->map, op->x, op->y);
1405 1397
1406 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1398 /* updates flags (blocked, alive, no magic, etc) for this map space */
1407 update_object (op, UP_OBJ_INSERT); 1399 update_object (op, UP_OBJ_INSERT);
1400
1401 INVOKE_OBJECT (INSERT, op);
1408 1402
1409 /* Don't know if moving this to the end will break anything. However, 1403 /* Don't know if moving this to the end will break anything. However,
1410 * we want to have floorbox_update called before calling this. 1404 * we want to have floorbox_update called before calling this.
1411 * 1405 *
1412 * check_move_on() must be after this because code called from 1406 * check_move_on() must be after this because code called from
… …
1417 1411
1418 /* if this is not the head or flag has been passed, don't check walk on status */ 1412 /* if this is not the head or flag has been passed, don't check walk on status */
1419 if (!(flag & INS_NO_WALK_ON) && !op->head) 1413 if (!(flag & INS_NO_WALK_ON) && !op->head)
1420 { 1414 {
1421 if (check_move_on (op, originator)) 1415 if (check_move_on (op, originator))
1422 return NULL; 1416 return 0;
1423 1417
1424 /* If we are a multi part object, lets work our way through the check 1418 /* If we are a multi part object, lets work our way through the check
1425 * walk on's. 1419 * walk on's.
1426 */ 1420 */
1427 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1421 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1428 if (check_move_on (tmp, originator)) 1422 if (check_move_on (tmp, originator))
1429 return NULL; 1423 return 0;
1430 } 1424 }
1431 1425
1432 return op; 1426 return op;
1433} 1427}
1434 1428
… …
1505 1499
1506object * 1500object *
1507decrease_ob_nr (object *op, uint32 i) 1501decrease_ob_nr (object *op, uint32 i)
1508{ 1502{
1509 object *tmp; 1503 object *tmp;
1510 player *pl;
1511 1504
1512 if (i == 0) /* objects with op->nrof require this check */ 1505 if (i == 0) /* objects with op->nrof require this check */
1513 return op; 1506 return op;
1514 1507
1515 if (i > op->nrof) 1508 if (i > op->nrof)
… …
1528 * IMO, searching through all the players will mostly 1521 * IMO, searching through all the players will mostly
1529 * likely be quicker than following op->env to the map, 1522 * likely be quicker than following op->env to the map,
1530 * and then searching the map for a player. 1523 * and then searching the map for a player.
1531 */ 1524 */
1532 if (!tmp) 1525 if (!tmp)
1533 { 1526 for_all_players (pl)
1534 for (pl = first_player; pl; pl = pl->next)
1535 if (pl->ob->container == op->env) 1527 if (pl->ob->container == op->env)
1536 { 1528 {
1537 tmp = pl->ob; 1529 tmp = pl->ob;
1538 break; 1530 break;
1539 } 1531 }
1540 }
1541 1532
1542 if (i < op->nrof) 1533 if (i < op->nrof)
1543 { 1534 {
1544 sub_weight (op->env, op->weight * i); 1535 sub_weight (op->env, op->weight * i);
1545 op->nrof -= i; 1536 op->nrof -= i;
… …
1695 if ((op->glow_radius != 0) && map) 1686 if ((op->glow_radius != 0) && map)
1696 { 1687 {
1697#ifdef DEBUG_LIGHTS 1688#ifdef DEBUG_LIGHTS
1698 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1689 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1699#endif /* DEBUG_LIGHTS */ 1690#endif /* DEBUG_LIGHTS */
1700 if (MAP_DARKNESS (map)) 1691 if (map->darkness)
1701 update_all_los (map, x, y); 1692 update_all_los (map, x, y);
1702 } 1693 }
1703 1694
1704 /* Client has no idea of ordering so lets not bother ordering it here. 1695 /* Client has no idea of ordering so lets not bother ordering it here.
1705 * It sure simplifies this function... 1696 * It sure simplifies this function...
… …
1710 { 1701 {
1711 op->below = inv; 1702 op->below = inv;
1712 op->below->above = op; 1703 op->below->above = op;
1713 inv = op; 1704 inv = op;
1714 } 1705 }
1706
1707 INVOKE_OBJECT (INSERT, this);
1715 1708
1716 return op; 1709 return op;
1717} 1710}
1718 1711
1719/* 1712/*
… …
1771 1764
1772 /* The objects have to be checked from top to bottom. 1765 /* The objects have to be checked from top to bottom.
1773 * Hence, we first go to the top: 1766 * Hence, we first go to the top:
1774 */ 1767 */
1775 1768
1776 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1769 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1777 { 1770 {
1778 /* Trim the search when we find the first other spell effect 1771 /* Trim the search when we find the first other spell effect
1779 * this helps performance so that if a space has 50 spell objects, 1772 * this helps performance so that if a space has 50 spell objects,
1780 * we don't need to check all of them. 1773 * we don't need to check all of them.
1781 */ 1774 */
… …
1836/* 1829/*
1837 * present_arch(arch, map, x, y) searches for any objects with 1830 * present_arch(arch, map, x, y) searches for any objects with
1838 * a matching archetype at the given map and coordinates. 1831 * a matching archetype at the given map and coordinates.
1839 * The first matching object is returned, or NULL if none. 1832 * The first matching object is returned, or NULL if none.
1840 */ 1833 */
1841
1842object * 1834object *
1843present_arch (const archetype *at, maptile *m, int x, int y) 1835present_arch (const archetype *at, maptile *m, int x, int y)
1844{ 1836{
1845 object *
1846 tmp;
1847
1848 if (m == NULL || out_of_map (m, x, y)) 1837 if (m == NULL || out_of_map (m, x, y))
1849 { 1838 {
1850 LOG (llevError, "Present_arch called outside map.\n"); 1839 LOG (llevError, "Present_arch called outside map.\n");
1851 return NULL; 1840 return NULL;
1852 } 1841 }
1842
1853 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1843 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1854 if (tmp->arch == at) 1844 if (tmp->arch == at)
1855 return tmp; 1845 return tmp;
1846
1856 return NULL; 1847 return NULL;
1857} 1848}
1858 1849
1859/* 1850/*
1860 * present(type, map, x, y) searches for any objects with 1851 * present(type, map, x, y) searches for any objects with
1861 * a matching type variable at the given map and coordinates. 1852 * a matching type variable at the given map and coordinates.
1862 * The first matching object is returned, or NULL if none. 1853 * The first matching object is returned, or NULL if none.
1863 */ 1854 */
1864
1865object * 1855object *
1866present (unsigned char type, maptile *m, int x, int y) 1856present (unsigned char type, maptile *m, int x, int y)
1867{ 1857{
1868 object *
1869 tmp;
1870
1871 if (out_of_map (m, x, y)) 1858 if (out_of_map (m, x, y))
1872 { 1859 {
1873 LOG (llevError, "Present called outside map.\n"); 1860 LOG (llevError, "Present called outside map.\n");
1874 return NULL; 1861 return NULL;
1875 } 1862 }
1863
1876 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1864 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1877 if (tmp->type == type) 1865 if (tmp->type == type)
1878 return tmp; 1866 return tmp;
1867
1879 return NULL; 1868 return NULL;
1880} 1869}
1881 1870
1882/* 1871/*
1883 * present_in_ob(type, object) searches for any objects with 1872 * present_in_ob(type, object) searches for any objects with
1884 * a matching type variable in the inventory of the given object. 1873 * a matching type variable in the inventory of the given object.
1885 * The first matching object is returned, or NULL if none. 1874 * The first matching object is returned, or NULL if none.
1886 */ 1875 */
1887
1888object * 1876object *
1889present_in_ob (unsigned char type, const object *op) 1877present_in_ob (unsigned char type, const object *op)
1890{ 1878{
1891 object *
1892 tmp;
1893
1894 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1879 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1895 if (tmp->type == type) 1880 if (tmp->type == type)
1896 return tmp; 1881 return tmp;
1882
1897 return NULL; 1883 return NULL;
1898} 1884}
1899 1885
1900/* 1886/*
1901 * present_in_ob (type, str, object) searches for any objects with 1887 * present_in_ob (type, str, object) searches for any objects with
… …
1909 * str is the string to match against. Note that we match against 1895 * str is the string to match against. Note that we match against
1910 * the object name, not the archetype name. this is so that the 1896 * the object name, not the archetype name. this is so that the
1911 * spell code can use one object type (force), but change it's name 1897 * spell code can use one object type (force), but change it's name
1912 * to be unique. 1898 * to be unique.
1913 */ 1899 */
1914
1915object * 1900object *
1916present_in_ob_by_name (int type, const char *str, const object *op) 1901present_in_ob_by_name (int type, const char *str, const object *op)
1917{ 1902{
1918 object *
1919 tmp;
1920
1921 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1903 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922 {
1923 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1904 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1924 return tmp; 1905 return tmp;
1925 } 1906
1926 return NULL; 1907 return 0;
1927} 1908}
1928 1909
1929/* 1910/*
1930 * present_arch_in_ob(archetype, object) searches for any objects with 1911 * present_arch_in_ob(archetype, object) searches for any objects with
1931 * a matching archetype in the inventory of the given object. 1912 * a matching archetype in the inventory of the given object.
1932 * The first matching object is returned, or NULL if none. 1913 * The first matching object is returned, or NULL if none.
1933 */ 1914 */
1934
1935object * 1915object *
1936present_arch_in_ob (const archetype *at, const object *op) 1916present_arch_in_ob (const archetype *at, const object *op)
1937{ 1917{
1938 object *
1939 tmp;
1940
1941 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1918 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1942 if (tmp->arch == at) 1919 if (tmp->arch == at)
1943 return tmp; 1920 return tmp;
1921
1944 return NULL; 1922 return NULL;
1945} 1923}
1946 1924
1947/* 1925/*
1948 * activate recursively a flag on an object inventory 1926 * activate recursively a flag on an object inventory
1949 */ 1927 */
1950void 1928void
1951flag_inv (object *op, int flag) 1929flag_inv (object *op, int flag)
1952{ 1930{
1953 object *
1954 tmp;
1955
1956 if (op->inv) 1931 if (op->inv)
1957 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1932 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1958 { 1933 {
1959 SET_FLAG (tmp, flag); 1934 SET_FLAG (tmp, flag);
1960 flag_inv (tmp, flag); 1935 flag_inv (tmp, flag);
1961 } 1936 }
1962} /* 1937}
1938
1939/*
1963 * desactivate recursively a flag on an object inventory 1940 * deactivate recursively a flag on an object inventory
1964 */ 1941 */
1965void 1942void
1966unflag_inv (object *op, int flag) 1943unflag_inv (object *op, int flag)
1967{ 1944{
1968 object *
1969 tmp;
1970
1971 if (op->inv) 1945 if (op->inv)
1972 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1946 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973 { 1947 {
1974 CLEAR_FLAG (tmp, flag); 1948 CLEAR_FLAG (tmp, flag);
1975 unflag_inv (tmp, flag); 1949 unflag_inv (tmp, flag);
1976 } 1950 }
1977} 1951}
… …
1980 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1954 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981 * all it's inventory (recursively). 1955 * all it's inventory (recursively).
1982 * If checksums are used, a player will get set_cheat called for 1956 * If checksums are used, a player will get set_cheat called for
1983 * him/her-self and all object carried by a call to this function. 1957 * him/her-self and all object carried by a call to this function.
1984 */ 1958 */
1985
1986void 1959void
1987set_cheat (object *op) 1960set_cheat (object *op)
1988{ 1961{
1989 SET_FLAG (op, FLAG_WAS_WIZ); 1962 SET_FLAG (op, FLAG_WAS_WIZ);
1990 flag_inv (op, FLAG_WAS_WIZ); 1963 flag_inv (op, FLAG_WAS_WIZ);
… …
2009 * because arch_blocked (now ob_blocked) needs to know the movement type 1982 * because arch_blocked (now ob_blocked) needs to know the movement type
2010 * to know if the space in question will block the object. We can't use 1983 * to know if the space in question will block the object. We can't use
2011 * the archetype because that isn't correct if the monster has been 1984 * the archetype because that isn't correct if the monster has been
2012 * customized, changed states, etc. 1985 * customized, changed states, etc.
2013 */ 1986 */
2014
2015int 1987int
2016find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1988find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2017{ 1989{
2018 int
2019 i,
2020 index = 0, flag; 1990 int index = 0, flag;
2021 static int
2022 altern[SIZEOFFREE]; 1991 int altern[SIZEOFFREE];
2023 1992
2024 for (i = start; i < stop; i++) 1993 for (int i = start; i < stop; i++)
2025 { 1994 {
2026 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1995 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2027 if (!flag) 1996 if (!flag)
2028 altern[index++] = i; 1997 altern [index++] = i;
2029 1998
2030 /* Basically, if we find a wall on a space, we cut down the search size. 1999 /* Basically, if we find a wall on a space, we cut down the search size.
2031 * In this way, we won't return spaces that are on another side of a wall. 2000 * In this way, we won't return spaces that are on another side of a wall.
2032 * This mostly work, but it cuts down the search size in all directions - 2001 * This mostly work, but it cuts down the search size in all directions -
2033 * if the space being examined only has a wall to the north and empty 2002 * if the space being examined only has a wall to the north and empty
… …
2049 * find_first_free_spot(archetype, maptile, x, y) works like 2018 * find_first_free_spot(archetype, maptile, x, y) works like
2050 * find_free_spot(), but it will search max number of squares. 2019 * find_free_spot(), but it will search max number of squares.
2051 * But it will return the first available spot, not a random choice. 2020 * But it will return the first available spot, not a random choice.
2052 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2021 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2053 */ 2022 */
2054
2055int 2023int
2056find_first_free_spot (const object *ob, maptile *m, int x, int y) 2024find_first_free_spot (const object *ob, maptile *m, int x, int y)
2057{ 2025{
2058 int
2059 i;
2060
2061 for (i = 0; i < SIZEOFFREE; i++) 2026 for (int i = 0; i < SIZEOFFREE; i++)
2062 {
2063 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2027 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2064 return i; 2028 return i;
2065 } 2029
2066 return -1; 2030 return -1;
2067} 2031}
2068 2032
2069/* 2033/*
2070 * The function permute(arr, begin, end) randomly reorders the array 2034 * The function permute(arr, begin, end) randomly reorders the array
2071 * arr[begin..end-1]. 2035 * arr[begin..end-1].
2036 * now uses a fisher-yates shuffle, old permute was broken
2072 */ 2037 */
2073static void 2038static void
2074permute (int *arr, int begin, int end) 2039permute (int *arr, int begin, int end)
2075{ 2040{
2076 int 2041 arr += begin;
2077 i,
2078 j,
2079 tmp,
2080 len;
2081
2082 len = end - begin; 2042 end -= begin;
2083 for (i = begin; i < end; i++)
2084 {
2085 j = begin + RANDOM () % len;
2086 2043
2087 tmp = arr[i]; 2044 while (--end)
2088 arr[i] = arr[j]; 2045 swap (arr [end], arr [RANDOM () % (end + 1)]);
2089 arr[j] = tmp;
2090 }
2091} 2046}
2092 2047
2093/* new function to make monster searching more efficient, and effective! 2048/* new function to make monster searching more efficient, and effective!
2094 * This basically returns a randomized array (in the passed pointer) of 2049 * This basically returns a randomized array (in the passed pointer) of
2095 * the spaces to find monsters. In this way, it won't always look for 2050 * the spaces to find monsters. In this way, it won't always look for
… …
2098 * the 3x3 area will be searched, just not in a predictable order. 2053 * the 3x3 area will be searched, just not in a predictable order.
2099 */ 2054 */
2100void 2055void
2101get_search_arr (int *search_arr) 2056get_search_arr (int *search_arr)
2102{ 2057{
2103 int 2058 int i;
2104 i;
2105 2059
2106 for (i = 0; i < SIZEOFFREE; i++) 2060 for (i = 0; i < SIZEOFFREE; i++)
2107 {
2108 search_arr[i] = i; 2061 search_arr[i] = i;
2109 }
2110 2062
2111 permute (search_arr, 1, SIZEOFFREE1 + 1); 2063 permute (search_arr, 1, SIZEOFFREE1 + 1);
2112 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2064 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2113 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2065 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2114} 2066}
… …
2123 * Perhaps incorrectly, but I'm making the assumption that exclude 2075 * Perhaps incorrectly, but I'm making the assumption that exclude
2124 * is actually want is going to try and move there. We need this info 2076 * is actually want is going to try and move there. We need this info
2125 * because we have to know what movement the thing looking to move 2077 * because we have to know what movement the thing looking to move
2126 * there is capable of. 2078 * there is capable of.
2127 */ 2079 */
2128
2129int 2080int
2130find_dir (maptile *m, int x, int y, object *exclude) 2081find_dir (maptile *m, int x, int y, object *exclude)
2131{ 2082{
2132 int
2133 i,
2134 max = SIZEOFFREE, mflags; 2083 int i, max = SIZEOFFREE, mflags;
2135 2084
2136 sint16 nx, ny; 2085 sint16 nx, ny;
2137 object * 2086 object *tmp;
2138 tmp;
2139 maptile * 2087 maptile *mp;
2140 mp;
2141 2088
2142 MoveType blocked, move_type; 2089 MoveType blocked, move_type;
2143 2090
2144 if (exclude && exclude->head) 2091 if (exclude && exclude->head)
2145 { 2092 {
… …
2162 2109
2163 if (mflags & P_OUT_OF_MAP) 2110 if (mflags & P_OUT_OF_MAP)
2164 max = maxfree[i]; 2111 max = maxfree[i];
2165 else 2112 else
2166 { 2113 {
2167 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2114 mapspace &ms = mp->at (nx, ny);
2115
2116 blocked = ms.move_block;
2168 2117
2169 if ((move_type & blocked) == move_type) 2118 if ((move_type & blocked) == move_type)
2170 max = maxfree[i]; 2119 max = maxfree[i];
2171 else if (mflags & P_IS_ALIVE) 2120 else if (mflags & P_IS_ALIVE)
2172 { 2121 {
2173 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2122 for (tmp = ms.bot; tmp; tmp = tmp->above)
2174 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2123 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2124 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2175 break; 2125 break;
2176 2126
2177 if (tmp) 2127 if (tmp)
2178 return freedir[i]; 2128 return freedir[i];
2179 } 2129 }
… …
2185 2135
2186/* 2136/*
2187 * distance(object 1, object 2) will return the square of the 2137 * distance(object 1, object 2) will return the square of the
2188 * distance between the two given objects. 2138 * distance between the two given objects.
2189 */ 2139 */
2190
2191int 2140int
2192distance (const object *ob1, const object *ob2) 2141distance (const object *ob1, const object *ob2)
2193{ 2142{
2194 int i;
2195
2196 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2143 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2197 return i;
2198} 2144}
2199 2145
2200/* 2146/*
2201 * find_dir_2(delta-x,delta-y) will return a direction in which 2147 * find_dir_2(delta-x,delta-y) will return a direction in which
2202 * an object which has subtracted the x and y coordinates of another 2148 * an object which has subtracted the x and y coordinates of another
2203 * object, needs to travel toward it. 2149 * object, needs to travel toward it.
2204 */ 2150 */
2205
2206int 2151int
2207find_dir_2 (int x, int y) 2152find_dir_2 (int x, int y)
2208{ 2153{
2209 int q; 2154 int q;
2210 2155
… …
2249int 2194int
2250absdir (int d) 2195absdir (int d)
2251{ 2196{
2252 while (d < 1) 2197 while (d < 1)
2253 d += 8; 2198 d += 8;
2199
2254 while (d > 8) 2200 while (d > 8)
2255 d -= 8; 2201 d -= 8;
2202
2256 return d; 2203 return d;
2257} 2204}
2258 2205
2259/* 2206/*
2260 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2207 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2262 */ 2209 */
2263 2210
2264int 2211int
2265dirdiff (int dir1, int dir2) 2212dirdiff (int dir1, int dir2)
2266{ 2213{
2267 int 2214 int d;
2268 d;
2269 2215
2270 d = abs (dir1 - dir2); 2216 d = abs (dir1 - dir2);
2271 if (d > 4) 2217 if (d > 4)
2272 d = 8 - d; 2218 d = 8 - d;
2219
2273 return d; 2220 return d;
2274} 2221}
2275 2222
2276/* peterm: 2223/* peterm:
2277 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2224 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2280 * This basically means that if direction is 15, then it could either go 2227 * This basically means that if direction is 15, then it could either go
2281 * direction 4, 14, or 16 to get back to where we are. 2228 * direction 4, 14, or 16 to get back to where we are.
2282 * Moved from spell_util.c to object.c with the other related direction 2229 * Moved from spell_util.c to object.c with the other related direction
2283 * functions. 2230 * functions.
2284 */ 2231 */
2285
2286int
2287 reduction_dir[SIZEOFFREE][3] = { 2232int reduction_dir[SIZEOFFREE][3] = {
2288 {0, 0, 0}, /* 0 */ 2233 {0, 0, 0}, /* 0 */
2289 {0, 0, 0}, /* 1 */ 2234 {0, 0, 0}, /* 1 */
2290 {0, 0, 0}, /* 2 */ 2235 {0, 0, 0}, /* 2 */
2291 {0, 0, 0}, /* 3 */ 2236 {0, 0, 0}, /* 3 */
2292 {0, 0, 0}, /* 4 */ 2237 {0, 0, 0}, /* 4 */
… …
2442/* Basically, we save the content of the string to a temp file, then call */ 2387/* Basically, we save the content of the string to a temp file, then call */
2443/* load_object on it. I admit it is a highly inefficient way to make things, */ 2388/* load_object on it. I admit it is a highly inefficient way to make things, */
2444/* but it was simple to make and allows reusing the load_object function. */ 2389/* but it was simple to make and allows reusing the load_object function. */
2445/* Remember not to use load_object_str in a time-critical situation. */ 2390/* Remember not to use load_object_str in a time-critical situation. */
2446/* Also remember that multiparts objects are not supported for now. */ 2391/* Also remember that multiparts objects are not supported for now. */
2447
2448object * 2392object *
2449load_object_str (const char *obstr) 2393load_object_str (const char *obstr)
2450{ 2394{
2451 object *op; 2395 object *op;
2452 char filename[MAX_BUF]; 2396 char filename[MAX_BUF];
… …
2482 * returns NULL if no match. 2426 * returns NULL if no match.
2483 */ 2427 */
2484object * 2428object *
2485find_obj_by_type_subtype (const object *who, int type, int subtype) 2429find_obj_by_type_subtype (const object *who, int type, int subtype)
2486{ 2430{
2487 object *tmp;
2488
2489 for (tmp = who->inv; tmp; tmp = tmp->below) 2431 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2490 if (tmp->type == type && tmp->subtype == subtype) 2432 if (tmp->type == type && tmp->subtype == subtype)
2491 return tmp; 2433 return tmp;
2492 2434
2493 return NULL; 2435 return 0;
2494} 2436}
2495 2437
2496/* If ob has a field named key, return the link from the list, 2438/* If ob has a field named key, return the link from the list,
2497 * otherwise return NULL. 2439 * otherwise return NULL.
2498 * 2440 *
… …
2500 * do the desired thing. 2442 * do the desired thing.
2501 */ 2443 */
2502key_value * 2444key_value *
2503get_ob_key_link (const object *ob, const char *key) 2445get_ob_key_link (const object *ob, const char *key)
2504{ 2446{
2505 key_value *link;
2506
2507 for (link = ob->key_values; link != NULL; link = link->next) 2447 for (key_value *link = ob->key_values; link; link = link->next)
2508 if (link->key == key) 2448 if (link->key == key)
2509 return link; 2449 return link;
2510 2450
2511 return NULL; 2451 return 0;
2512} 2452}
2513 2453
2514/* 2454/*
2515 * Returns the value of op has an extra_field for key, or NULL. 2455 * Returns the value of op has an extra_field for key, or NULL.
2516 * 2456 *
… …
2556 * Returns TRUE on success. 2496 * Returns TRUE on success.
2557 */ 2497 */
2558int 2498int
2559set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2499set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2560{ 2500{
2561 key_value *
2562 field = NULL, *last = NULL; 2501 key_value *field = NULL, *last = NULL;
2563 2502
2564 for (field = op->key_values; field != NULL; field = field->next) 2503 for (field = op->key_values; field != NULL; field = field->next)
2565 { 2504 {
2566 if (field->key != canonical_key) 2505 if (field->key != canonical_key)
2567 { 2506 {
… …
2595 /* IF we get here, key doesn't exist */ 2534 /* IF we get here, key doesn't exist */
2596 2535
2597 /* No field, we'll have to add it. */ 2536 /* No field, we'll have to add it. */
2598 2537
2599 if (!add_key) 2538 if (!add_key)
2600 {
2601 return FALSE; 2539 return FALSE;
2602 } 2540
2603 /* There isn't any good reason to store a null 2541 /* There isn't any good reason to store a null
2604 * value in the key/value list. If the archetype has 2542 * value in the key/value list. If the archetype has
2605 * this key, then we should also have it, so shouldn't 2543 * this key, then we should also have it, so shouldn't
2606 * be here. If user wants to store empty strings, 2544 * be here. If user wants to store empty strings,
2607 * should pass in "" 2545 * should pass in ""

Diff Legend

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