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.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.62 by root, Mon Dec 11 23:35:37 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
37static UUID uuid; 36static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 37const uint64 UUID_SKIP = 1<<19;
39 38
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
42 40
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 43};
… …
106 _exit (1); 104 _exit (1);
107 } 105 }
108 106
109 uuid.seq = uid; 107 uuid.seq = uid;
110 write_uuid (); 108 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112 fclose (fp); 110 fclose (fp);
113} 111}
114 112
115UUID 113UUID
116gen_uuid () 114gen_uuid ()
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 375 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 376 * The result of the dump is stored in the static global errmsg array.
379 */ 377 */
380 378
381void 379char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 380dump_object (object *op)
437{ 381{
438 if (op == NULL) 382 if (!op)
439 { 383 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 384
447void 385 object_freezer freezer;
448dump_all_objects (void) 386 save_object (freezer, op, 3);
449{ 387 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 388}
458 389
459/* 390/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 391 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
481 */ 412 */
482 413
483object * 414object *
484find_object (tag_t i) 415find_object (tag_t i)
485{ 416{
486 object *op; 417 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 418 if (op->count == i)
490 break; 419 return op;
420
491 return op; 421 return 0;
492} 422}
493 423
494/* 424/*
495 * Returns the first object which has a name equal to the argument. 425 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 431find_object_name (const char *str)
502{ 432{
503 shstr_cmp str_ (str); 433 shstr_cmp str_ (str);
504 object *op; 434 object *op;
505 435
506 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 437 if (op->name == str_)
508 break; 438 break;
509 439
510 return op; 440 return op;
511} 441}
512 442
513void 443void
514free_all_object_data () 444free_all_object_data ()
515{ 445{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 447}
539 448
540/* 449/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 450 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 451 * skill and experience objects.
… …
612 521
613 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
614 523
615 expmul = 1.0; 524 expmul = 1.0;
616 face = blank_face; 525 face = blank_face;
617 attacked_by_count = -1;
618 526
619 if (settings.casting_time) 527 if (settings.casting_time)
620 casting_time = -1; 528 casting_time = -1;
621} 529}
622 530
… …
645 553
646 op2->clone (op); 554 op2->clone (op);
647 555
648 if (is_freed) 556 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
650 if (is_removed) 559 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
652 561
653 if (op2->speed < 0) 562 if (op2->speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
896 update_now = 1; 805 update_now = 1;
897 806
898 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1; 808 update_now = 1;
900 } 809 }
810
901 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 813 * that is being removed.
904 */ 814 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
917 827
918 if (op->more != NULL) 828 if (op->more != NULL)
919 update_object (op->more, action); 829 update_object (op->more, action);
920} 830}
921 831
922static unordered_vector<object *> mortals; 832object::vector object::mortals;
833object::vector object::objects; // not yet used
834object *object::first;
923 835
924void object::free_mortals () 836void object::free_mortals ()
925{ 837{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 839 if ((*i)->refcnt)
928 ++i; // further delay freeing 840 ++i; // further delay freeing
929 else 841 else
930 { 842 {
931 delete *i; 843 delete *i;
932 mortals.erase (i); 844 mortals.erase (i);
933 } 845 }
934
935 static int lastmortals = 0;//D
936
937 if (mortals.size() != lastmortals)//D
938 {
939 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 }
942} 846}
943 847
944object::object () 848object::object ()
945{ 849{
946 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
947 851
948 expmul = 1.0; 852 expmul = 1.0;
949 face = blank_face; 853 face = blank_face;
950 attacked_by_count = -1;
951} 854}
952 855
953object::~object () 856object::~object ()
954{ 857{
955 free_key_values (this); 858 free_key_values (this);
… …
959{ 862{
960 count = ++ob_count; 863 count = ++ob_count;
961 uuid = gen_uuid (); 864 uuid = gen_uuid ();
962 865
963 prev = 0; 866 prev = 0;
964 next = objects; 867 next = object::first;
965 868
966 if (objects) 869 if (object::first)
967 objects->prev = this; 870 object::first->prev = this;
968 871
969 objects = this; 872 object::first = this;
970} 873}
971 874
972void object::unlink () 875void object::unlink ()
973{ 876{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 877 if (this == object::first)
978 objects = next; 878 object::first = next;
979 879
980 /* Remove this object from the list of used objects */ 880 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 881 if (prev) prev->next = next;
982 if (next) next->prev = prev; 882 if (next) next->prev = prev;
983 883
… …
997 * it from the list of used objects, and puts it on the list of 897 * it from the list of used objects, and puts it on the list of
998 * free objects. The IS_FREED() flag is set in the object. 898 * free objects. The IS_FREED() flag is set in the object.
999 * The object must have been removed by remove_ob() first for 899 * The object must have been removed by remove_ob() first for
1000 * this function to succeed. 900 * this function to succeed.
1001 * 901 *
1002 * If free_inventory is set, free inventory as well. Else drop items in 902 * If destroy_inventory is set, free inventory as well. Else drop items in
1003 * inventory to the ground. 903 * inventory to the ground.
1004 */ 904 */
1005void object::free (bool free_inventory) 905void object::destroy (bool destroy_inventory)
1006{ 906{
1007 if (QUERY_FLAG (this, FLAG_FREED)) 907 if (QUERY_FLAG (this, FLAG_FREED))
1008 return; 908 return;
1009 909
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
1015 915
1016 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
1017 917
1018 if (more) 918 if (more)
1019 { 919 {
1020 more->free (free_inventory); 920 more->destroy (destroy_inventory);
1021 more = 0; 921 more = 0;
1022 } 922 }
1023 923
1024 if (inv) 924 if (inv)
1025 { 925 {
1026 /* Only if the space blocks everything do we not process - 926 /* Only if the space blocks everything do we not process -
1027 * if some form of movement is allowed, let objects 927 * if some form of movement is allowed, let objects
1028 * drop on that space. 928 * drop on that space.
1029 */ 929 */
1030 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 930 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1031 { 931 {
1032 object *op = inv; 932 object *op = inv;
1033 933
1034 while (op) 934 while (op)
1035 { 935 {
1036 object *tmp = op->below; 936 object *tmp = op->below;
1037 op->free (free_inventory); 937 op->destroy (destroy_inventory);
1038 op = tmp; 938 op = tmp;
1039 } 939 }
1040 } 940 }
1041 else 941 else
1042 { /* Put objects in inventory onto this space */ 942 { /* Put objects in inventory onto this space */
… …
1061 op = tmp; 961 op = tmp;
1062 } 962 }
1063 } 963 }
1064 } 964 }
1065 965
966 // hack to ensure that freed objects still have a valid map
967 {
968 static maptile *freed_map; // freed objects are moved here to avoid crashes
969
970 if (!freed_map)
971 {
972 freed_map = new maptile;
973
974 freed_map->name = "/internal/freed_objects_map";
975 freed_map->width = 3;
976 freed_map->height = 3;
977
978 freed_map->allocate ();
979 }
980
981 map = freed_map;
982 x = 1;
983 y = 1;
984 }
985
986 // clear those pointers that likely might have circular references to us
1066 owner = 0; 987 owner = 0;
988 enemy = 0;
989 attacked_by = 0;
990
991 // only relevant for players(?), but make sure of it anyways
992 contr = 0;
1067 993
1068 /* Remove object from the active list */ 994 /* Remove object from the active list */
1069 speed = 0; 995 speed = 0;
1070 update_ob_speed (this); 996 update_ob_speed (this);
1071 997
… …
1076 1002
1077/* 1003/*
1078 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1079 * weight of an object (and what is carried by it's environment(s)). 1005 * weight of an object (and what is carried by it's environment(s)).
1080 */ 1006 */
1081
1082void 1007void
1083sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1084{ 1009{
1085 while (op != NULL) 1010 while (op != NULL)
1086 { 1011 {
1087 if (op->type == CONTAINER) 1012 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1014
1091 op->carrying -= weight; 1015 op->carrying -= weight;
1092 op = op->env; 1016 op = op->env;
1093 } 1017 }
1094} 1018}
1095 1019
… …
1099 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1100 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1101 * the previous environment. 1025 * the previous environment.
1102 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1103 */ 1027 */
1104
1105void 1028void
1106remove_ob (object *op) 1029object::remove ()
1107{ 1030{
1031 object *tmp, *last = 0;
1108 object * 1032 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1033
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1034 int check_walk_off;
1118 mapstruct *
1119 m;
1120 1035
1121 sint16
1122 x,
1123 y;
1124
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1126 return; 1037 return;
1127 1038
1128 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1129 1040
1130 if (op->more != NULL) 1041 if (more)
1131 remove_ob (op->more); 1042 more->remove ();
1132 1043
1133 /* 1044 /*
1134 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1135 * inventory. 1046 * inventory.
1136 */ 1047 */
1137 if (op->env != NULL) 1048 if (env)
1138 { 1049 {
1139 if (op->nrof) 1050 if (nrof)
1140 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1141 else 1052 else
1142 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1143 1054
1144 /* NO_FIX_PLAYER is set when a great many changes are being 1055 /* NO_FIX_PLAYER is set when a great many changes are being
1145 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1146 * to save cpu time. 1057 * to save cpu time.
1147 */ 1058 */
1148 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1059 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1149 fix_player (otmp); 1060 fix_player (otmp);
1150 1061
1151 if (op->above != NULL) 1062 if (above != NULL)
1152 op->above->below = op->below; 1063 above->below = below;
1153 else 1064 else
1154 op->env->inv = op->below; 1065 env->inv = below;
1155 1066
1156 if (op->below != NULL) 1067 if (below != NULL)
1157 op->below->above = op->above; 1068 below->above = above;
1158 1069
1159 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1160 * the map, but we don't actually do that - it is up 1071 * the map, but we don't actually do that - it is up
1161 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1162 */ 1073 */
1163 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1164 op->map = op->env->map; 1075 map = env->map;
1165 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1166 op->env = NULL; 1077 env = 0;
1167 } 1078 }
1168 else if (op->map) 1079 else if (map)
1169 { 1080 {
1170 x = op->x;
1171 y = op->y;
1172 m = get_map_from_coord (op->map, &x, &y);
1173
1174 if (!m)
1175 {
1176 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177 op->map->path, op->x, op->y);
1178 /* in old days, we used to set x and y to 0 and continue.
1179 * it seems if we get into this case, something is probablye
1180 * screwed up and should be fixed.
1181 */
1182 abort ();
1183 }
1184
1185 if (op->map != m)
1186 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187 op->map->path, m->path, op->x, op->y, x, y);
1188
1189 /* Re did the following section of code - it looks like it had 1081 /* Re did the following section of code - it looks like it had
1190 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1191 */ 1083 */
1192 1084
1193 /* link the object above us */ 1085 /* link the object above us */
1194 if (op->above) 1086 if (above)
1195 op->above->below = op->below; 1087 above->below = below;
1196 else 1088 else
1197 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1089 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1198 1090
1199 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1200 if (op->below) 1092 if (below)
1201 op->below->above = op->above; 1093 below->above = above;
1202 else 1094 else
1203 { 1095 {
1204 /* Nothing below, which means we need to relink map object for this space 1096 /* Nothing below, which means we need to relink map object for this space
1205 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1206 * evident 1098 * evident
1207 */ 1099 */
1208 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1209 { 1101 {
1210 dump_object (op); 1102 char *dump = dump_object (this);
1211 LOG (llevError, 1103 LOG (llevError,
1212 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1104 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1105 free (dump);
1213 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1214 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1215 } 1109 }
1216 1110
1217 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1218 } 1112 }
1219 1113
1220 op->above = 0; 1114 above = 0;
1221 op->below = 0; 1115 below = 0;
1222 1116
1223 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1224 return; 1118 return;
1225 1119
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228 1121
1229 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1122 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1230 { 1123 {
1231 /* No point updating the players look faces if he is the object 1124 /* No point updating the players look faces if he is the object
1232 * being removed. 1125 * being removed.
1233 */ 1126 */
1234 1127
1235 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1236 { 1129 {
1237 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1238 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1239 * appropriately. 1132 * appropriately.
1240 */ 1133 */
1241 if (tmp->container == op) 1134 if (tmp->container == this)
1242 { 1135 {
1243 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1244 tmp->container = NULL; 1137 tmp->container = 0;
1245 } 1138 }
1246 1139
1247 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1248 } 1141 }
1249 1142
1250 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1251 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1144 if (check_walk_off
1145 && ((move_type & tmp->move_off)
1146 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1252 { 1147 {
1253 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1254 1149
1255 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1256 {
1257 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1151 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1258 }
1259 } 1152 }
1260 1153
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1155
1263 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1264 tmp->above = NULL; 1157 tmp->above = 0;
1265 1158
1266 last = tmp; 1159 last = tmp;
1267 } 1160 }
1268 1161
1269 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1270 if (last == NULL) 1163 if (!last)
1271 { 1164 {
1272 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1166 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1274 * those out anyways, and if there are any flags set right now, they won't 1167 * those out anyways, and if there are any flags set right now, they won't
1275 * be correct anyways. 1168 * be correct anyways.
1276 */ 1169 */
1277 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1278 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1279 } 1172 }
1280 else 1173 else
1281 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1282 1175
1283 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1285 } 1178 }
1286} 1179}
1287 1180
1288/* 1181/*
1289 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1316 free_object (op); 1209 free_object (op);
1317 return top; 1210 return top;
1318 } 1211 }
1319 } 1212 }
1320 1213
1321 return NULL; 1214 return 0;
1322} 1215}
1323 1216
1324/* 1217/*
1325 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1218 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1326 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1327 */ 1220 */
1328object * 1221object *
1329insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1222insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1330{ 1223{
1331 object *tmp; 1224 object *tmp;
1332 1225
1333 if (op->head) 1226 if (op->head)
1334 op = op->head; 1227 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1256 * just 'op' otherwise
1364 */ 1257 */
1365 1258
1366object * 1259object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1261{
1369 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1263 sint16 x, y;
1371 1264
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
… …
1375 return NULL; 1268 return NULL;
1376 } 1269 }
1377 1270
1378 if (m == NULL) 1271 if (m == NULL)
1379 { 1272 {
1380 dump_object (op); 1273 char *dump = dump_object (op);
1381 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1274 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1275 free (dump);
1382 return op; 1276 return op;
1383 } 1277 }
1384 1278
1385 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1386 { 1280 {
1387 dump_object (op); 1281 char *dump = dump_object (op);
1388 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1282 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1389#ifdef MANY_CORES 1283#ifdef MANY_CORES
1390 /* Better to catch this here, as otherwise the next use of this object 1284 /* Better to catch this here, as otherwise the next use of this object
1391 * is likely to cause a crash. Better to find out where it is getting 1285 * is likely to cause a crash. Better to find out where it is getting
1392 * improperly inserted. 1286 * improperly inserted.
1393 */ 1287 */
1394 abort (); 1288 abort ();
1395#endif 1289#endif
1290 free (dump);
1396 return op; 1291 return op;
1397 } 1292 }
1398 1293
1399 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1400 { 1295 {
1401 dump_object (op); 1296 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1297 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1298 free (dump);
1403 return op; 1299 return op;
1404 } 1300 }
1405 1301
1406 if (op->more != NULL) 1302 if (op->more != NULL)
1407 { 1303 {
… …
1653 remove_ob (tmp); 1549 remove_ob (tmp);
1654 free_object (tmp); 1550 free_object (tmp);
1655 } 1551 }
1656 } 1552 }
1657 1553
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1555
1660 tmp1->x = op->x; 1556 tmp1->x = op->x;
1661 tmp1->y = op->y; 1557 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1558 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1559}
… …
1821 op->carrying += weight; 1717 op->carrying += weight;
1822 op = op->env; 1718 op = op->env;
1823 } 1719 }
1824} 1720}
1825 1721
1722object *
1723insert_ob_in_ob (object *op, object *where)
1724{
1725 if (!where)
1726 {
1727 char *dump = dump_object (op);
1728 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1729 free (dump);
1730 return op;
1731 }
1732
1733 if (where->head)
1734 {
1735 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1736 where = where->head;
1737 }
1738
1739 return where->insert (op);
1740}
1741
1826/* 1742/*
1827 * insert_ob_in_ob(op,environment): 1743 * env->insert (op)
1828 * This function inserts the object op in the linked list 1744 * This function inserts the object op in the linked list
1829 * inside the object environment. 1745 * inside the object environment.
1830 * 1746 *
1831 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832 * the inventory at the last position or next to other objects of the same
1833 * type.
1834 * Frank: Now sorted by type, archetype and magic!
1835 *
1836 * The function returns now pointer to inserted item, and return value can 1747 * The function returns now pointer to inserted item, and return value can
1837 * be != op, if items are merged. -Tero 1748 * be != op, if items are merged. -Tero
1838 */ 1749 */
1839 1750
1840object * 1751object *
1841insert_ob_in_ob (object *op, object *where) 1752object::insert (object *op)
1842{ 1753{
1843 object * 1754 object *tmp, *otmp;
1844 tmp, *
1845 otmp;
1846 1755
1847 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1756 if (!QUERY_FLAG (op, FLAG_REMOVED))
1848 { 1757 op->remove ();
1849 dump_object (op);
1850 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851 return op;
1852 }
1853
1854 if (where == NULL)
1855 {
1856 dump_object (op);
1857 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858 return op;
1859 }
1860
1861 if (where->head)
1862 {
1863 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864 where = where->head;
1865 }
1866 1758
1867 if (op->more) 1759 if (op->more)
1868 { 1760 {
1869 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1761 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1870 return op; 1762 return op;
… …
1872 1764
1873 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874 CLEAR_FLAG (op, FLAG_REMOVED); 1766 CLEAR_FLAG (op, FLAG_REMOVED);
1875 if (op->nrof) 1767 if (op->nrof)
1876 { 1768 {
1877 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1769 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878 if (CAN_MERGE (tmp, op)) 1770 if (CAN_MERGE (tmp, op))
1879 { 1771 {
1880 /* return the original object and remove inserted object 1772 /* return the original object and remove inserted object
1881 (client needs the original object) */ 1773 (client needs the original object) */
1882 tmp->nrof += op->nrof; 1774 tmp->nrof += op->nrof;
1883 /* Weight handling gets pretty funky. Since we are adding to 1775 /* Weight handling gets pretty funky. Since we are adding to
1884 * tmp->nrof, we need to increase the weight. 1776 * tmp->nrof, we need to increase the weight.
1885 */ 1777 */
1886 add_weight (where, op->weight * op->nrof); 1778 add_weight (this, op->weight * op->nrof);
1887 SET_FLAG (op, FLAG_REMOVED); 1779 SET_FLAG (op, FLAG_REMOVED);
1888 free_object (op); /* free the inserted object */ 1780 op->destroy (); /* free the inserted object */
1889 op = tmp; 1781 op = tmp;
1890 remove_ob (op); /* and fix old object's links */ 1782 op->remove (); /* and fix old object's links */
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1783 CLEAR_FLAG (op, FLAG_REMOVED);
1892 break; 1784 break;
1893 } 1785 }
1894 1786
1895 /* I assume combined objects have no inventory 1787 /* I assume combined objects have no inventory
1896 * We add the weight - this object could have just been removed 1788 * We add the weight - this object could have just been removed
1897 * (if it was possible to merge). calling remove_ob will subtract 1789 * (if it was possible to merge). calling remove_ob will subtract
1898 * the weight, so we need to add it in again, since we actually do 1790 * the weight, so we need to add it in again, since we actually do
1899 * the linking below 1791 * the linking below
1900 */ 1792 */
1901 add_weight (where, op->weight * op->nrof); 1793 add_weight (this, op->weight * op->nrof);
1902 } 1794 }
1903 else 1795 else
1904 add_weight (where, (op->weight + op->carrying)); 1796 add_weight (this, (op->weight + op->carrying));
1905 1797
1906 otmp = is_player_inv (where); 1798 otmp = is_player_inv (this);
1907 if (otmp && otmp->contr != NULL) 1799 if (otmp && otmp->contr)
1908 {
1909 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1800 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910 fix_player (otmp); 1801 fix_player (otmp);
1911 }
1912 1802
1913 op->map = NULL; 1803 op->map = NULL;
1914 op->env = where; 1804 op->env = this;
1915 op->above = NULL; 1805 op->above = NULL;
1916 op->below = NULL; 1806 op->below = NULL;
1917 op->x = 0, op->y = 0; 1807 op->x = 0, op->y = 0;
1918 1808
1919 /* reset the light list and los of the players on the map */ 1809 /* reset the light list and los of the players on the map */
1920 if ((op->glow_radius != 0) && where->map) 1810 if ((op->glow_radius != 0) && map)
1921 { 1811 {
1922#ifdef DEBUG_LIGHTS 1812#ifdef DEBUG_LIGHTS
1923 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1813 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1924#endif /* DEBUG_LIGHTS */ 1814#endif /* DEBUG_LIGHTS */
1925 if (MAP_DARKNESS (where->map)) 1815 if (MAP_DARKNESS (map))
1926 update_all_los (where->map, where->x, where->y); 1816 update_all_los (map, x, y);
1927 } 1817 }
1928 1818
1929 /* Client has no idea of ordering so lets not bother ordering it here. 1819 /* Client has no idea of ordering so lets not bother ordering it here.
1930 * It sure simplifies this function... 1820 * It sure simplifies this function...
1931 */ 1821 */
1932 if (where->inv == NULL) 1822 if (!inv)
1933 where->inv = op; 1823 inv = op;
1934 else 1824 else
1935 { 1825 {
1936 op->below = where->inv; 1826 op->below = inv;
1937 op->below->above = op; 1827 op->below->above = op;
1938 where->inv = op; 1828 inv = op;
1939 } 1829 }
1830
1940 return op; 1831 return op;
1941} 1832}
1942 1833
1943/* 1834/*
1944 * Checks if any objects has a move_type that matches objects 1835 * Checks if any objects has a move_type that matches objects
… …
1962 */ 1853 */
1963 1854
1964int 1855int
1965check_move_on (object *op, object *originator) 1856check_move_on (object *op, object *originator)
1966{ 1857{
1967 object * 1858 object *tmp;
1968 tmp; 1859 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1860 int x = op->x, y = op->y;
1975 1861
1976 MoveType 1862 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1863
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1864 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1865 return 0;
1983
1984 tag = op->count;
1985 1866
1986 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1867 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1987 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1868 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1988 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1869 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1989 1870
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1931 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1932 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2052 { 1933 {
2053 move_apply (tmp, op, originator); 1934 move_apply (tmp, op, originator);
2054 1935
2055 if (was_destroyed (op, tag)) 1936 if (op->destroyed ())
2056 return 1; 1937 return 1;
2057 1938
2058 /* what the person/creature stepped onto has moved the object 1939 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 1940 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 1941 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 1953 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1954 * The first matching object is returned, or NULL if none.
2074 */ 1955 */
2075 1956
2076object * 1957object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 1958present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 1959{
2079 object * 1960 object *
2080 tmp; 1961 tmp;
2081 1962
2082 if (m == NULL || out_of_map (m, x, y)) 1963 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 1976 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 1977 * The first matching object is returned, or NULL if none.
2097 */ 1978 */
2098 1979
2099object * 1980object *
2100present (unsigned char type, mapstruct *m, int x, int y) 1981present (unsigned char type, maptile *m, int x, int y)
2101{ 1982{
2102 object * 1983 object *
2103 tmp; 1984 tmp;
2104 1985
2105 if (out_of_map (m, x, y)) 1986 if (out_of_map (m, x, y))
… …
2245 * the archetype because that isn't correct if the monster has been 2126 * the archetype because that isn't correct if the monster has been
2246 * customized, changed states, etc. 2127 * customized, changed states, etc.
2247 */ 2128 */
2248 2129
2249int 2130int
2250find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2131find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2251{ 2132{
2252 int 2133 int
2253 i, 2134 i,
2254 index = 0, flag; 2135 index = 0, flag;
2255 static int 2136 static int
… …
2276 return -1; 2157 return -1;
2277 return altern[RANDOM () % index]; 2158 return altern[RANDOM () % index];
2278} 2159}
2279 2160
2280/* 2161/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2162 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2163 * find_free_spot(), but it will search max number of squares.
2283 * But it will return the first available spot, not a random choice. 2164 * But it will return the first available spot, not a random choice.
2284 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2165 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2285 */ 2166 */
2286 2167
2287int 2168int
2288find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2169find_first_free_spot (const object *ob, maptile *m, int x, int y)
2289{ 2170{
2290 int 2171 int
2291 i; 2172 i;
2292 2173
2293 for (i = 0; i < SIZEOFFREE; i++) 2174 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * because we have to know what movement the thing looking to move 2238 * because we have to know what movement the thing looking to move
2358 * there is capable of. 2239 * there is capable of.
2359 */ 2240 */
2360 2241
2361int 2242int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2243find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2244{
2364 int 2245 int
2365 i, 2246 i,
2366 max = SIZEOFFREE, mflags; 2247 max = SIZEOFFREE, mflags;
2367 2248
2368 sint16 nx, ny; 2249 sint16 nx, ny;
2369 object * 2250 object *
2370 tmp; 2251 tmp;
2371 mapstruct * 2252 maptile *
2372 mp; 2253 mp;
2373 2254
2374 MoveType blocked, move_type; 2255 MoveType blocked, move_type;
2375 2256
2376 if (exclude && exclude->head) 2257 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2465 * Modified to be map tile aware -.MSW
2585 */ 2466 */
2586 2467
2587 2468
2588int 2469int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2470can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2471{
2591 sint16 dx, dy; 2472 sint16 dx, dy;
2592 int 2473 int
2593 mflags; 2474 mflags;
2594 2475
… …
2643 * create clone from object to another 2524 * create clone from object to another
2644 */ 2525 */
2645object * 2526object *
2646object_create_clone (object *asrc) 2527object_create_clone (object *asrc)
2647{ 2528{
2648 object *
2649 dst = NULL, *tmp, *src, *part, *prev, *item; 2529 object *dst = 0, *tmp, *src, *part, *prev, *item;
2650 2530
2651 if (!asrc) 2531 if (!asrc)
2652 return NULL; 2532 return 0;
2533
2653 src = asrc; 2534 src = asrc;
2654 if (src->head) 2535 if (src->head)
2655 src = src->head; 2536 src = src->head;
2656 2537
2657 prev = NULL; 2538 prev = 0;
2658 for (part = src; part; part = part->more) 2539 for (part = src; part; part = part->more)
2659 { 2540 {
2660 tmp = get_object (); 2541 tmp = get_object ();
2661 copy_object (part, tmp); 2542 copy_object (part, tmp);
2662 tmp->x -= src->x; 2543 tmp->x -= src->x;
2663 tmp->y -= src->y; 2544 tmp->y -= src->y;
2545
2664 if (!part->head) 2546 if (!part->head)
2665 { 2547 {
2666 dst = tmp; 2548 dst = tmp;
2667 tmp->head = NULL; 2549 tmp->head = 0;
2668 } 2550 }
2669 else 2551 else
2670 { 2552 {
2671 tmp->head = dst; 2553 tmp->head = dst;
2672 } 2554 }
2555
2673 tmp->more = NULL; 2556 tmp->more = 0;
2557
2674 if (prev) 2558 if (prev)
2675 prev->more = tmp; 2559 prev->more = tmp;
2560
2676 prev = tmp; 2561 prev = tmp;
2677 } 2562 }
2678 2563
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2564 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2565 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2566
2685 return dst; 2567 return dst;
2686} 2568}
2687 2569
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2570/* GROS - Creates an object using a string representing its content. */
2698
2699/* Basically, we save the content of the string to a temp file, then call */ 2571/* Basically, we save the content of the string to a temp file, then call */
2700
2701/* load_object on it. I admit it is a highly inefficient way to make things, */ 2572/* load_object on it. I admit it is a highly inefficient way to make things, */
2702
2703/* but it was simple to make and allows reusing the load_object function. */ 2573/* but it was simple to make and allows reusing the load_object function. */
2704
2705/* Remember not to use load_object_str in a time-critical situation. */ 2574/* Remember not to use load_object_str in a time-critical situation. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2575/* Also remember that multiparts objects are not supported for now. */
2708 2576
2709object * 2577object *
2710load_object_str (const char *obstr) 2578load_object_str (const char *obstr)
2711{ 2579{
2712 object * 2580 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2581 char filename[MAX_BUF];
2716 2582
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2583 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2584
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2585 FILE *tempfile = fopen (filename, "w");
2721 2586
2722 if (tempfile == NULL) 2587 if (tempfile == NULL)
2723 { 2588 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2589 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2590 return NULL;
… …
2746 * returns NULL if no match. 2611 * returns NULL if no match.
2747 */ 2612 */
2748object * 2613object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2614find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2615{
2751 object * 2616 object *tmp;
2752 tmp;
2753 2617
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2618 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2619 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2620 return tmp;
2757 2621
… …
2765 * do the desired thing. 2629 * do the desired thing.
2766 */ 2630 */
2767key_value * 2631key_value *
2768get_ob_key_link (const object *ob, const char *key) 2632get_ob_key_link (const object *ob, const char *key)
2769{ 2633{
2770 key_value * 2634 key_value *link;
2771 link;
2772 2635
2773 for (link = ob->key_values; link != NULL; link = link->next) 2636 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2637 if (link->key == key)
2776 {
2777 return link; 2638 return link;
2778 }
2779 }
2780 2639
2781 return NULL; 2640 return NULL;
2782} 2641}
2783 2642
2784/* 2643/*

Diff Legend

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