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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 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}
… …
623 553
624 op2->clone (op); 554 op2->clone (op);
625 555
626 if (is_freed) 556 if (is_freed)
627 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
628 if (is_removed) 559 if (is_removed)
629 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
630 561
631 if (op2->speed < 0) 562 if (op2->speed < 0)
632 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
874 update_now = 1; 805 update_now = 1;
875 806
876 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
877 update_now = 1; 808 update_now = 1;
878 } 809 }
810
879 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
880 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
881 * that is being removed. 813 * that is being removed.
882 */ 814 */
883 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
895 827
896 if (op->more != NULL) 828 if (op->more != NULL)
897 update_object (op->more, action); 829 update_object (op->more, action);
898} 830}
899 831
900static unordered_vector<object *> mortals; 832object::vector object::mortals;
833object::vector object::objects; // not yet used
834object *object::first;
901 835
902void object::free_mortals () 836void object::free_mortals ()
903{ 837{
904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905 if ((*i)->refcnt) 839 if ((*i)->refcnt)
906 ++i; // further delay freeing 840 ++i; // further delay freeing
907 else 841 else
908 { 842 {
909 delete *i; 843 delete *i;
910 mortals.erase (i); 844 mortals.erase (i);
911 } 845 }
912
913 static int lastmortals = 0;//D
914
915 if (mortals.size() != lastmortals)//D
916 {
917 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 }
920} 846}
921 847
922object::object () 848object::object ()
923{ 849{
924 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
… …
936{ 862{
937 count = ++ob_count; 863 count = ++ob_count;
938 uuid = gen_uuid (); 864 uuid = gen_uuid ();
939 865
940 prev = 0; 866 prev = 0;
941 next = objects; 867 next = object::first;
942 868
943 if (objects) 869 if (object::first)
944 objects->prev = this; 870 object::first->prev = this;
945 871
946 objects = this; 872 object::first = this;
947} 873}
948 874
949void object::unlink () 875void object::unlink ()
950{ 876{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == objects) 877 if (this == object::first)
955 objects = next; 878 object::first = next;
956 879
957 /* Remove this object from the list of used objects */ 880 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 881 if (prev) prev->next = next;
959 if (next) next->prev = prev; 882 if (next) next->prev = prev;
960 883
… …
974 * 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
975 * free objects. The IS_FREED() flag is set in the object. 898 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 899 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 900 * this function to succeed.
978 * 901 *
979 * 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
980 * inventory to the ground. 903 * inventory to the ground.
981 */ 904 */
982void object::free (bool free_inventory) 905void object::destroy (bool destroy_inventory)
983{ 906{
984 if (QUERY_FLAG (this, FLAG_FREED)) 907 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 908 return;
986 909
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
988 remove_friendly_object (this); 911 remove_friendly_object (this);
989 912
990 if (!QUERY_FLAG (this, FLAG_REMOVED)) 913 if (!QUERY_FLAG (this, FLAG_REMOVED))
991 remove_ob (this); 914 remove ();
992 915
993 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
994 917
995 if (more) 918 if (more)
996 { 919 {
997 more->free (free_inventory); 920 more->destroy (destroy_inventory);
998 more = 0; 921 more = 0;
999 } 922 }
1000 923
1001 if (inv) 924 if (inv)
1002 { 925 {
1003 /* Only if the space blocks everything do we not process - 926 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 927 * if some form of movement is allowed, let objects
1005 * drop on that space. 928 * drop on that space.
1006 */ 929 */
1007 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)
1008 { 931 {
1009 object *op = inv; 932 object *op = inv;
1010 933
1011 while (op) 934 while (op)
1012 { 935 {
1013 object *tmp = op->below; 936 object *tmp = op->below;
1014 op->free (free_inventory); 937 op->destroy (destroy_inventory);
1015 op = tmp; 938 op = tmp;
1016 } 939 }
1017 } 940 }
1018 else 941 else
1019 { /* Put objects in inventory onto this space */ 942 { /* Put objects in inventory onto this space */
… …
1021 944
1022 while (op) 945 while (op)
1023 { 946 {
1024 object *tmp = op->below; 947 object *tmp = op->below;
1025 948
1026 remove_ob (op); 949 op->remove ();
1027 950
1028 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 951 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1029 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 952 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1030 free_object (op); 953 op->destroy (0);
1031 else 954 else
1032 { 955 {
1033 op->x = x; 956 op->x = x;
1034 op->y = y; 957 op->y = y;
1035 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 958 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1038 op = tmp; 961 op = tmp;
1039 } 962 }
1040 } 963 }
1041 } 964 }
1042 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
1043 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;
1044 993
1045 /* Remove object from the active list */ 994 /* Remove object from the active list */
1046 speed = 0; 995 speed = 0;
1047 update_ob_speed (this); 996 update_ob_speed (this);
1048 997
… …
1053 1002
1054/* 1003/*
1055 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1056 * 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)).
1057 */ 1006 */
1058
1059void 1007void
1060sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1061{ 1009{
1062 while (op != NULL) 1010 while (op != NULL)
1063 { 1011 {
1064 if (op->type == CONTAINER) 1012 if (op->type == CONTAINER)
1065 {
1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1067 } 1014
1068 op->carrying -= weight; 1015 op->carrying -= weight;
1069 op = op->env; 1016 op = op->env;
1070 } 1017 }
1071} 1018}
1072 1019
1073/* remove_ob(op): 1020/* op->remove ():
1074 * This function removes the object op from the linked list of objects 1021 * This function removes the object op from the linked list of objects
1075 * which it is currently tied to. When this function is done, the 1022 * which it is currently tied to. When this function is done, the
1076 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1077 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1078 * the previous environment. 1025 * the previous environment.
1079 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1080 */ 1027 */
1081
1082void 1028void
1083remove_ob (object *op) 1029object::remove ()
1084{ 1030{
1031 object *tmp, *last = 0;
1085 object * 1032 object *otmp;
1086 tmp, *
1087 last = NULL;
1088 object *
1089 otmp;
1090 1033
1091 tag_t
1092 tag;
1093 int
1094 check_walk_off; 1034 int check_walk_off;
1095 mapstruct *
1096 m;
1097 1035
1098 sint16
1099 x,
1100 y;
1101
1102 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1103 return; 1037 return;
1104 1038
1105 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1106 1040
1107 if (op->more != NULL) 1041 if (more)
1108 remove_ob (op->more); 1042 more->remove ();
1109 1043
1110 /* 1044 /*
1111 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1112 * inventory. 1046 * inventory.
1113 */ 1047 */
1114 if (op->env != NULL) 1048 if (env)
1115 { 1049 {
1116 if (op->nrof) 1050 if (nrof)
1117 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1118 else 1052 else
1119 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1120 1054
1121 /* 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
1122 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1123 * to save cpu time. 1057 * to save cpu time.
1124 */ 1058 */
1125 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))
1126 fix_player (otmp); 1060 fix_player (otmp);
1127 1061
1128 if (op->above != NULL) 1062 if (above != NULL)
1129 op->above->below = op->below; 1063 above->below = below;
1130 else 1064 else
1131 op->env->inv = op->below; 1065 env->inv = below;
1132 1066
1133 if (op->below != NULL) 1067 if (below != NULL)
1134 op->below->above = op->above; 1068 below->above = above;
1135 1069
1136 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1137 * 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
1138 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1139 */ 1073 */
1140 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1141 op->map = op->env->map; 1075 map = env->map;
1142 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1143 op->env = NULL; 1077 env = 0;
1144 } 1078 }
1145 else if (op->map) 1079 else if (map)
1146 { 1080 {
1147 x = op->x;
1148 y = op->y;
1149 m = get_map_from_coord (op->map, &x, &y);
1150
1151 if (!m)
1152 {
1153 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1154 op->map->path, op->x, op->y);
1155 /* in old days, we used to set x and y to 0 and continue.
1156 * it seems if we get into this case, something is probablye
1157 * screwed up and should be fixed.
1158 */
1159 abort ();
1160 }
1161
1162 if (op->map != m)
1163 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1164 op->map->path, m->path, op->x, op->y, x, y);
1165
1166 /* 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
1167 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1168 */ 1083 */
1169 1084
1170 /* link the object above us */ 1085 /* link the object above us */
1171 if (op->above) 1086 if (above)
1172 op->above->below = op->below; 1087 above->below = below;
1173 else 1088 else
1174 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 */
1175 1090
1176 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1177 if (op->below) 1092 if (below)
1178 op->below->above = op->above; 1093 below->above = above;
1179 else 1094 else
1180 { 1095 {
1181 /* 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
1182 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1183 * evident 1098 * evident
1184 */ 1099 */
1185 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1186 { 1101 {
1187 dump_object (op); 1102 char *dump = dump_object (this);
1188 LOG (llevError, 1103 LOG (llevError,
1189 "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);
1190 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1191 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1192 } 1109 }
1193 1110
1194 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1195 } 1112 }
1196 1113
1197 op->above = 0; 1114 above = 0;
1198 op->below = 0; 1115 below = 0;
1199 1116
1200 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1201 return; 1118 return;
1202 1119
1203 tag = op->count;
1204 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1205 1121
1206 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)
1207 { 1123 {
1208 /* 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
1209 * being removed. 1125 * being removed.
1210 */ 1126 */
1211 1127
1212 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1213 { 1129 {
1214 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1215 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1216 * appropriately. 1132 * appropriately.
1217 */ 1133 */
1218 if (tmp->container == op) 1134 if (tmp->container == this)
1219 { 1135 {
1220 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1221 tmp->container = NULL; 1137 tmp->container = 0;
1222 } 1138 }
1223 1139
1224 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1225 } 1141 }
1226 1142
1227 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1228 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))
1229 { 1147 {
1230 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1231 1149
1232 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1233 {
1234 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 ());
1235 }
1236 } 1152 }
1237 1153
1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239 1155
1240 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1241 tmp->above = NULL; 1157 tmp->above = 0;
1242 1158
1243 last = tmp; 1159 last = tmp;
1244 } 1160 }
1245 1161
1246 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1247 if (last == NULL) 1163 if (!last)
1248 { 1164 {
1249 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1250 * 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
1251 * 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
1252 * be correct anyways. 1168 * be correct anyways.
1253 */ 1169 */
1254 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1255 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1256 } 1172 }
1257 else 1173 else
1258 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1259 1175
1260 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1261 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1262 } 1178 }
1263} 1179}
1264 1180
1265/* 1181/*
1266 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1287 { 1203 {
1288 top->nrof += op->nrof; 1204 top->nrof += op->nrof;
1289 1205
1290/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1291 op->weight = 0; /* Don't want any adjustements now */ 1207 op->weight = 0; /* Don't want any adjustements now */
1292 remove_ob (op); 1208 op->remove ();
1293 free_object (op); 1209 op->destroy (0);
1294 return top; 1210 return top;
1295 } 1211 }
1296 } 1212 }
1297 1213
1298 return NULL; 1214 return 0;
1299} 1215}
1300 1216
1301/* 1217/*
1302 * 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
1303 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1304 */ 1220 */
1305object * 1221object *
1306insert_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)
1307{ 1223{
1308 object *tmp; 1224 object *tmp;
1309 1225
1310 if (op->head) 1226 if (op->head)
1311 op = op->head; 1227 op = op->head;
… …
1339 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1340 * just 'op' otherwise 1256 * just 'op' otherwise
1341 */ 1257 */
1342 1258
1343object * 1259object *
1344insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1345{ 1261{
1346 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1347 sint16 x, y; 1263 sint16 x, y;
1348 1264
1349 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
… …
1352 return NULL; 1268 return NULL;
1353 } 1269 }
1354 1270
1355 if (m == NULL) 1271 if (m == NULL)
1356 { 1272 {
1357 dump_object (op); 1273 char *dump = dump_object (op);
1358 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);
1359 return op; 1276 return op;
1360 } 1277 }
1361 1278
1362 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1363 { 1280 {
1364 dump_object (op); 1281 char *dump = dump_object (op);
1365 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);
1366#ifdef MANY_CORES 1283#ifdef MANY_CORES
1367 /* 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
1368 * 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
1369 * improperly inserted. 1286 * improperly inserted.
1370 */ 1287 */
1371 abort (); 1288 abort ();
1372#endif 1289#endif
1290 free (dump);
1373 return op; 1291 return op;
1374 } 1292 }
1375 1293
1376 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1377 { 1295 {
1378 dump_object (op); 1296 char *dump = dump_object (op);
1379 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);
1380 return op; 1299 return op;
1381 } 1300 }
1382 1301
1383 if (op->more != NULL) 1302 if (op->more != NULL)
1384 { 1303 {
… …
1425 if (op->nrof && !(flag & INS_NO_MERGE)) 1344 if (op->nrof && !(flag & INS_NO_MERGE))
1426 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1345 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1427 if (CAN_MERGE (op, tmp)) 1346 if (CAN_MERGE (op, tmp))
1428 { 1347 {
1429 op->nrof += tmp->nrof; 1348 op->nrof += tmp->nrof;
1430 remove_ob (tmp); 1349 tmp->remove ();
1431 free_object (tmp); 1350 tmp->destroy (0);
1432 } 1351 }
1433 1352
1434 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1435 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1436 1355
… …
1625 1544
1626 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1627 { 1546 {
1628 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1629 { 1548 {
1630 remove_ob (tmp); 1549 tmp->remove ();
1631 free_object (tmp); 1550 tmp->destroy (0);
1632 } 1551 }
1633 } 1552 }
1634 1553
1635 tmp1 = arch_to_object (find_archetype (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1636 1555
1637 tmp1->x = op->x; 1556 tmp1->x = op->x;
1638 tmp1->y = op->y; 1557 tmp1->y = op->y;
1639 insert_ob_in_map (tmp1, op->map, op, 0); 1558 insert_ob_in_map (tmp1, op->map, op, 0);
1640} 1559}
… …
1662 } 1581 }
1663 1582
1664 newob = object_create_clone (orig_ob); 1583 newob = object_create_clone (orig_ob);
1665 1584
1666 if ((orig_ob->nrof -= nr) < 1) 1585 if ((orig_ob->nrof -= nr) < 1)
1667 { 1586 orig_ob->destroy (1);
1668 if (!is_removed)
1669 remove_ob (orig_ob);
1670 free_object2 (orig_ob, 1);
1671 }
1672 else if (!is_removed) 1587 else if (!is_removed)
1673 { 1588 {
1674 if (orig_ob->env != NULL) 1589 if (orig_ob->env != NULL)
1675 sub_weight (orig_ob->env, orig_ob->weight * nr); 1590 sub_weight (orig_ob->env, orig_ob->weight * nr);
1676 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1591 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1740 esrv_send_item (tmp, op); 1655 esrv_send_item (tmp, op);
1741 } 1656 }
1742 } 1657 }
1743 else 1658 else
1744 { 1659 {
1745 remove_ob (op); 1660 op->remove ();
1746 op->nrof = 0; 1661 op->nrof = 0;
1747 if (tmp) 1662 if (tmp)
1748 { 1663 {
1749 esrv_del_item (tmp->contr, op->count); 1664 esrv_del_item (tmp->contr, op->count);
1750 } 1665 }
… …
1756 1671
1757 if (i < op->nrof) 1672 if (i < op->nrof)
1758 op->nrof -= i; 1673 op->nrof -= i;
1759 else 1674 else
1760 { 1675 {
1761 remove_ob (op); 1676 op->remove ();
1762 op->nrof = 0; 1677 op->nrof = 0;
1763 } 1678 }
1764 1679
1765 /* Since we just removed op, op->above is null */ 1680 /* Since we just removed op, op->above is null */
1766 for (tmp = above; tmp != NULL; tmp = tmp->above) 1681 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1775 1690
1776 if (op->nrof) 1691 if (op->nrof)
1777 return op; 1692 return op;
1778 else 1693 else
1779 { 1694 {
1780 free_object (op); 1695 op->destroy (0);
1781 return NULL; 1696 return NULL;
1782 } 1697 }
1783} 1698}
1784 1699
1785/* 1700/*
… …
1798 op->carrying += weight; 1713 op->carrying += weight;
1799 op = op->env; 1714 op = op->env;
1800 } 1715 }
1801} 1716}
1802 1717
1718object *
1719insert_ob_in_ob (object *op, object *where)
1720{
1721 if (!where)
1722 {
1723 char *dump = dump_object (op);
1724 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1725 free (dump);
1726 return op;
1727 }
1728
1729 if (where->head)
1730 {
1731 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1732 where = where->head;
1733 }
1734
1735 return where->insert (op);
1736}
1737
1803/* 1738/*
1804 * insert_ob_in_ob(op,environment): 1739 * env->insert (op)
1805 * This function inserts the object op in the linked list 1740 * This function inserts the object op in the linked list
1806 * inside the object environment. 1741 * inside the object environment.
1807 * 1742 *
1808 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1809 * the inventory at the last position or next to other objects of the same
1810 * type.
1811 * Frank: Now sorted by type, archetype and magic!
1812 *
1813 * The function returns now pointer to inserted item, and return value can 1743 * The function returns now pointer to inserted item, and return value can
1814 * be != op, if items are merged. -Tero 1744 * be != op, if items are merged. -Tero
1815 */ 1745 */
1816 1746
1817object * 1747object *
1818insert_ob_in_ob (object *op, object *where) 1748object::insert (object *op)
1819{ 1749{
1820 object * 1750 object *tmp, *otmp;
1821 tmp, *
1822 otmp;
1823 1751
1824 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1752 if (!QUERY_FLAG (op, FLAG_REMOVED))
1825 { 1753 op->remove ();
1826 dump_object (op);
1827 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1828 return op;
1829 }
1830
1831 if (where == NULL)
1832 {
1833 dump_object (op);
1834 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1835 return op;
1836 }
1837
1838 if (where->head)
1839 {
1840 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1841 where = where->head;
1842 }
1843 1754
1844 if (op->more) 1755 if (op->more)
1845 { 1756 {
1846 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1757 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1847 return op; 1758 return op;
… …
1849 1760
1850 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1761 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1851 CLEAR_FLAG (op, FLAG_REMOVED); 1762 CLEAR_FLAG (op, FLAG_REMOVED);
1852 if (op->nrof) 1763 if (op->nrof)
1853 { 1764 {
1854 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1765 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1855 if (CAN_MERGE (tmp, op)) 1766 if (CAN_MERGE (tmp, op))
1856 { 1767 {
1857 /* return the original object and remove inserted object 1768 /* return the original object and remove inserted object
1858 (client needs the original object) */ 1769 (client needs the original object) */
1859 tmp->nrof += op->nrof; 1770 tmp->nrof += op->nrof;
1860 /* Weight handling gets pretty funky. Since we are adding to 1771 /* Weight handling gets pretty funky. Since we are adding to
1861 * tmp->nrof, we need to increase the weight. 1772 * tmp->nrof, we need to increase the weight.
1862 */ 1773 */
1863 add_weight (where, op->weight * op->nrof); 1774 add_weight (this, op->weight * op->nrof);
1864 SET_FLAG (op, FLAG_REMOVED); 1775 SET_FLAG (op, FLAG_REMOVED);
1865 free_object (op); /* free the inserted object */ 1776 op->destroy (); /* free the inserted object */
1866 op = tmp; 1777 op = tmp;
1867 remove_ob (op); /* and fix old object's links */ 1778 op->remove (); /* and fix old object's links */
1868 CLEAR_FLAG (op, FLAG_REMOVED); 1779 CLEAR_FLAG (op, FLAG_REMOVED);
1869 break; 1780 break;
1870 } 1781 }
1871 1782
1872 /* I assume combined objects have no inventory 1783 /* I assume combined objects have no inventory
1873 * We add the weight - this object could have just been removed 1784 * We add the weight - this object could have just been removed
1874 * (if it was possible to merge). calling remove_ob will subtract 1785 * (if it was possible to merge). calling remove_ob will subtract
1875 * the weight, so we need to add it in again, since we actually do 1786 * the weight, so we need to add it in again, since we actually do
1876 * the linking below 1787 * the linking below
1877 */ 1788 */
1878 add_weight (where, op->weight * op->nrof); 1789 add_weight (this, op->weight * op->nrof);
1879 } 1790 }
1880 else 1791 else
1881 add_weight (where, (op->weight + op->carrying)); 1792 add_weight (this, (op->weight + op->carrying));
1882 1793
1883 otmp = is_player_inv (where); 1794 otmp = is_player_inv (this);
1884 if (otmp && otmp->contr != NULL) 1795 if (otmp && otmp->contr)
1885 {
1886 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1796 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1887 fix_player (otmp); 1797 fix_player (otmp);
1888 }
1889 1798
1890 op->map = NULL; 1799 op->map = NULL;
1891 op->env = where; 1800 op->env = this;
1892 op->above = NULL; 1801 op->above = NULL;
1893 op->below = NULL; 1802 op->below = NULL;
1894 op->x = 0, op->y = 0; 1803 op->x = 0, op->y = 0;
1895 1804
1896 /* reset the light list and los of the players on the map */ 1805 /* reset the light list and los of the players on the map */
1897 if ((op->glow_radius != 0) && where->map) 1806 if ((op->glow_radius != 0) && map)
1898 { 1807 {
1899#ifdef DEBUG_LIGHTS 1808#ifdef DEBUG_LIGHTS
1900 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1809 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1901#endif /* DEBUG_LIGHTS */ 1810#endif /* DEBUG_LIGHTS */
1902 if (MAP_DARKNESS (where->map)) 1811 if (MAP_DARKNESS (map))
1903 update_all_los (where->map, where->x, where->y); 1812 update_all_los (map, x, y);
1904 } 1813 }
1905 1814
1906 /* Client has no idea of ordering so lets not bother ordering it here. 1815 /* Client has no idea of ordering so lets not bother ordering it here.
1907 * It sure simplifies this function... 1816 * It sure simplifies this function...
1908 */ 1817 */
1909 if (where->inv == NULL) 1818 if (!inv)
1910 where->inv = op; 1819 inv = op;
1911 else 1820 else
1912 { 1821 {
1913 op->below = where->inv; 1822 op->below = inv;
1914 op->below->above = op; 1823 op->below->above = op;
1915 where->inv = op; 1824 inv = op;
1916 } 1825 }
1826
1917 return op; 1827 return op;
1918} 1828}
1919 1829
1920/* 1830/*
1921 * Checks if any objects has a move_type that matches objects 1831 * Checks if any objects has a move_type that matches objects
… …
1939 */ 1849 */
1940 1850
1941int 1851int
1942check_move_on (object *op, object *originator) 1852check_move_on (object *op, object *originator)
1943{ 1853{
1944 object * 1854 object *tmp;
1945 tmp; 1855 maptile *m = op->map;
1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1951 x = op->x, y = op->y; 1856 int x = op->x, y = op->y;
1952 1857
1953 MoveType 1858 MoveType move_on, move_slow, move_block;
1954 move_on,
1955 move_slow,
1956 move_block;
1957 1859
1958 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1860 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959 return 0; 1861 return 0;
1960
1961 tag = op->count;
1962 1862
1963 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1863 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1964 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1864 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1965 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1865 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1966 1866
… …
2027 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1927 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2028 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1928 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2029 { 1929 {
2030 move_apply (tmp, op, originator); 1930 move_apply (tmp, op, originator);
2031 1931
2032 if (was_destroyed (op, tag)) 1932 if (op->destroyed ())
2033 return 1; 1933 return 1;
2034 1934
2035 /* what the person/creature stepped onto has moved the object 1935 /* what the person/creature stepped onto has moved the object
2036 * someplace new. Don't process any further - if we did, 1936 * someplace new. Don't process any further - if we did,
2037 * have a feeling strange problems would result. 1937 * have a feeling strange problems would result.
… …
2049 * a matching archetype at the given map and coordinates. 1949 * a matching archetype at the given map and coordinates.
2050 * The first matching object is returned, or NULL if none. 1950 * The first matching object is returned, or NULL if none.
2051 */ 1951 */
2052 1952
2053object * 1953object *
2054present_arch (const archetype *at, mapstruct *m, int x, int y) 1954present_arch (const archetype *at, maptile *m, int x, int y)
2055{ 1955{
2056 object * 1956 object *
2057 tmp; 1957 tmp;
2058 1958
2059 if (m == NULL || out_of_map (m, x, y)) 1959 if (m == NULL || out_of_map (m, x, y))
… …
2072 * a matching type variable at the given map and coordinates. 1972 * a matching type variable at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1973 * The first matching object is returned, or NULL if none.
2074 */ 1974 */
2075 1975
2076object * 1976object *
2077present (unsigned char type, mapstruct *m, int x, int y) 1977present (unsigned char type, maptile *m, int x, int y)
2078{ 1978{
2079 object * 1979 object *
2080 tmp; 1980 tmp;
2081 1981
2082 if (out_of_map (m, x, y)) 1982 if (out_of_map (m, x, y))
… …
2222 * the archetype because that isn't correct if the monster has been 2122 * the archetype because that isn't correct if the monster has been
2223 * customized, changed states, etc. 2123 * customized, changed states, etc.
2224 */ 2124 */
2225 2125
2226int 2126int
2227find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2127find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2228{ 2128{
2229 int 2129 int
2230 i, 2130 i,
2231 index = 0, flag; 2131 index = 0, flag;
2232 static int 2132 static int
… …
2253 return -1; 2153 return -1;
2254 return altern[RANDOM () % index]; 2154 return altern[RANDOM () % index];
2255} 2155}
2256 2156
2257/* 2157/*
2258 * find_first_free_spot(archetype, mapstruct, x, y) works like 2158 * find_first_free_spot(archetype, maptile, x, y) works like
2259 * find_free_spot(), but it will search max number of squares. 2159 * find_free_spot(), but it will search max number of squares.
2260 * But it will return the first available spot, not a random choice. 2160 * But it will return the first available spot, not a random choice.
2261 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2161 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2262 */ 2162 */
2263 2163
2264int 2164int
2265find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2165find_first_free_spot (const object *ob, maptile *m, int x, int y)
2266{ 2166{
2267 int 2167 int
2268 i; 2168 i;
2269 2169
2270 for (i = 0; i < SIZEOFFREE; i++) 2170 for (i = 0; i < SIZEOFFREE; i++)
… …
2334 * because we have to know what movement the thing looking to move 2234 * because we have to know what movement the thing looking to move
2335 * there is capable of. 2235 * there is capable of.
2336 */ 2236 */
2337 2237
2338int 2238int
2339find_dir (mapstruct *m, int x, int y, object *exclude) 2239find_dir (maptile *m, int x, int y, object *exclude)
2340{ 2240{
2341 int 2241 int
2342 i, 2242 i,
2343 max = SIZEOFFREE, mflags; 2243 max = SIZEOFFREE, mflags;
2344 2244
2345 sint16 nx, ny; 2245 sint16 nx, ny;
2346 object * 2246 object *
2347 tmp; 2247 tmp;
2348 mapstruct * 2248 maptile *
2349 mp; 2249 mp;
2350 2250
2351 MoveType blocked, move_type; 2251 MoveType blocked, move_type;
2352 2252
2353 if (exclude && exclude->head) 2253 if (exclude && exclude->head)
… …
2561 * Modified to be map tile aware -.MSW 2461 * Modified to be map tile aware -.MSW
2562 */ 2462 */
2563 2463
2564 2464
2565int 2465int
2566can_see_monsterP (mapstruct *m, int x, int y, int dir) 2466can_see_monsterP (maptile *m, int x, int y, int dir)
2567{ 2467{
2568 sint16 dx, dy; 2468 sint16 dx, dy;
2569 int 2469 int
2570 mflags; 2470 mflags;
2571 2471
… …
2620 * create clone from object to another 2520 * create clone from object to another
2621 */ 2521 */
2622object * 2522object *
2623object_create_clone (object *asrc) 2523object_create_clone (object *asrc)
2624{ 2524{
2625 object *
2626 dst = NULL, *tmp, *src, *part, *prev, *item; 2525 object *dst = 0, *tmp, *src, *part, *prev, *item;
2627 2526
2628 if (!asrc) 2527 if (!asrc)
2629 return NULL; 2528 return 0;
2529
2630 src = asrc; 2530 src = asrc;
2631 if (src->head) 2531 if (src->head)
2632 src = src->head; 2532 src = src->head;
2633 2533
2634 prev = NULL; 2534 prev = 0;
2635 for (part = src; part; part = part->more) 2535 for (part = src; part; part = part->more)
2636 { 2536 {
2637 tmp = get_object (); 2537 tmp = get_object ();
2638 copy_object (part, tmp); 2538 copy_object (part, tmp);
2639 tmp->x -= src->x; 2539 tmp->x -= src->x;
2640 tmp->y -= src->y; 2540 tmp->y -= src->y;
2541
2641 if (!part->head) 2542 if (!part->head)
2642 { 2543 {
2643 dst = tmp; 2544 dst = tmp;
2644 tmp->head = NULL; 2545 tmp->head = 0;
2645 } 2546 }
2646 else 2547 else
2647 { 2548 {
2648 tmp->head = dst; 2549 tmp->head = dst;
2649 } 2550 }
2551
2650 tmp->more = NULL; 2552 tmp->more = 0;
2553
2651 if (prev) 2554 if (prev)
2652 prev->more = tmp; 2555 prev->more = tmp;
2556
2653 prev = tmp; 2557 prev = tmp;
2654 } 2558 }
2655 2559
2656 /*** copy inventory ***/
2657 for (item = src->inv; item; item = item->below) 2560 for (item = src->inv; item; item = item->below)
2658 {
2659 (void) insert_ob_in_ob (object_create_clone (item), dst); 2561 insert_ob_in_ob (object_create_clone (item), dst);
2660 }
2661 2562
2662 return dst; 2563 return dst;
2663} 2564}
2664 2565
2665/* return true if the object was destroyed, 0 otherwise */
2666int
2667was_destroyed (const object *op, tag_t old_tag)
2668{
2669 /* checking for FLAG_FREED isn't necessary, but makes this function more
2670 * robust */
2671 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2672}
2673
2674/* GROS - Creates an object using a string representing its content. */ 2566/* GROS - Creates an object using a string representing its content. */
2675
2676/* Basically, we save the content of the string to a temp file, then call */ 2567/* Basically, we save the content of the string to a temp file, then call */
2677
2678/* load_object on it. I admit it is a highly inefficient way to make things, */ 2568/* load_object on it. I admit it is a highly inefficient way to make things, */
2679
2680/* but it was simple to make and allows reusing the load_object function. */ 2569/* but it was simple to make and allows reusing the load_object function. */
2681
2682/* Remember not to use load_object_str in a time-critical situation. */ 2570/* Remember not to use load_object_str in a time-critical situation. */
2683
2684/* Also remember that multiparts objects are not supported for now. */ 2571/* Also remember that multiparts objects are not supported for now. */
2685 2572
2686object * 2573object *
2687load_object_str (const char *obstr) 2574load_object_str (const char *obstr)
2688{ 2575{
2689 object * 2576 object *op;
2690 op;
2691 char
2692 filename[MAX_BUF]; 2577 char filename[MAX_BUF];
2693 2578
2694 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2579 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695 2580
2696 FILE *
2697 tempfile = fopen (filename, "w"); 2581 FILE *tempfile = fopen (filename, "w");
2698 2582
2699 if (tempfile == NULL) 2583 if (tempfile == NULL)
2700 { 2584 {
2701 LOG (llevError, "Error - Unable to access load object temp file\n"); 2585 LOG (llevError, "Error - Unable to access load object temp file\n");
2702 return NULL; 2586 return NULL;
… …
2723 * returns NULL if no match. 2607 * returns NULL if no match.
2724 */ 2608 */
2725object * 2609object *
2726find_obj_by_type_subtype (const object *who, int type, int subtype) 2610find_obj_by_type_subtype (const object *who, int type, int subtype)
2727{ 2611{
2728 object * 2612 object *tmp;
2729 tmp;
2730 2613
2731 for (tmp = who->inv; tmp; tmp = tmp->below) 2614 for (tmp = who->inv; tmp; tmp = tmp->below)
2732 if (tmp->type == type && tmp->subtype == subtype) 2615 if (tmp->type == type && tmp->subtype == subtype)
2733 return tmp; 2616 return tmp;
2734 2617
… …
2742 * do the desired thing. 2625 * do the desired thing.
2743 */ 2626 */
2744key_value * 2627key_value *
2745get_ob_key_link (const object *ob, const char *key) 2628get_ob_key_link (const object *ob, const char *key)
2746{ 2629{
2747 key_value * 2630 key_value *link;
2748 link;
2749 2631
2750 for (link = ob->key_values; link != NULL; link = link->next) 2632 for (link = ob->key_values; link != NULL; link = link->next)
2751 {
2752 if (link->key == key) 2633 if (link->key == key)
2753 {
2754 return link; 2634 return link;
2755 }
2756 }
2757 2635
2758 return NULL; 2636 return NULL;
2759} 2637}
2760 2638
2761/* 2639/*

Diff Legend

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