ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC

… …
141 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
143 */ 143 */
144 144
145 /* For each field in wants, */ 145 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 147 {
148 key_value *has_field; 148 key_value *has_field;
149 149
150 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 222
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 225
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 227 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 228 || ob1->name != ob2->name
229 || ob1->title != ob2->title 229 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 230 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 231 || ob1->weight != ob2->weight
… …
364{ 364{
365 if (!op) 365 if (!op)
366 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
367 367
368 object_freezer freezer; 368 object_freezer freezer;
369 save_object (freezer, op, 3); 369 save_object (freezer, op, 1);
370 return freezer.as_string (); 370 return freezer.as_string ();
371} 371}
372 372
373/* 373/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
… …
467 } 467 }
468 468
469 op->key_values = 0; 469 op->key_values = 0;
470} 470}
471 471
472void object::clear ()
473{
474 attachable_base::clear ();
475
476 free_key_values (this);
477
478 owner = 0;
479 name = 0;
480 name_pl = 0;
481 title = 0;
482 race = 0;
483 slaying = 0;
484 skill = 0;
485 msg = 0;
486 lore = 0;
487 custom_name = 0;
488 materialname = 0;
489 contr = 0;
490 below = 0;
491 above = 0;
492 inv = 0;
493 container = 0;
494 env = 0;
495 more = 0;
496 head = 0;
497 map = 0;
498 active_next = 0;
499 active_prev = 0;
500
501 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503 SET_FLAG (this, FLAG_REMOVED);
504
505 /* What is not cleared is next, prev, and count */
506
507 expmul = 1.0;
508 face = blank_face;
509
510 if (settings.casting_time)
511 casting_time = -1;
512}
513
514/* 472/*
515 * copy_to first frees everything allocated by the dst object, 473 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second 474 * and then copies the contents of itself into the second
517 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
518 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
… …
524{ 482{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527 485
528 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533 487
534 if (is_freed) 488 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
536 490
537 if (is_removed) 491 if (is_removed)
… …
607 extern int arch_init; 561 extern int arch_init;
608 562
609 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
610 * since they never really need to be updated. 564 * since they never really need to be updated.
611 */ 565 */
612
613 if (QUERY_FLAG (op, FLAG_FREED) && op->speed) 566 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614 { 567 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0; 569 op->speed = 0;
620#endif
621 } 570 }
622 571
623 if (arch_init) 572 if (arch_init)
624 return; 573 return;
625 574
… …
737 */ 686 */
738 if (!op->map || op->map->in_memory == MAP_SAVING) 687 if (!op->map || op->map->in_memory == MAP_SAVING)
739 return; 688 return;
740 689
741 /* make sure the object is within map boundaries */ 690 /* make sure the object is within map boundaries */
742 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 691 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743 { 692 {
744 LOG (llevError, "update_object() called for object out of map!\n"); 693 LOG (llevError, "update_object() called for object out of map!\n");
745#ifdef MANY_CORES 694#ifdef MANY_CORES
746 abort (); 695 abort ();
747#endif 696#endif
748 return; 697 return;
749 } 698 }
750 699
751 mapspace &m = op->map->at (op->x, op->y); 700 mapspace &m = op->ms ();
752 701
753 if (m.flags_ & P_NEED_UPDATE) 702 if (m.flags_ & P_NEED_UPDATE)
754 /* nop */; 703 /* nop */;
755 else if (action == UP_OBJ_INSERT) 704 else if (action == UP_OBJ_INSERT)
756 { 705 {
… …
784 733
785 if (op->more) 734 if (op->more)
786 update_object (op->more, action); 735 update_object (op->more, action);
787} 736}
788 737
789object::vector object::mortals;
790object::vector object::objects; // not yet used 738object::vector object::objects; // not yet used
791object *object::first; 739object *object::first;
792
793void object::free_mortals ()
794{
795 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796 if ((*i)->refcnt)
797 ++i; // further delay freeing
798 else
799 {
800 delete *i;
801 mortals.erase (i);
802 }
803}
804 740
805object::object () 741object::object ()
806{ 742{
807 SET_FLAG (this, FLAG_REMOVED); 743 SET_FLAG (this, FLAG_REMOVED);
808 744
… …
857 * this function to succeed. 793 * this function to succeed.
858 * 794 *
859 * If destroy_inventory is set, free inventory as well. Else drop items in 795 * If destroy_inventory is set, free inventory as well. Else drop items in
860 * inventory to the ground. 796 * inventory to the ground.
861 */ 797 */
862void object::destroy (bool destroy_inventory) 798void
799object::do_destroy ()
863{ 800{
864 if (QUERY_FLAG (this, FLAG_FREED)) 801 attachable::do_destroy ();
802
803 if (flag [FLAG_IS_LINKED])
804 remove_button_link (this);
805
806 if (flag [FLAG_FRIENDLY])
807 remove_friendly_object (this);
808
809 if (!flag [FLAG_REMOVED])
810 remove ();
811
812 if (flag [FLAG_FREED])
865 return; 813 return;
866 814
867 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 815 flag [FLAG_FREED] = 1;
868 remove_friendly_object (this);
869
870 if (!QUERY_FLAG (this, FLAG_REMOVED))
871 remove ();
872
873 SET_FLAG (this, FLAG_FREED);
874
875 if (more)
876 {
877 more->destroy (destroy_inventory);
878 more = 0;
879 }
880
881 if (inv)
882 {
883 /* Only if the space blocks everything do we not process -
884 * if some form of movement is allowed, let objects
885 * drop on that space.
886 */
887 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888 {
889 object *op = inv;
890
891 while (op)
892 {
893 object *tmp = op->below;
894 op->destroy (destroy_inventory);
895 op = tmp;
896 }
897 }
898 else
899 { /* Put objects in inventory onto this space */
900 object *op = inv;
901
902 while (op)
903 {
904 object *tmp = op->below;
905
906 op->remove ();
907
908 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910 op->destroy ();
911 else
912 {
913 op->x = x;
914 op->y = y;
915 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916 }
917
918 op = tmp;
919 }
920 }
921 }
922 816
923 // hack to ensure that freed objects still have a valid map 817 // hack to ensure that freed objects still have a valid map
924 { 818 {
925 static maptile *freed_map; // freed objects are moved here to avoid crashes 819 static maptile *freed_map; // freed objects are moved here to avoid crashes
926 820
… …
938 map = freed_map; 832 map = freed_map;
939 x = 1; 833 x = 1;
940 y = 1; 834 y = 1;
941 } 835 }
942 836
837 more = 0;
838 head = 0;
839 inv = 0;
840
943 // clear those pointers that likely might have circular references to us 841 // clear those pointers that likely might have circular references to us
944 owner = 0; 842 owner = 0;
945 enemy = 0; 843 enemy = 0;
946 attacked_by = 0; 844 attacked_by = 0;
947 845
… …
951 /* Remove object from the active list */ 849 /* Remove object from the active list */
952 speed = 0; 850 speed = 0;
953 update_ob_speed (this); 851 update_ob_speed (this);
954 852
955 unlink (); 853 unlink ();
854}
956 855
957 mortals.push_back (this); 856/*
857 * Remove and free all objects in the inventory of the given object.
858 * object.c ?
859 */
860void
861object::destroy_inv (bool drop_to_ground)
862{
863 if (!inv)
864 return;
865
866 /* Only if the space blocks everything do we not process -
867 * if some form of movement is allowed, let objects
868 * drop on that space.
869 */
870 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
871 {
872 while (inv)
873 {
874 inv->destroy_inv (drop_to_ground);
875 inv->destroy ();
876 }
877 }
878 else
879 { /* Put objects in inventory onto this space */
880 while (inv)
881 {
882 object *op = inv;
883
884 if (op->flag [FLAG_STARTEQUIP]
885 || op->flag [FLAG_NO_DROP]
886 || op->type == RUNE
887 || op->type == TRAP
888 || op->flag [FLAG_IS_A_TEMPLATE])
889 op->destroy ();
890 else
891 {
892 op->remove ();
893 op->x = x;
894 op->y = y;
895 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
896 }
897 }
898 }
899}
900
901void
902object::destroy (bool destroy_inventory)
903{
904 if (destroyed ())
905 return;
906
907 if (more)
908 {
909 //TODO: non-head objects must not have inventory
910 more->destroy (destroy_inventory);
911 more = 0;
912 }
913
914 if (destroy_inventory)
915 destroy_inv (true);
916
917 attachable::destroy ();
958} 918}
959 919
960/* 920/*
961 * sub_weight() recursively (outwards) subtracts a number from the 921 * sub_weight() recursively (outwards) subtracts a number from the
962 * weight of an object (and what is carried by it's environment(s)). 922 * weight of an object (and what is carried by it's environment(s)).
… …
986object::remove () 946object::remove ()
987{ 947{
988 object *tmp, *last = 0; 948 object *tmp, *last = 0;
989 object *otmp; 949 object *otmp;
990 950
991 int check_walk_off;
992
993 if (QUERY_FLAG (this, FLAG_REMOVED)) 951 if (QUERY_FLAG (this, FLAG_REMOVED))
994 return; 952 return;
995 953
996 SET_FLAG (this, FLAG_REMOVED); 954 SET_FLAG (this, FLAG_REMOVED);
955 INVOKE_OBJECT (REMOVE, this);
997 956
998 if (more) 957 if (more)
999 more->remove (); 958 more->remove ();
1000 959
1001 /* 960 /*
… …
1012 /* NO_FIX_PLAYER is set when a great many changes are being 971 /* NO_FIX_PLAYER is set when a great many changes are being
1013 * made to players inventory. If set, avoiding the call 972 * made to players inventory. If set, avoiding the call
1014 * to save cpu time. 973 * to save cpu time.
1015 */ 974 */
1016 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 975 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017 fix_player (otmp); 976 otmp->update_stats ();
1018 977
1019 if (above != NULL) 978 if (above != NULL)
1020 above->below = below; 979 above->below = below;
1021 else 980 else
1022 env->inv = below; 981 env->inv = below;
… …
1063 dump = dump_object (GET_MAP_OB (map, x, y)); 1022 dump = dump_object (GET_MAP_OB (map, x, y));
1064 LOG (llevError, "%s\n", dump); 1023 LOG (llevError, "%s\n", dump);
1065 free (dump); 1024 free (dump);
1066 } 1025 }
1067 1026
1068 map->at (x, y).bottom = above; /* goes on above it. */ 1027 map->at (x, y).bot = above; /* goes on above it. */
1069 } 1028 }
1070 1029
1071 above = 0; 1030 above = 0;
1072 below = 0; 1031 below = 0;
1073 1032
1074 if (map->in_memory == MAP_SAVING) 1033 if (map->in_memory == MAP_SAVING)
1075 return; 1034 return;
1076 1035
1077 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1036 int check_walk_off = !flag [FLAG_NO_APPLY];
1078 1037
1079 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1080 { 1039 {
1081 /* No point updating the players look faces if he is the object 1040 /* No point updating the players look faces if he is the object
1082 * being removed. 1041 * being removed.
… …
1088 * removed (most likely destroyed), update the player view 1047 * removed (most likely destroyed), update the player view
1089 * appropriately. 1048 * appropriately.
1090 */ 1049 */
1091 if (tmp->container == this) 1050 if (tmp->container == this)
1092 { 1051 {
1093 CLEAR_FLAG (this, FLAG_APPLIED); 1052 flag [FLAG_APPLIED] = 0;
1094 tmp->container = 0; 1053 tmp->container = 0;
1095 } 1054 }
1096 1055
1056 if (tmp->contr->ns)
1097 tmp->contr->socket->floorbox_update (); 1057 tmp->contr->ns->floorbox_update ();
1098 } 1058 }
1099 1059
1100 /* See if player moving off should effect something */ 1060 /* See if player moving off should effect something */
1101 if (check_walk_off 1061 if (check_walk_off
1102 && ((move_type & tmp->move_off) 1062 && ((move_type & tmp->move_off)
… …
1120 if (!last) 1080 if (!last)
1121 map->at (x, y).flags_ = P_NEED_UPDATE; 1081 map->at (x, y).flags_ = P_NEED_UPDATE;
1122 else 1082 else
1123 update_object (last, UP_OBJ_REMOVE); 1083 update_object (last, UP_OBJ_REMOVE);
1124 1084
1125 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126 update_all_los (map, x, y); 1086 update_all_los (map, x, y);
1127 } 1087 }
1128} 1088}
1129 1089
1130/* 1090/*
… …
1139merge_ob (object *op, object *top) 1099merge_ob (object *op, object *top)
1140{ 1100{
1141 if (!op->nrof) 1101 if (!op->nrof)
1142 return 0; 1102 return 0;
1143 1103
1144 if (top == NULL) 1104 if (top)
1145 for (top = op; top != NULL && top->above != NULL; top = top->above); 1105 for (top = op; top && top->above; top = top->above)
1106 ;
1146 1107
1147 for (; top != NULL; top = top->below) 1108 for (; top; top = top->below)
1148 { 1109 {
1149 if (top == op) 1110 if (top == op)
1150 continue; 1111 continue;
1151 1112
1152 if (object::can_merge (op, top)) 1113 if (object::can_merge (op, top))
… …
1202 * Return value: 1163 * Return value:
1203 * new object if 'op' was merged with other object 1164 * new object if 'op' was merged with other object
1204 * NULL if 'op' was destroyed 1165 * NULL if 'op' was destroyed
1205 * just 'op' otherwise 1166 * just 'op' otherwise
1206 */ 1167 */
1207
1208object * 1168object *
1209insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210{ 1170{
1211 object *tmp, *top, *floor = NULL; 1171 object *tmp, *top, *floor = NULL;
1212 sint16 x, y; 1172 sint16 x, y;
… …
1246 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1206 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247 free (dump); 1207 free (dump);
1248 return op; 1208 return op;
1249 } 1209 }
1250 1210
1251 if (op->more != NULL) 1211 if (op->more)
1252 { 1212 {
1253 /* The part may be on a different map. */ 1213 /* The part may be on a different map. */
1254 1214
1255 object *more = op->more; 1215 object *more = op->more;
1256 1216
… …
1272 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1232 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273 { 1233 {
1274 if (!op->head) 1234 if (!op->head)
1275 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1235 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276 1236
1277 return NULL; 1237 return 0;
1278 } 1238 }
1279 } 1239 }
1280 1240
1281 CLEAR_FLAG (op, FLAG_REMOVED); 1241 CLEAR_FLAG (op, FLAG_REMOVED);
1282 1242
… …
1316 op->below = originator->below; 1276 op->below = originator->below;
1317 1277
1318 if (op->below) 1278 if (op->below)
1319 op->below->above = op; 1279 op->below->above = op;
1320 else 1280 else
1321 op->map->at (op->x, op->y).bottom = op; 1281 op->ms ().bot = op;
1322 1282
1323 /* since *below* originator, no need to update top */ 1283 /* since *below* originator, no need to update top */
1324 originator->below = op; 1284 originator->below = op;
1325 } 1285 }
1326 else 1286 else
… …
1405 1365
1406 if (op->above) 1366 if (op->above)
1407 op->above->below = op; 1367 op->above->below = op;
1408 1368
1409 op->below = NULL; 1369 op->below = NULL;
1410 op->map->at (op->x, op->y).bottom = op; 1370 op->ms ().bot = op;
1411 } 1371 }
1412 else 1372 else
1413 { /* get inserted into the stack above top */ 1373 { /* get inserted into the stack above top */
1414 op->above = top->above; 1374 op->above = top->above;
1415 1375
… …
1419 op->below = top; 1379 op->below = top;
1420 top->above = op; 1380 top->above = op;
1421 } 1381 }
1422 1382
1423 if (op->above == NULL) 1383 if (op->above == NULL)
1424 op->map->at (op->x, op->y).top = op; 1384 op->ms ().top = op;
1425 } /* else not INS_BELOW_ORIGINATOR */ 1385 } /* else not INS_BELOW_ORIGINATOR */
1426 1386
1427 if (op->type == PLAYER) 1387 if (op->type == PLAYER)
1428 op->contr->do_los = 1; 1388 op->contr->do_los = 1;
1429 1389
1430 /* If we have a floor, we know the player, if any, will be above 1390 /* If we have a floor, we know the player, if any, will be above
1431 * it, so save a few ticks and start from there. 1391 * it, so save a few ticks and start from there.
1432 */ 1392 */
1433 if (!(flag & INS_MAP_LOAD)) 1393 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = op->map->at (op->x, op->y).player ()) 1394 if (object *pl = op->ms ().player ())
1395 if (pl->contr->ns)
1435 pl->contr->socket->floorbox_update (); 1396 pl->contr->ns->floorbox_update ();
1436 1397
1437 /* If this object glows, it may affect lighting conditions that are 1398 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1399 * visible to others on this map. But update_all_los is really
1439 * an inefficient way to do this, as it means los for all players 1400 * an inefficient way to do this, as it means los for all players
1440 * on the map will get recalculated. The players could very well 1401 * on the map will get recalculated. The players could very well
1441 * be far away from this change and not affected in any way - 1402 * be far away from this change and not affected in any way -
1442 * this should get redone to only look for players within range, 1403 * this should get redone to only look for players within range,
1443 * or just updating the P_NEED_UPDATE for spaces within this area 1404 * or just updating the P_NEED_UPDATE for spaces within this area
1444 * of effect may be sufficient. 1405 * of effect may be sufficient.
1445 */ 1406 */
1446 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1407 if (op->map->darkness && (op->glow_radius != 0))
1447 update_all_los (op->map, op->x, op->y); 1408 update_all_los (op->map, op->x, op->y);
1448 1409
1449 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1410 /* updates flags (blocked, alive, no magic, etc) for this map space */
1450 update_object (op, UP_OBJ_INSERT); 1411 update_object (op, UP_OBJ_INSERT);
1412
1413 INVOKE_OBJECT (INSERT, op);
1451 1414
1452 /* Don't know if moving this to the end will break anything. However, 1415 /* Don't know if moving this to the end will break anything. However,
1453 * we want to have floorbox_update called before calling this. 1416 * we want to have floorbox_update called before calling this.
1454 * 1417 *
1455 * check_move_on() must be after this because code called from 1418 * check_move_on() must be after this because code called from
… …
1460 1423
1461 /* if this is not the head or flag has been passed, don't check walk on status */ 1424 /* if this is not the head or flag has been passed, don't check walk on status */
1462 if (!(flag & INS_NO_WALK_ON) && !op->head) 1425 if (!(flag & INS_NO_WALK_ON) && !op->head)
1463 { 1426 {
1464 if (check_move_on (op, originator)) 1427 if (check_move_on (op, originator))
1465 return NULL; 1428 return 0;
1466 1429
1467 /* If we are a multi part object, lets work our way through the check 1430 /* If we are a multi part object, lets work our way through the check
1468 * walk on's. 1431 * walk on's.
1469 */ 1432 */
1470 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1433 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471 if (check_move_on (tmp, originator)) 1434 if (check_move_on (tmp, originator))
1472 return NULL; 1435 return 0;
1473 } 1436 }
1474 1437
1475 return op; 1438 return op;
1476} 1439}
1477 1440
… …
1548 1511
1549object * 1512object *
1550decrease_ob_nr (object *op, uint32 i) 1513decrease_ob_nr (object *op, uint32 i)
1551{ 1514{
1552 object *tmp; 1515 object *tmp;
1553 player *pl;
1554 1516
1555 if (i == 0) /* objects with op->nrof require this check */ 1517 if (i == 0) /* objects with op->nrof require this check */
1556 return op; 1518 return op;
1557 1519
1558 if (i > op->nrof) 1520 if (i > op->nrof)
… …
1571 * IMO, searching through all the players will mostly 1533 * IMO, searching through all the players will mostly
1572 * likely be quicker than following op->env to the map, 1534 * likely be quicker than following op->env to the map,
1573 * and then searching the map for a player. 1535 * and then searching the map for a player.
1574 */ 1536 */
1575 if (!tmp) 1537 if (!tmp)
1576 { 1538 for_all_players (pl)
1577 for (pl = first_player; pl; pl = pl->next)
1578 if (pl->ob->container == op->env) 1539 if (pl->ob->container == op->env)
1579 { 1540 {
1580 tmp = pl->ob; 1541 tmp = pl->ob;
1581 break; 1542 break;
1582 } 1543 }
1583 }
1584 1544
1585 if (i < op->nrof) 1545 if (i < op->nrof)
1586 { 1546 {
1587 sub_weight (op->env, op->weight * i); 1547 sub_weight (op->env, op->weight * i);
1588 op->nrof -= i; 1548 op->nrof -= i;
… …
1724 add_weight (this, (op->weight + op->carrying)); 1684 add_weight (this, (op->weight + op->carrying));
1725 1685
1726 otmp = this->in_player (); 1686 otmp = this->in_player ();
1727 if (otmp && otmp->contr) 1687 if (otmp && otmp->contr)
1728 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1688 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729 fix_player (otmp); 1689 otmp->update_stats ();
1730 1690
1731 op->map = 0; 1691 op->map = 0;
1732 op->env = this; 1692 op->env = this;
1733 op->above = 0; 1693 op->above = 0;
1734 op->below = 0; 1694 op->below = 0;
… …
1738 if ((op->glow_radius != 0) && map) 1698 if ((op->glow_radius != 0) && map)
1739 { 1699 {
1740#ifdef DEBUG_LIGHTS 1700#ifdef DEBUG_LIGHTS
1741 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1701 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742#endif /* DEBUG_LIGHTS */ 1702#endif /* DEBUG_LIGHTS */
1743 if (MAP_DARKNESS (map)) 1703 if (map->darkness)
1744 update_all_los (map, x, y); 1704 update_all_los (map, x, y);
1745 } 1705 }
1746 1706
1747 /* Client has no idea of ordering so lets not bother ordering it here. 1707 /* Client has no idea of ordering so lets not bother ordering it here.
1748 * It sure simplifies this function... 1708 * It sure simplifies this function...
… …
1753 { 1713 {
1754 op->below = inv; 1714 op->below = inv;
1755 op->below->above = op; 1715 op->below->above = op;
1756 inv = op; 1716 inv = op;
1757 } 1717 }
1718
1719 INVOKE_OBJECT (INSERT, this);
1758 1720
1759 return op; 1721 return op;
1760} 1722}
1761 1723
1762/* 1724/*
… …
1814 1776
1815 /* The objects have to be checked from top to bottom. 1777 /* The objects have to be checked from top to bottom.
1816 * Hence, we first go to the top: 1778 * Hence, we first go to the top:
1817 */ 1779 */
1818 1780
1819 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1820 { 1782 {
1821 /* Trim the search when we find the first other spell effect 1783 /* Trim the search when we find the first other spell effect
1822 * this helps performance so that if a space has 50 spell objects, 1784 * this helps performance so that if a space has 50 spell objects,
1823 * we don't need to check all of them. 1785 * we don't need to check all of them.
1824 */ 1786 */
… …
1879/* 1841/*
1880 * present_arch(arch, map, x, y) searches for any objects with 1842 * present_arch(arch, map, x, y) searches for any objects with
1881 * a matching archetype at the given map and coordinates. 1843 * a matching archetype at the given map and coordinates.
1882 * The first matching object is returned, or NULL if none. 1844 * The first matching object is returned, or NULL if none.
1883 */ 1845 */
1884
1885object * 1846object *
1886present_arch (const archetype *at, maptile *m, int x, int y) 1847present_arch (const archetype *at, maptile *m, int x, int y)
1887{ 1848{
1888 object *
1889 tmp;
1890
1891 if (m == NULL || out_of_map (m, x, y)) 1849 if (m == NULL || out_of_map (m, x, y))
1892 { 1850 {
1893 LOG (llevError, "Present_arch called outside map.\n"); 1851 LOG (llevError, "Present_arch called outside map.\n");
1894 return NULL; 1852 return NULL;
1895 } 1853 }
1854
1896 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1897 if (tmp->arch == at) 1856 if (tmp->arch == at)
1898 return tmp; 1857 return tmp;
1858
1899 return NULL; 1859 return NULL;
1900} 1860}
1901 1861
1902/* 1862/*
1903 * present(type, map, x, y) searches for any objects with 1863 * present(type, map, x, y) searches for any objects with
1904 * a matching type variable at the given map and coordinates. 1864 * a matching type variable at the given map and coordinates.
1905 * The first matching object is returned, or NULL if none. 1865 * The first matching object is returned, or NULL if none.
1906 */ 1866 */
1907
1908object * 1867object *
1909present (unsigned char type, maptile *m, int x, int y) 1868present (unsigned char type, maptile *m, int x, int y)
1910{ 1869{
1911 object *
1912 tmp;
1913
1914 if (out_of_map (m, x, y)) 1870 if (out_of_map (m, x, y))
1915 { 1871 {
1916 LOG (llevError, "Present called outside map.\n"); 1872 LOG (llevError, "Present called outside map.\n");
1917 return NULL; 1873 return NULL;
1918 } 1874 }
1875
1919 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1920 if (tmp->type == type) 1877 if (tmp->type == type)
1921 return tmp; 1878 return tmp;
1879
1922 return NULL; 1880 return NULL;
1923} 1881}
1924 1882
1925/* 1883/*
1926 * present_in_ob(type, object) searches for any objects with 1884 * present_in_ob(type, object) searches for any objects with
1927 * a matching type variable in the inventory of the given object. 1885 * a matching type variable in the inventory of the given object.
1928 * The first matching object is returned, or NULL if none. 1886 * The first matching object is returned, or NULL if none.
1929 */ 1887 */
1930
1931object * 1888object *
1932present_in_ob (unsigned char type, const object *op) 1889present_in_ob (unsigned char type, const object *op)
1933{ 1890{
1934 object *
1935 tmp;
1936
1937 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1891 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938 if (tmp->type == type) 1892 if (tmp->type == type)
1939 return tmp; 1893 return tmp;
1894
1940 return NULL; 1895 return NULL;
1941} 1896}
1942 1897
1943/* 1898/*
1944 * present_in_ob (type, str, object) searches for any objects with 1899 * present_in_ob (type, str, object) searches for any objects with
… …
1952 * str is the string to match against. Note that we match against 1907 * str is the string to match against. Note that we match against
1953 * the object name, not the archetype name. this is so that the 1908 * the object name, not the archetype name. this is so that the
1954 * spell code can use one object type (force), but change it's name 1909 * spell code can use one object type (force), but change it's name
1955 * to be unique. 1910 * to be unique.
1956 */ 1911 */
1957
1958object * 1912object *
1959present_in_ob_by_name (int type, const char *str, const object *op) 1913present_in_ob_by_name (int type, const char *str, const object *op)
1960{ 1914{
1961 object *
1962 tmp;
1963
1964 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1915 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 {
1966 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1916 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967 return tmp; 1917 return tmp;
1968 } 1918
1969 return NULL; 1919 return 0;
1970} 1920}
1971 1921
1972/* 1922/*
1973 * present_arch_in_ob(archetype, object) searches for any objects with 1923 * present_arch_in_ob(archetype, object) searches for any objects with
1974 * a matching archetype in the inventory of the given object. 1924 * a matching archetype in the inventory of the given object.
1975 * The first matching object is returned, or NULL if none. 1925 * The first matching object is returned, or NULL if none.
1976 */ 1926 */
1977
1978object * 1927object *
1979present_arch_in_ob (const archetype *at, const object *op) 1928present_arch_in_ob (const archetype *at, const object *op)
1980{ 1929{
1981 object *
1982 tmp;
1983
1984 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1930 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985 if (tmp->arch == at) 1931 if (tmp->arch == at)
1986 return tmp; 1932 return tmp;
1933
1987 return NULL; 1934 return NULL;
1988} 1935}
1989 1936
1990/* 1937/*
1991 * activate recursively a flag on an object inventory 1938 * activate recursively a flag on an object inventory
1992 */ 1939 */
1993void 1940void
1994flag_inv (object *op, int flag) 1941flag_inv (object *op, int flag)
1995{ 1942{
1996 object *
1997 tmp;
1998
1999 if (op->inv) 1943 if (op->inv)
2000 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1944 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001 { 1945 {
2002 SET_FLAG (tmp, flag); 1946 SET_FLAG (tmp, flag);
2003 flag_inv (tmp, flag); 1947 flag_inv (tmp, flag);
2004 } 1948 }
2005} /* 1949}
1950
1951/*
2006 * desactivate recursively a flag on an object inventory 1952 * deactivate recursively a flag on an object inventory
2007 */ 1953 */
2008void 1954void
2009unflag_inv (object *op, int flag) 1955unflag_inv (object *op, int flag)
2010{ 1956{
2011 object *
2012 tmp;
2013
2014 if (op->inv) 1957 if (op->inv)
2015 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016 { 1959 {
2017 CLEAR_FLAG (tmp, flag); 1960 CLEAR_FLAG (tmp, flag);
2018 unflag_inv (tmp, flag); 1961 unflag_inv (tmp, flag);
2019 } 1962 }
2020} 1963}
… …
2023 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1966 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024 * all it's inventory (recursively). 1967 * all it's inventory (recursively).
2025 * If checksums are used, a player will get set_cheat called for 1968 * If checksums are used, a player will get set_cheat called for
2026 * him/her-self and all object carried by a call to this function. 1969 * him/her-self and all object carried by a call to this function.
2027 */ 1970 */
2028
2029void 1971void
2030set_cheat (object *op) 1972set_cheat (object *op)
2031{ 1973{
2032 SET_FLAG (op, FLAG_WAS_WIZ); 1974 SET_FLAG (op, FLAG_WAS_WIZ);
2033 flag_inv (op, FLAG_WAS_WIZ); 1975 flag_inv (op, FLAG_WAS_WIZ);
… …
2052 * because arch_blocked (now ob_blocked) needs to know the movement type 1994 * because arch_blocked (now ob_blocked) needs to know the movement type
2053 * to know if the space in question will block the object. We can't use 1995 * to know if the space in question will block the object. We can't use
2054 * the archetype because that isn't correct if the monster has been 1996 * the archetype because that isn't correct if the monster has been
2055 * customized, changed states, etc. 1997 * customized, changed states, etc.
2056 */ 1998 */
2057
2058int 1999int
2059find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060{ 2001{
2061 int
2062 i,
2063 index = 0, flag; 2002 int index = 0, flag;
2064 static int
2065 altern[SIZEOFFREE]; 2003 int altern[SIZEOFFREE];
2066 2004
2067 for (i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
2068 { 2006 {
2069 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070 if (!flag) 2008 if (!flag)
2071 altern[index++] = i; 2009 altern [index++] = i;
2072 2010
2073 /* Basically, if we find a wall on a space, we cut down the search size. 2011 /* Basically, if we find a wall on a space, we cut down the search size.
2074 * In this way, we won't return spaces that are on another side of a wall. 2012 * In this way, we won't return spaces that are on another side of a wall.
2075 * This mostly work, but it cuts down the search size in all directions - 2013 * This mostly work, but it cuts down the search size in all directions -
2076 * if the space being examined only has a wall to the north and empty 2014 * if the space being examined only has a wall to the north and empty
… …
2092 * find_first_free_spot(archetype, maptile, x, y) works like 2030 * find_first_free_spot(archetype, maptile, x, y) works like
2093 * find_free_spot(), but it will search max number of squares. 2031 * find_free_spot(), but it will search max number of squares.
2094 * But it will return the first available spot, not a random choice. 2032 * But it will return the first available spot, not a random choice.
2095 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2033 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2096 */ 2034 */
2097
2098int 2035int
2099find_first_free_spot (const object *ob, maptile *m, int x, int y) 2036find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100{ 2037{
2101 int
2102 i;
2103
2104 for (i = 0; i < SIZEOFFREE; i++) 2038 for (int i = 0; i < SIZEOFFREE; i++)
2105 {
2106 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2039 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107 return i; 2040 return i;
2108 } 2041
2109 return -1; 2042 return -1;
2110} 2043}
2111 2044
2112/* 2045/*
2113 * The function permute(arr, begin, end) randomly reorders the array 2046 * The function permute(arr, begin, end) randomly reorders the array
2114 * arr[begin..end-1]. 2047 * arr[begin..end-1].
2048 * now uses a fisher-yates shuffle, old permute was broken
2115 */ 2049 */
2116static void 2050static void
2117permute (int *arr, int begin, int end) 2051permute (int *arr, int begin, int end)
2118{ 2052{
2119 int 2053 arr += begin;
2120 i,
2121 j,
2122 tmp,
2123 len;
2124
2125 len = end - begin; 2054 end -= begin;
2126 for (i = begin; i < end; i++)
2127 {
2128 j = begin + RANDOM () % len;
2129 2055
2130 tmp = arr[i]; 2056 while (--end)
2131 arr[i] = arr[j]; 2057 swap (arr [end], arr [RANDOM () % (end + 1)]);
2132 arr[j] = tmp;
2133 }
2134} 2058}
2135 2059
2136/* new function to make monster searching more efficient, and effective! 2060/* new function to make monster searching more efficient, and effective!
2137 * This basically returns a randomized array (in the passed pointer) of 2061 * This basically returns a randomized array (in the passed pointer) of
2138 * the spaces to find monsters. In this way, it won't always look for 2062 * the spaces to find monsters. In this way, it won't always look for
… …
2141 * the 3x3 area will be searched, just not in a predictable order. 2065 * the 3x3 area will be searched, just not in a predictable order.
2142 */ 2066 */
2143void 2067void
2144get_search_arr (int *search_arr) 2068get_search_arr (int *search_arr)
2145{ 2069{
2146 int 2070 int i;
2147 i;
2148 2071
2149 for (i = 0; i < SIZEOFFREE; i++) 2072 for (i = 0; i < SIZEOFFREE; i++)
2150 {
2151 search_arr[i] = i; 2073 search_arr[i] = i;
2152 }
2153 2074
2154 permute (search_arr, 1, SIZEOFFREE1 + 1); 2075 permute (search_arr, 1, SIZEOFFREE1 + 1);
2155 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2076 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2077 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157} 2078}
… …
2166 * Perhaps incorrectly, but I'm making the assumption that exclude 2087 * Perhaps incorrectly, but I'm making the assumption that exclude
2167 * is actually want is going to try and move there. We need this info 2088 * is actually want is going to try and move there. We need this info
2168 * because we have to know what movement the thing looking to move 2089 * because we have to know what movement the thing looking to move
2169 * there is capable of. 2090 * there is capable of.
2170 */ 2091 */
2171
2172int 2092int
2173find_dir (maptile *m, int x, int y, object *exclude) 2093find_dir (maptile *m, int x, int y, object *exclude)
2174{ 2094{
2175 int
2176 i,
2177 max = SIZEOFFREE, mflags; 2095 int i, max = SIZEOFFREE, mflags;
2178 2096
2179 sint16 nx, ny; 2097 sint16 nx, ny;
2180 object * 2098 object *tmp;
2181 tmp;
2182 maptile * 2099 maptile *mp;
2183 mp;
2184 2100
2185 MoveType blocked, move_type; 2101 MoveType blocked, move_type;
2186 2102
2187 if (exclude && exclude->head) 2103 if (exclude && exclude->head)
2188 { 2104 {
… …
2205 2121
2206 if (mflags & P_OUT_OF_MAP) 2122 if (mflags & P_OUT_OF_MAP)
2207 max = maxfree[i]; 2123 max = maxfree[i];
2208 else 2124 else
2209 { 2125 {
2210 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2126 mapspace &ms = mp->at (nx, ny);
2127
2128 blocked = ms.move_block;
2211 2129
2212 if ((move_type & blocked) == move_type) 2130 if ((move_type & blocked) == move_type)
2213 max = maxfree[i]; 2131 max = maxfree[i];
2214 else if (mflags & P_IS_ALIVE) 2132 else if (mflags & P_IS_ALIVE)
2215 { 2133 {
2216 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2134 for (tmp = ms.bot; tmp; tmp = tmp->above)
2217 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2135 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2136 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2218 break; 2137 break;
2219 2138
2220 if (tmp) 2139 if (tmp)
2221 return freedir[i]; 2140 return freedir[i];
2222 } 2141 }
… …
2228 2147
2229/* 2148/*
2230 * distance(object 1, object 2) will return the square of the 2149 * distance(object 1, object 2) will return the square of the
2231 * distance between the two given objects. 2150 * distance between the two given objects.
2232 */ 2151 */
2233
2234int 2152int
2235distance (const object *ob1, const object *ob2) 2153distance (const object *ob1, const object *ob2)
2236{ 2154{
2237 int i;
2238
2239 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2155 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240 return i;
2241} 2156}
2242 2157
2243/* 2158/*
2244 * find_dir_2(delta-x,delta-y) will return a direction in which 2159 * find_dir_2(delta-x,delta-y) will return a direction in which
2245 * an object which has subtracted the x and y coordinates of another 2160 * an object which has subtracted the x and y coordinates of another
2246 * object, needs to travel toward it. 2161 * object, needs to travel toward it.
2247 */ 2162 */
2248
2249int 2163int
2250find_dir_2 (int x, int y) 2164find_dir_2 (int x, int y)
2251{ 2165{
2252 int q; 2166 int q;
2253 2167
… …
2292int 2206int
2293absdir (int d) 2207absdir (int d)
2294{ 2208{
2295 while (d < 1) 2209 while (d < 1)
2296 d += 8; 2210 d += 8;
2211
2297 while (d > 8) 2212 while (d > 8)
2298 d -= 8; 2213 d -= 8;
2214
2299 return d; 2215 return d;
2300} 2216}
2301 2217
2302/* 2218/*
2303 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2305 */ 2221 */
2306 2222
2307int 2223int
2308dirdiff (int dir1, int dir2) 2224dirdiff (int dir1, int dir2)
2309{ 2225{
2310 int 2226 int d;
2311 d;
2312 2227
2313 d = abs (dir1 - dir2); 2228 d = abs (dir1 - dir2);
2314 if (d > 4) 2229 if (d > 4)
2315 d = 8 - d; 2230 d = 8 - d;
2231
2316 return d; 2232 return d;
2317} 2233}
2318 2234
2319/* peterm: 2235/* peterm:
2320 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2236 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2323 * This basically means that if direction is 15, then it could either go 2239 * This basically means that if direction is 15, then it could either go
2324 * direction 4, 14, or 16 to get back to where we are. 2240 * direction 4, 14, or 16 to get back to where we are.
2325 * Moved from spell_util.c to object.c with the other related direction 2241 * Moved from spell_util.c to object.c with the other related direction
2326 * functions. 2242 * functions.
2327 */ 2243 */
2328
2329int
2330 reduction_dir[SIZEOFFREE][3] = { 2244int reduction_dir[SIZEOFFREE][3] = {
2331 {0, 0, 0}, /* 0 */ 2245 {0, 0, 0}, /* 0 */
2332 {0, 0, 0}, /* 1 */ 2246 {0, 0, 0}, /* 1 */
2333 {0, 0, 0}, /* 2 */ 2247 {0, 0, 0}, /* 2 */
2334 {0, 0, 0}, /* 3 */ 2248 {0, 0, 0}, /* 3 */
2335 {0, 0, 0}, /* 4 */ 2249 {0, 0, 0}, /* 4 */
… …
2485/* Basically, we save the content of the string to a temp file, then call */ 2399/* Basically, we save the content of the string to a temp file, then call */
2486/* load_object on it. I admit it is a highly inefficient way to make things, */ 2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2487/* but it was simple to make and allows reusing the load_object function. */ 2401/* but it was simple to make and allows reusing the load_object function. */
2488/* Remember not to use load_object_str in a time-critical situation. */ 2402/* Remember not to use load_object_str in a time-critical situation. */
2489/* Also remember that multiparts objects are not supported for now. */ 2403/* Also remember that multiparts objects are not supported for now. */
2490
2491object * 2404object *
2492load_object_str (const char *obstr) 2405load_object_str (const char *obstr)
2493{ 2406{
2494 object *op; 2407 object *op;
2495 char filename[MAX_BUF]; 2408 char filename[MAX_BUF];
… …
2525 * returns NULL if no match. 2438 * returns NULL if no match.
2526 */ 2439 */
2527object * 2440object *
2528find_obj_by_type_subtype (const object *who, int type, int subtype) 2441find_obj_by_type_subtype (const object *who, int type, int subtype)
2529{ 2442{
2530 object *tmp;
2531
2532 for (tmp = who->inv; tmp; tmp = tmp->below) 2443 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533 if (tmp->type == type && tmp->subtype == subtype) 2444 if (tmp->type == type && tmp->subtype == subtype)
2534 return tmp; 2445 return tmp;
2535 2446
2536 return NULL; 2447 return 0;
2537} 2448}
2538 2449
2539/* If ob has a field named key, return the link from the list, 2450/* If ob has a field named key, return the link from the list,
2540 * otherwise return NULL. 2451 * otherwise return NULL.
2541 * 2452 *
… …
2543 * do the desired thing. 2454 * do the desired thing.
2544 */ 2455 */
2545key_value * 2456key_value *
2546get_ob_key_link (const object *ob, const char *key) 2457get_ob_key_link (const object *ob, const char *key)
2547{ 2458{
2548 key_value *link;
2549
2550 for (link = ob->key_values; link != NULL; link = link->next) 2459 for (key_value *link = ob->key_values; link; link = link->next)
2551 if (link->key == key) 2460 if (link->key == key)
2552 return link; 2461 return link;
2553 2462
2554 return NULL; 2463 return 0;
2555} 2464}
2556 2465
2557/* 2466/*
2558 * Returns the value of op has an extra_field for key, or NULL. 2467 * Returns the value of op has an extra_field for key, or NULL.
2559 * 2468 *
… …
2599 * Returns TRUE on success. 2508 * Returns TRUE on success.
2600 */ 2509 */
2601int 2510int
2602set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2511set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603{ 2512{
2604 key_value *
2605 field = NULL, *last = NULL; 2513 key_value *field = NULL, *last = NULL;
2606 2514
2607 for (field = op->key_values; field != NULL; field = field->next) 2515 for (field = op->key_values; field != NULL; field = field->next)
2608 { 2516 {
2609 if (field->key != canonical_key) 2517 if (field->key != canonical_key)
2610 { 2518 {
… …
2638 /* IF we get here, key doesn't exist */ 2546 /* IF we get here, key doesn't exist */
2639 2547
2640 /* No field, we'll have to add it. */ 2548 /* No field, we'll have to add it. */
2641 2549
2642 if (!add_key) 2550 if (!add_key)
2643 {
2644 return FALSE; 2551 return FALSE;
2645 } 2552
2646 /* There isn't any good reason to store a null 2553 /* There isn't any good reason to store a null
2647 * value in the key/value list. If the archetype has 2554 * value in the key/value list. If the archetype has
2648 * this key, then we should also have it, so shouldn't 2555 * this key, then we should also have it, so shouldn't
2649 * be here. If user wants to store empty strings, 2556 * be here. If user wants to store empty strings,
2650 * should pass in "" 2557 * should pass in ""

Diff Legend

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