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

Diff Legend

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