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.40 by root, Thu Sep 14 00:07:15 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;
923static std::vector<object *, slice_allocator <object *> > freed; 833object::vector object::objects; // not yet used
834object *object::first;
924 835
925void object::free_mortals () 836void object::free_mortals ()
926{ 837{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 839 if ((*i)->refcnt)
929 ++i; // further delay freeing 840 ++i; // further delay freeing
930 else 841 else
931 { 842 {
932 //freed.push_back (*i);//D
933 delete *i; 843 delete *i;
934 mortals.erase (i); 844 mortals.erase (i);
935 } 845 }
936
937 if (mortals.size() && 0)//D
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
939} 846}
940 847
941object::object () 848object::object ()
942{ 849{
943 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
944 851
945 expmul = 1.0; 852 expmul = 1.0;
946 face = blank_face; 853 face = blank_face;
947 attacked_by_count = -1;
948} 854}
949 855
950object::~object () 856object::~object ()
951{ 857{
952 free_key_values (this); 858 free_key_values (this);
953} 859}
954 860
955void object::link () 861void object::link ()
956{ 862{
957 count = ++ob_count; 863 count = ++ob_count;
864 uuid = gen_uuid ();
958 865
959 prev = 0; 866 prev = 0;
960 next = objects; 867 next = object::first;
961 868
962 if (objects) 869 if (object::first)
963 objects->prev = this; 870 object::first->prev = this;
964 871
965 objects = this; 872 object::first = this;
966} 873}
967 874
968void object::unlink () 875void object::unlink ()
969{ 876{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 877 if (this == object::first)
974 objects = next; 878 object::first = next;
975 879
976 /* Remove this object from the list of used objects */ 880 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 881 if (prev) prev->next = next;
882 if (next) next->prev = prev;
883
980 prev = 0; 884 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 885 next = 0;
987 }
988} 886}
989 887
990object *object::create () 888object *object::create ()
991{ 889{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 890 object *op = new object;
996 else
997 {
998 // highly annoying, but the only way to get it stable right now
999 op = freed.back ();
1000 freed.pop_back ();
1001 op->~object ();
1002 new ((void *) op) object;
1003 }
1004
1005 op->link (); 891 op->link ();
1006 return op; 892 return op;
1007} 893}
1008 894
1009/* 895/*
… …
1011 * 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
1012 * free objects. The IS_FREED() flag is set in the object. 898 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for 899 * The object must have been removed by remove_ob() first for
1014 * this function to succeed. 900 * this function to succeed.
1015 * 901 *
1016 * 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
1017 * inventory to the ground. 903 * inventory to the ground.
1018 */ 904 */
1019void object::free (bool free_inventory) 905void object::destroy (bool destroy_inventory)
1020{ 906{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 907 if (QUERY_FLAG (this, FLAG_FREED))
1022 return; 908 return;
1023 909
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
1029 915
1030 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
1031 917
1032 if (more) 918 if (more)
1033 { 919 {
1034 more->free (free_inventory); 920 more->destroy (destroy_inventory);
1035 more = 0; 921 more = 0;
1036 } 922 }
1037 923
1038 if (inv) 924 if (inv)
1039 { 925 {
1040 /* Only if the space blocks everything do we not process - 926 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects 927 * if some form of movement is allowed, let objects
1042 * drop on that space. 928 * drop on that space.
1043 */ 929 */
1044 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)
1045 { 931 {
1046 object *op = inv; 932 object *op = inv;
1047 933
1048 while (op) 934 while (op)
1049 { 935 {
1050 object *tmp = op->below; 936 object *tmp = op->below;
1051 op->free (free_inventory); 937 op->destroy (destroy_inventory);
1052 op = tmp; 938 op = tmp;
1053 } 939 }
1054 } 940 }
1055 else 941 else
1056 { /* Put objects in inventory onto this space */ 942 { /* Put objects in inventory onto this space */
… …
1075 op = tmp; 961 op = tmp;
1076 } 962 }
1077 } 963 }
1078 } 964 }
1079 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
1080 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;
1081 993
1082 /* Remove object from the active list */ 994 /* Remove object from the active list */
1083 speed = 0; 995 speed = 0;
1084 update_ob_speed (this); 996 update_ob_speed (this);
1085 997
… …
1090 1002
1091/* 1003/*
1092 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1093 * 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)).
1094 */ 1006 */
1095
1096void 1007void
1097sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1098{ 1009{
1099 while (op != NULL) 1010 while (op != NULL)
1100 { 1011 {
1101 if (op->type == CONTAINER) 1012 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 1014
1105 op->carrying -= weight; 1015 op->carrying -= weight;
1106 op = op->env; 1016 op = op->env;
1107 } 1017 }
1108} 1018}
1109 1019
… …
1113 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1114 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1115 * the previous environment. 1025 * the previous environment.
1116 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1117 */ 1027 */
1118
1119void 1028void
1120remove_ob (object *op) 1029object::remove ()
1121{ 1030{
1031 object *tmp, *last = 0;
1122 object * 1032 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 1033
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off; 1034 int check_walk_off;
1132 mapstruct *
1133 m;
1134 1035
1135 sint16
1136 x,
1137 y;
1138
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1140 return; 1037 return;
1141 1038
1142 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1143 1040
1144 if (op->more != NULL) 1041 if (more)
1145 remove_ob (op->more); 1042 more->remove ();
1146 1043
1147 /* 1044 /*
1148 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1149 * inventory. 1046 * inventory.
1150 */ 1047 */
1151 if (op->env != NULL) 1048 if (env)
1152 { 1049 {
1153 if (op->nrof) 1050 if (nrof)
1154 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1155 else 1052 else
1156 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1157 1054
1158 /* 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
1159 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1160 * to save cpu time. 1057 * to save cpu time.
1161 */ 1058 */
1162 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))
1163 fix_player (otmp); 1060 fix_player (otmp);
1164 1061
1165 if (op->above != NULL) 1062 if (above != NULL)
1166 op->above->below = op->below; 1063 above->below = below;
1167 else 1064 else
1168 op->env->inv = op->below; 1065 env->inv = below;
1169 1066
1170 if (op->below != NULL) 1067 if (below != NULL)
1171 op->below->above = op->above; 1068 below->above = above;
1172 1069
1173 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1174 * 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
1175 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1176 */ 1073 */
1177 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1178 op->map = op->env->map; 1075 map = env->map;
1179 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1180 op->env = NULL; 1077 env = 0;
1181 } 1078 }
1182 else if (op->map) 1079 else if (map)
1183 { 1080 {
1184 x = op->x;
1185 y = op->y;
1186 m = get_map_from_coord (op->map, &x, &y);
1187
1188 if (!m)
1189 {
1190 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1191 op->map->path, op->x, op->y);
1192 /* in old days, we used to set x and y to 0 and continue.
1193 * it seems if we get into this case, something is probablye
1194 * screwed up and should be fixed.
1195 */
1196 abort ();
1197 }
1198
1199 if (op->map != m)
1200 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1201 op->map->path, m->path, op->x, op->y, x, y);
1202
1203 /* 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
1204 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1205 */ 1083 */
1206 1084
1207 /* link the object above us */ 1085 /* link the object above us */
1208 if (op->above) 1086 if (above)
1209 op->above->below = op->below; 1087 above->below = below;
1210 else 1088 else
1211 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 */
1212 1090
1213 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1214 if (op->below) 1092 if (below)
1215 op->below->above = op->above; 1093 below->above = above;
1216 else 1094 else
1217 { 1095 {
1218 /* 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
1219 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1220 * evident 1098 * evident
1221 */ 1099 */
1222 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1223 { 1101 {
1224 dump_object (op); 1102 char *dump = dump_object (this);
1225 LOG (llevError, 1103 LOG (llevError,
1226 "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);
1227 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1228 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1229 } 1109 }
1230 1110
1231 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1232 } 1112 }
1233 1113
1234 op->above = 0; 1114 above = 0;
1235 op->below = 0; 1115 below = 0;
1236 1116
1237 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1238 return; 1118 return;
1239 1119
1240 tag = op->count;
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1242 1121
1243 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)
1244 { 1123 {
1245 /* 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
1246 * being removed. 1125 * being removed.
1247 */ 1126 */
1248 1127
1249 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1250 { 1129 {
1251 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1252 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1253 * appropriately. 1132 * appropriately.
1254 */ 1133 */
1255 if (tmp->container == op) 1134 if (tmp->container == this)
1256 { 1135 {
1257 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1258 tmp->container = NULL; 1137 tmp->container = 0;
1259 } 1138 }
1260 1139
1261 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1262 } 1141 }
1263 1142
1264 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1265 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))
1266 { 1147 {
1267 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1268 1149
1269 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1270 {
1271 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 ());
1272 }
1273 } 1152 }
1274 1153
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1155
1277 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1278 tmp->above = NULL; 1157 tmp->above = 0;
1279 1158
1280 last = tmp; 1159 last = tmp;
1281 } 1160 }
1282 1161
1283 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1284 if (last == NULL) 1163 if (!last)
1285 { 1164 {
1286 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287 * 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
1288 * 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
1289 * be correct anyways. 1168 * be correct anyways.
1290 */ 1169 */
1291 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1292 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1293 } 1172 }
1294 else 1173 else
1295 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1296 1175
1297 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1298 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1299 } 1178 }
1300} 1179}
1301 1180
1302/* 1181/*
1303 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1330 free_object (op); 1209 free_object (op);
1331 return top; 1210 return top;
1332 } 1211 }
1333 } 1212 }
1334 1213
1335 return NULL; 1214 return 0;
1336} 1215}
1337 1216
1338/* 1217/*
1339 * 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
1340 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1341 */ 1220 */
1342object * 1221object *
1343insert_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)
1344{ 1223{
1345 object *tmp; 1224 object *tmp;
1346 1225
1347 if (op->head) 1226 if (op->head)
1348 op = op->head; 1227 op = op->head;
… …
1376 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1256 * just 'op' otherwise
1378 */ 1257 */
1379 1258
1380object * 1259object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1261{
1383 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1263 sint16 x, y;
1385 1264
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
… …
1389 return NULL; 1268 return NULL;
1390 } 1269 }
1391 1270
1392 if (m == NULL) 1271 if (m == NULL)
1393 { 1272 {
1394 dump_object (op); 1273 char *dump = dump_object (op);
1395 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);
1396 return op; 1276 return op;
1397 } 1277 }
1398 1278
1399 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1400 { 1280 {
1401 dump_object (op); 1281 char *dump = dump_object (op);
1402 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);
1403#ifdef MANY_CORES 1283#ifdef MANY_CORES
1404 /* 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
1405 * 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
1406 * improperly inserted. 1286 * improperly inserted.
1407 */ 1287 */
1408 abort (); 1288 abort ();
1409#endif 1289#endif
1290 free (dump);
1410 return op; 1291 return op;
1411 } 1292 }
1412 1293
1413 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1414 { 1295 {
1415 dump_object (op); 1296 char *dump = dump_object (op);
1416 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);
1417 return op; 1299 return op;
1418 } 1300 }
1419 1301
1420 if (op->more != NULL) 1302 if (op->more != NULL)
1421 { 1303 {
… …
1667 remove_ob (tmp); 1549 remove_ob (tmp);
1668 free_object (tmp); 1550 free_object (tmp);
1669 } 1551 }
1670 } 1552 }
1671 1553
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1555
1674 tmp1->x = op->x; 1556 tmp1->x = op->x;
1675 tmp1->y = op->y; 1557 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1558 insert_ob_in_map (tmp1, op->map, op, 0);
1677} 1559}
… …
1835 op->carrying += weight; 1717 op->carrying += weight;
1836 op = op->env; 1718 op = op->env;
1837 } 1719 }
1838} 1720}
1839 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
1840/* 1742/*
1841 * insert_ob_in_ob(op,environment): 1743 * env->insert (op)
1842 * This function inserts the object op in the linked list 1744 * This function inserts the object op in the linked list
1843 * inside the object environment. 1745 * inside the object environment.
1844 * 1746 *
1845 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1846 * the inventory at the last position or next to other objects of the same
1847 * type.
1848 * Frank: Now sorted by type, archetype and magic!
1849 *
1850 * 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
1851 * be != op, if items are merged. -Tero 1748 * be != op, if items are merged. -Tero
1852 */ 1749 */
1853 1750
1854object * 1751object *
1855insert_ob_in_ob (object *op, object *where) 1752object::insert (object *op)
1856{ 1753{
1857 object * 1754 object *tmp, *otmp;
1858 tmp, *
1859 otmp;
1860 1755
1861 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1756 if (!QUERY_FLAG (op, FLAG_REMOVED))
1862 { 1757 op->remove ();
1863 dump_object (op);
1864 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1865 return op;
1866 }
1867
1868 if (where == NULL)
1869 {
1870 dump_object (op);
1871 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1872 return op;
1873 }
1874
1875 if (where->head)
1876 {
1877 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1878 where = where->head;
1879 }
1880 1758
1881 if (op->more) 1759 if (op->more)
1882 { 1760 {
1883 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);
1884 return op; 1762 return op;
… …
1886 1764
1887 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1888 CLEAR_FLAG (op, FLAG_REMOVED); 1766 CLEAR_FLAG (op, FLAG_REMOVED);
1889 if (op->nrof) 1767 if (op->nrof)
1890 { 1768 {
1891 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1769 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1892 if (CAN_MERGE (tmp, op)) 1770 if (CAN_MERGE (tmp, op))
1893 { 1771 {
1894 /* return the original object and remove inserted object 1772 /* return the original object and remove inserted object
1895 (client needs the original object) */ 1773 (client needs the original object) */
1896 tmp->nrof += op->nrof; 1774 tmp->nrof += op->nrof;
1897 /* Weight handling gets pretty funky. Since we are adding to 1775 /* Weight handling gets pretty funky. Since we are adding to
1898 * tmp->nrof, we need to increase the weight. 1776 * tmp->nrof, we need to increase the weight.
1899 */ 1777 */
1900 add_weight (where, op->weight * op->nrof); 1778 add_weight (this, op->weight * op->nrof);
1901 SET_FLAG (op, FLAG_REMOVED); 1779 SET_FLAG (op, FLAG_REMOVED);
1902 free_object (op); /* free the inserted object */ 1780 op->destroy (); /* free the inserted object */
1903 op = tmp; 1781 op = tmp;
1904 remove_ob (op); /* and fix old object's links */ 1782 op->remove (); /* and fix old object's links */
1905 CLEAR_FLAG (op, FLAG_REMOVED); 1783 CLEAR_FLAG (op, FLAG_REMOVED);
1906 break; 1784 break;
1907 } 1785 }
1908 1786
1909 /* I assume combined objects have no inventory 1787 /* I assume combined objects have no inventory
1910 * We add the weight - this object could have just been removed 1788 * We add the weight - this object could have just been removed
1911 * (if it was possible to merge). calling remove_ob will subtract 1789 * (if it was possible to merge). calling remove_ob will subtract
1912 * 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
1913 * the linking below 1791 * the linking below
1914 */ 1792 */
1915 add_weight (where, op->weight * op->nrof); 1793 add_weight (this, op->weight * op->nrof);
1916 } 1794 }
1917 else 1795 else
1918 add_weight (where, (op->weight + op->carrying)); 1796 add_weight (this, (op->weight + op->carrying));
1919 1797
1920 otmp = is_player_inv (where); 1798 otmp = is_player_inv (this);
1921 if (otmp && otmp->contr != NULL) 1799 if (otmp && otmp->contr)
1922 {
1923 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1800 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1924 fix_player (otmp); 1801 fix_player (otmp);
1925 }
1926 1802
1927 op->map = NULL; 1803 op->map = NULL;
1928 op->env = where; 1804 op->env = this;
1929 op->above = NULL; 1805 op->above = NULL;
1930 op->below = NULL; 1806 op->below = NULL;
1931 op->x = 0, op->y = 0; 1807 op->x = 0, op->y = 0;
1932 1808
1933 /* 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 */
1934 if ((op->glow_radius != 0) && where->map) 1810 if ((op->glow_radius != 0) && map)
1935 { 1811 {
1936#ifdef DEBUG_LIGHTS 1812#ifdef DEBUG_LIGHTS
1937 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);
1938#endif /* DEBUG_LIGHTS */ 1814#endif /* DEBUG_LIGHTS */
1939 if (MAP_DARKNESS (where->map)) 1815 if (MAP_DARKNESS (map))
1940 update_all_los (where->map, where->x, where->y); 1816 update_all_los (map, x, y);
1941 } 1817 }
1942 1818
1943 /* 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.
1944 * It sure simplifies this function... 1820 * It sure simplifies this function...
1945 */ 1821 */
1946 if (where->inv == NULL) 1822 if (!inv)
1947 where->inv = op; 1823 inv = op;
1948 else 1824 else
1949 { 1825 {
1950 op->below = where->inv; 1826 op->below = inv;
1951 op->below->above = op; 1827 op->below->above = op;
1952 where->inv = op; 1828 inv = op;
1953 } 1829 }
1830
1954 return op; 1831 return op;
1955} 1832}
1956 1833
1957/* 1834/*
1958 * Checks if any objects has a move_type that matches objects 1835 * Checks if any objects has a move_type that matches objects
… …
1976 */ 1853 */
1977 1854
1978int 1855int
1979check_move_on (object *op, object *originator) 1856check_move_on (object *op, object *originator)
1980{ 1857{
1981 object * 1858 object *tmp;
1982 tmp; 1859 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1860 int x = op->x, y = op->y;
1989 1861
1990 MoveType 1862 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1863
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1864 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1865 return 0;
1997
1998 tag = op->count;
1999 1866
2000 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);
2001 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);
2002 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);
2003 1870
… …
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1931 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2065 ((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))
2066 { 1933 {
2067 move_apply (tmp, op, originator); 1934 move_apply (tmp, op, originator);
2068 1935
2069 if (was_destroyed (op, tag)) 1936 if (op->destroyed ())
2070 return 1; 1937 return 1;
2071 1938
2072 /* what the person/creature stepped onto has moved the object 1939 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 1940 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 1941 * have a feeling strange problems would result.
… …
2086 * a matching archetype at the given map and coordinates. 1953 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 1954 * The first matching object is returned, or NULL if none.
2088 */ 1955 */
2089 1956
2090object * 1957object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 1958present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 1959{
2093 object * 1960 object *
2094 tmp; 1961 tmp;
2095 1962
2096 if (m == NULL || out_of_map (m, x, y)) 1963 if (m == NULL || out_of_map (m, x, y))
… …
2109 * a matching type variable at the given map and coordinates. 1976 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 1977 * The first matching object is returned, or NULL if none.
2111 */ 1978 */
2112 1979
2113object * 1980object *
2114present (unsigned char type, mapstruct *m, int x, int y) 1981present (unsigned char type, maptile *m, int x, int y)
2115{ 1982{
2116 object * 1983 object *
2117 tmp; 1984 tmp;
2118 1985
2119 if (out_of_map (m, x, y)) 1986 if (out_of_map (m, x, y))
… …
2259 * 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
2260 * customized, changed states, etc. 2127 * customized, changed states, etc.
2261 */ 2128 */
2262 2129
2263int 2130int
2264find_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)
2265{ 2132{
2266 int 2133 int
2267 i, 2134 i,
2268 index = 0, flag; 2135 index = 0, flag;
2269 static int 2136 static int
… …
2290 return -1; 2157 return -1;
2291 return altern[RANDOM () % index]; 2158 return altern[RANDOM () % index];
2292} 2159}
2293 2160
2294/* 2161/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2162 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2163 * find_free_spot(), but it will search max number of squares.
2297 * 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.
2298 * 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.
2299 */ 2166 */
2300 2167
2301int 2168int
2302find_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)
2303{ 2170{
2304 int 2171 int
2305 i; 2172 i;
2306 2173
2307 for (i = 0; i < SIZEOFFREE; i++) 2174 for (i = 0; i < SIZEOFFREE; i++)
… …
2371 * 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
2372 * there is capable of. 2239 * there is capable of.
2373 */ 2240 */
2374 2241
2375int 2242int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2243find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2244{
2378 int 2245 int
2379 i, 2246 i,
2380 max = SIZEOFFREE, mflags; 2247 max = SIZEOFFREE, mflags;
2381 2248
2382 sint16 nx, ny; 2249 sint16 nx, ny;
2383 object * 2250 object *
2384 tmp; 2251 tmp;
2385 mapstruct * 2252 maptile *
2386 mp; 2253 mp;
2387 2254
2388 MoveType blocked, move_type; 2255 MoveType blocked, move_type;
2389 2256
2390 if (exclude && exclude->head) 2257 if (exclude && exclude->head)
… …
2598 * Modified to be map tile aware -.MSW 2465 * Modified to be map tile aware -.MSW
2599 */ 2466 */
2600 2467
2601 2468
2602int 2469int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2470can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2471{
2605 sint16 dx, dy; 2472 sint16 dx, dy;
2606 int 2473 int
2607 mflags; 2474 mflags;
2608 2475
… …
2657 * create clone from object to another 2524 * create clone from object to another
2658 */ 2525 */
2659object * 2526object *
2660object_create_clone (object *asrc) 2527object_create_clone (object *asrc)
2661{ 2528{
2662 object *
2663 dst = NULL, *tmp, *src, *part, *prev, *item; 2529 object *dst = 0, *tmp, *src, *part, *prev, *item;
2664 2530
2665 if (!asrc) 2531 if (!asrc)
2666 return NULL; 2532 return 0;
2533
2667 src = asrc; 2534 src = asrc;
2668 if (src->head) 2535 if (src->head)
2669 src = src->head; 2536 src = src->head;
2670 2537
2671 prev = NULL; 2538 prev = 0;
2672 for (part = src; part; part = part->more) 2539 for (part = src; part; part = part->more)
2673 { 2540 {
2674 tmp = get_object (); 2541 tmp = get_object ();
2675 copy_object (part, tmp); 2542 copy_object (part, tmp);
2676 tmp->x -= src->x; 2543 tmp->x -= src->x;
2677 tmp->y -= src->y; 2544 tmp->y -= src->y;
2545
2678 if (!part->head) 2546 if (!part->head)
2679 { 2547 {
2680 dst = tmp; 2548 dst = tmp;
2681 tmp->head = NULL; 2549 tmp->head = 0;
2682 } 2550 }
2683 else 2551 else
2684 { 2552 {
2685 tmp->head = dst; 2553 tmp->head = dst;
2686 } 2554 }
2555
2687 tmp->more = NULL; 2556 tmp->more = 0;
2557
2688 if (prev) 2558 if (prev)
2689 prev->more = tmp; 2559 prev->more = tmp;
2560
2690 prev = tmp; 2561 prev = tmp;
2691 } 2562 }
2692 2563
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2564 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2565 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2566
2699 return dst; 2567 return dst;
2700} 2568}
2701 2569
2702/* return true if the object was destroyed, 0 otherwise */
2703int
2704was_destroyed (const object *op, tag_t old_tag)
2705{
2706 /* checking for FLAG_FREED isn't necessary, but makes this function more
2707 * robust */
2708 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709}
2710
2711/* GROS - Creates an object using a string representing its content. */ 2570/* GROS - Creates an object using a string representing its content. */
2712
2713/* 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 */
2714
2715/* 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, */
2716
2717/* 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. */
2718
2719/* 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. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2575/* Also remember that multiparts objects are not supported for now. */
2722 2576
2723object * 2577object *
2724load_object_str (const char *obstr) 2578load_object_str (const char *obstr)
2725{ 2579{
2726 object * 2580 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2581 char filename[MAX_BUF];
2730 2582
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2583 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2584
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2585 FILE *tempfile = fopen (filename, "w");
2735 2586
2736 if (tempfile == NULL) 2587 if (tempfile == NULL)
2737 { 2588 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2589 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2590 return NULL;
2740 }; 2591 }
2592
2741 fprintf (tempfile, obstr); 2593 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2594 fclose (tempfile);
2743 2595
2744 op = get_object (); 2596 op = get_object ();
2745 2597
… …
2759 * returns NULL if no match. 2611 * returns NULL if no match.
2760 */ 2612 */
2761object * 2613object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2614find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2615{
2764 object * 2616 object *tmp;
2765 tmp;
2766 2617
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2618 for (tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2619 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2620 return tmp;
2770 2621
… …
2778 * do the desired thing. 2629 * do the desired thing.
2779 */ 2630 */
2780key_value * 2631key_value *
2781get_ob_key_link (const object *ob, const char *key) 2632get_ob_key_link (const object *ob, const char *key)
2782{ 2633{
2783 key_value * 2634 key_value *link;
2784 link;
2785 2635
2786 for (link = ob->key_values; link != NULL; link = link->next) 2636 for (link = ob->key_values; link != NULL; link = link->next)
2787 {
2788 if (link->key == key) 2637 if (link->key == key)
2789 {
2790 return link; 2638 return link;
2791 }
2792 }
2793 2639
2794 return NULL; 2640 return NULL;
2795} 2641}
2796 2642
2797/* 2643/*

Diff Legend

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