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.44 by root, Thu Sep 14 17:29:27 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}
… …
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))
… …
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 */
… …
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
1043 // clear those pointers that likely might have circular references to us 986 // clear those pointers that likely might have circular references to us
1044 owner = 0; 987 owner = 0;
1045 enemy = 0; 988 enemy = 0;
1046 attacked_by = 0; 989 attacked_by = 0;
1047 990
991 // only relevant for players(?), but make sure of it anyways
992 contr = 0;
993
1048 /* Remove object from the active list */ 994 /* Remove object from the active list */
1049 speed = 0; 995 speed = 0;
1050 update_ob_speed (this); 996 update_ob_speed (this);
1051 997
1052 unlink (); 998 unlink ();
… …
1056 1002
1057/* 1003/*
1058 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1059 * 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)).
1060 */ 1006 */
1061
1062void 1007void
1063sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1064{ 1009{
1065 while (op != NULL) 1010 while (op != NULL)
1066 { 1011 {
1067 if (op->type == CONTAINER) 1012 if (op->type == CONTAINER)
1068 {
1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070 } 1014
1071 op->carrying -= weight; 1015 op->carrying -= weight;
1072 op = op->env; 1016 op = op->env;
1073 } 1017 }
1074} 1018}
1075 1019
… …
1079 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1080 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1081 * the previous environment. 1025 * the previous environment.
1082 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1083 */ 1027 */
1084
1085void 1028void
1086remove_ob (object *op) 1029object::remove ()
1087{ 1030{
1031 object *tmp, *last = 0;
1088 object * 1032 object *otmp;
1089 tmp, *
1090 last = NULL;
1091 object *
1092 otmp;
1093 1033
1094 tag_t
1095 tag;
1096 int
1097 check_walk_off; 1034 int check_walk_off;
1098 mapstruct *
1099 m;
1100 1035
1101 sint16
1102 x,
1103 y;
1104
1105 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1106 return; 1037 return;
1107 1038
1108 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1109 1040
1110 if (op->more != NULL) 1041 if (more)
1111 remove_ob (op->more); 1042 more->remove ();
1112 1043
1113 /* 1044 /*
1114 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1115 * inventory. 1046 * inventory.
1116 */ 1047 */
1117 if (op->env != NULL) 1048 if (env)
1118 { 1049 {
1119 if (op->nrof) 1050 if (nrof)
1120 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1121 else 1052 else
1122 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1123 1054
1124 /* 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
1125 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1126 * to save cpu time. 1057 * to save cpu time.
1127 */ 1058 */
1128 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))
1129 fix_player (otmp); 1060 fix_player (otmp);
1130 1061
1131 if (op->above != NULL) 1062 if (above != NULL)
1132 op->above->below = op->below; 1063 above->below = below;
1133 else 1064 else
1134 op->env->inv = op->below; 1065 env->inv = below;
1135 1066
1136 if (op->below != NULL) 1067 if (below != NULL)
1137 op->below->above = op->above; 1068 below->above = above;
1138 1069
1139 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1140 * 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
1141 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1142 */ 1073 */
1143 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1144 op->map = op->env->map; 1075 map = env->map;
1145 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1146 op->env = NULL; 1077 env = 0;
1147 } 1078 }
1148 else if (op->map) 1079 else if (map)
1149 { 1080 {
1150 x = op->x;
1151 y = op->y;
1152 m = get_map_from_coord (op->map, &x, &y);
1153
1154 if (!m)
1155 {
1156 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1157 op->map->path, op->x, op->y);
1158 /* in old days, we used to set x and y to 0 and continue.
1159 * it seems if we get into this case, something is probablye
1160 * screwed up and should be fixed.
1161 */
1162 abort ();
1163 }
1164
1165 if (op->map != m)
1166 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1167 op->map->path, m->path, op->x, op->y, x, y);
1168
1169 /* 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
1170 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1171 */ 1083 */
1172 1084
1173 /* link the object above us */ 1085 /* link the object above us */
1174 if (op->above) 1086 if (above)
1175 op->above->below = op->below; 1087 above->below = below;
1176 else 1088 else
1177 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 */
1178 1090
1179 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1180 if (op->below) 1092 if (below)
1181 op->below->above = op->above; 1093 below->above = above;
1182 else 1094 else
1183 { 1095 {
1184 /* 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
1185 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1186 * evident 1098 * evident
1187 */ 1099 */
1188 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1189 { 1101 {
1190 dump_object (op); 1102 char *dump = dump_object (this);
1191 LOG (llevError, 1103 LOG (llevError,
1192 "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);
1193 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1194 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1195 } 1109 }
1196 1110
1197 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1198 } 1112 }
1199 1113
1200 op->above = 0; 1114 above = 0;
1201 op->below = 0; 1115 below = 0;
1202 1116
1203 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1204 return; 1118 return;
1205 1119
1206 tag = op->count;
1207 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1208 1121
1209 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)
1210 { 1123 {
1211 /* 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
1212 * being removed. 1125 * being removed.
1213 */ 1126 */
1214 1127
1215 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1216 { 1129 {
1217 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1218 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1219 * appropriately. 1132 * appropriately.
1220 */ 1133 */
1221 if (tmp->container == op) 1134 if (tmp->container == this)
1222 { 1135 {
1223 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1224 tmp->container = NULL; 1137 tmp->container = 0;
1225 } 1138 }
1226 1139
1227 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1228 } 1141 }
1229 1142
1230 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1231 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))
1232 { 1147 {
1233 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1234 1149
1235 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1236 {
1237 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 ());
1238 }
1239 } 1152 }
1240 1153
1241 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242 1155
1243 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1244 tmp->above = NULL; 1157 tmp->above = 0;
1245 1158
1246 last = tmp; 1159 last = tmp;
1247 } 1160 }
1248 1161
1249 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1250 if (last == NULL) 1163 if (!last)
1251 { 1164 {
1252 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1253 * 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
1254 * 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
1255 * be correct anyways. 1168 * be correct anyways.
1256 */ 1169 */
1257 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1258 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1259 } 1172 }
1260 else 1173 else
1261 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1262 1175
1263 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1264 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1265 } 1178 }
1266} 1179}
1267 1180
1268/* 1181/*
1269 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1296 free_object (op); 1209 free_object (op);
1297 return top; 1210 return top;
1298 } 1211 }
1299 } 1212 }
1300 1213
1301 return NULL; 1214 return 0;
1302} 1215}
1303 1216
1304/* 1217/*
1305 * 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
1306 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1307 */ 1220 */
1308object * 1221object *
1309insert_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)
1310{ 1223{
1311 object *tmp; 1224 object *tmp;
1312 1225
1313 if (op->head) 1226 if (op->head)
1314 op = op->head; 1227 op = op->head;
… …
1342 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1343 * just 'op' otherwise 1256 * just 'op' otherwise
1344 */ 1257 */
1345 1258
1346object * 1259object *
1347insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1348{ 1261{
1349 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1350 sint16 x, y; 1263 sint16 x, y;
1351 1264
1352 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
… …
1355 return NULL; 1268 return NULL;
1356 } 1269 }
1357 1270
1358 if (m == NULL) 1271 if (m == NULL)
1359 { 1272 {
1360 dump_object (op); 1273 char *dump = dump_object (op);
1361 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);
1362 return op; 1276 return op;
1363 } 1277 }
1364 1278
1365 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1366 { 1280 {
1367 dump_object (op); 1281 char *dump = dump_object (op);
1368 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);
1369#ifdef MANY_CORES 1283#ifdef MANY_CORES
1370 /* 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
1371 * 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
1372 * improperly inserted. 1286 * improperly inserted.
1373 */ 1287 */
1374 abort (); 1288 abort ();
1375#endif 1289#endif
1290 free (dump);
1376 return op; 1291 return op;
1377 } 1292 }
1378 1293
1379 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1380 { 1295 {
1381 dump_object (op); 1296 char *dump = dump_object (op);
1382 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);
1383 return op; 1299 return op;
1384 } 1300 }
1385 1301
1386 if (op->more != NULL) 1302 if (op->more != NULL)
1387 { 1303 {
… …
1633 remove_ob (tmp); 1549 remove_ob (tmp);
1634 free_object (tmp); 1550 free_object (tmp);
1635 } 1551 }
1636 } 1552 }
1637 1553
1638 tmp1 = arch_to_object (find_archetype (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1639 1555
1640 tmp1->x = op->x; 1556 tmp1->x = op->x;
1641 tmp1->y = op->y; 1557 tmp1->y = op->y;
1642 insert_ob_in_map (tmp1, op->map, op, 0); 1558 insert_ob_in_map (tmp1, op->map, op, 0);
1643} 1559}
… …
1801 op->carrying += weight; 1717 op->carrying += weight;
1802 op = op->env; 1718 op = op->env;
1803 } 1719 }
1804} 1720}
1805 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
1806/* 1742/*
1807 * insert_ob_in_ob(op,environment): 1743 * env->insert (op)
1808 * This function inserts the object op in the linked list 1744 * This function inserts the object op in the linked list
1809 * inside the object environment. 1745 * inside the object environment.
1810 * 1746 *
1811 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1812 * the inventory at the last position or next to other objects of the same
1813 * type.
1814 * Frank: Now sorted by type, archetype and magic!
1815 *
1816 * 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
1817 * be != op, if items are merged. -Tero 1748 * be != op, if items are merged. -Tero
1818 */ 1749 */
1819 1750
1820object * 1751object *
1821insert_ob_in_ob (object *op, object *where) 1752object::insert (object *op)
1822{ 1753{
1823 object * 1754 object *tmp, *otmp;
1824 tmp, *
1825 otmp;
1826 1755
1827 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1756 if (!QUERY_FLAG (op, FLAG_REMOVED))
1828 { 1757 op->remove ();
1829 dump_object (op);
1830 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1831 return op;
1832 }
1833
1834 if (where == NULL)
1835 {
1836 dump_object (op);
1837 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1838 return op;
1839 }
1840
1841 if (where->head)
1842 {
1843 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1844 where = where->head;
1845 }
1846 1758
1847 if (op->more) 1759 if (op->more)
1848 { 1760 {
1849 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);
1850 return op; 1762 return op;
… …
1852 1764
1853 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1854 CLEAR_FLAG (op, FLAG_REMOVED); 1766 CLEAR_FLAG (op, FLAG_REMOVED);
1855 if (op->nrof) 1767 if (op->nrof)
1856 { 1768 {
1857 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1769 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1858 if (CAN_MERGE (tmp, op)) 1770 if (CAN_MERGE (tmp, op))
1859 { 1771 {
1860 /* return the original object and remove inserted object 1772 /* return the original object and remove inserted object
1861 (client needs the original object) */ 1773 (client needs the original object) */
1862 tmp->nrof += op->nrof; 1774 tmp->nrof += op->nrof;
1863 /* Weight handling gets pretty funky. Since we are adding to 1775 /* Weight handling gets pretty funky. Since we are adding to
1864 * tmp->nrof, we need to increase the weight. 1776 * tmp->nrof, we need to increase the weight.
1865 */ 1777 */
1866 add_weight (where, op->weight * op->nrof); 1778 add_weight (this, op->weight * op->nrof);
1867 SET_FLAG (op, FLAG_REMOVED); 1779 SET_FLAG (op, FLAG_REMOVED);
1868 free_object (op); /* free the inserted object */ 1780 op->destroy (); /* free the inserted object */
1869 op = tmp; 1781 op = tmp;
1870 remove_ob (op); /* and fix old object's links */ 1782 op->remove (); /* and fix old object's links */
1871 CLEAR_FLAG (op, FLAG_REMOVED); 1783 CLEAR_FLAG (op, FLAG_REMOVED);
1872 break; 1784 break;
1873 } 1785 }
1874 1786
1875 /* I assume combined objects have no inventory 1787 /* I assume combined objects have no inventory
1876 * We add the weight - this object could have just been removed 1788 * We add the weight - this object could have just been removed
1877 * (if it was possible to merge). calling remove_ob will subtract 1789 * (if it was possible to merge). calling remove_ob will subtract
1878 * 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
1879 * the linking below 1791 * the linking below
1880 */ 1792 */
1881 add_weight (where, op->weight * op->nrof); 1793 add_weight (this, op->weight * op->nrof);
1882 } 1794 }
1883 else 1795 else
1884 add_weight (where, (op->weight + op->carrying)); 1796 add_weight (this, (op->weight + op->carrying));
1885 1797
1886 otmp = is_player_inv (where); 1798 otmp = is_player_inv (this);
1887 if (otmp && otmp->contr != NULL) 1799 if (otmp && otmp->contr)
1888 {
1889 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1800 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1890 fix_player (otmp); 1801 fix_player (otmp);
1891 }
1892 1802
1893 op->map = NULL; 1803 op->map = NULL;
1894 op->env = where; 1804 op->env = this;
1895 op->above = NULL; 1805 op->above = NULL;
1896 op->below = NULL; 1806 op->below = NULL;
1897 op->x = 0, op->y = 0; 1807 op->x = 0, op->y = 0;
1898 1808
1899 /* 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 */
1900 if ((op->glow_radius != 0) && where->map) 1810 if ((op->glow_radius != 0) && map)
1901 { 1811 {
1902#ifdef DEBUG_LIGHTS 1812#ifdef DEBUG_LIGHTS
1903 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);
1904#endif /* DEBUG_LIGHTS */ 1814#endif /* DEBUG_LIGHTS */
1905 if (MAP_DARKNESS (where->map)) 1815 if (MAP_DARKNESS (map))
1906 update_all_los (where->map, where->x, where->y); 1816 update_all_los (map, x, y);
1907 } 1817 }
1908 1818
1909 /* 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.
1910 * It sure simplifies this function... 1820 * It sure simplifies this function...
1911 */ 1821 */
1912 if (where->inv == NULL) 1822 if (!inv)
1913 where->inv = op; 1823 inv = op;
1914 else 1824 else
1915 { 1825 {
1916 op->below = where->inv; 1826 op->below = inv;
1917 op->below->above = op; 1827 op->below->above = op;
1918 where->inv = op; 1828 inv = op;
1919 } 1829 }
1830
1920 return op; 1831 return op;
1921} 1832}
1922 1833
1923/* 1834/*
1924 * Checks if any objects has a move_type that matches objects 1835 * Checks if any objects has a move_type that matches objects
… …
1942 */ 1853 */
1943 1854
1944int 1855int
1945check_move_on (object *op, object *originator) 1856check_move_on (object *op, object *originator)
1946{ 1857{
1947 object * 1858 object *tmp;
1948 tmp; 1859 maptile *m = op->map;
1949 tag_t
1950 tag;
1951 mapstruct *
1952 m = op->map;
1953 int
1954 x = op->x, y = op->y; 1860 int x = op->x, y = op->y;
1955 1861
1956 MoveType 1862 MoveType move_on, move_slow, move_block;
1957 move_on,
1958 move_slow,
1959 move_block;
1960 1863
1961 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1864 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962 return 0; 1865 return 0;
1963
1964 tag = op->count;
1965 1866
1966 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);
1967 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);
1968 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);
1969 1870
… …
2030 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1931 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2031 ((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))
2032 { 1933 {
2033 move_apply (tmp, op, originator); 1934 move_apply (tmp, op, originator);
2034 1935
2035 if (was_destroyed (op, tag)) 1936 if (op->destroyed ())
2036 return 1; 1937 return 1;
2037 1938
2038 /* what the person/creature stepped onto has moved the object 1939 /* what the person/creature stepped onto has moved the object
2039 * someplace new. Don't process any further - if we did, 1940 * someplace new. Don't process any further - if we did,
2040 * have a feeling strange problems would result. 1941 * have a feeling strange problems would result.
… …
2052 * a matching archetype at the given map and coordinates. 1953 * a matching archetype at the given map and coordinates.
2053 * The first matching object is returned, or NULL if none. 1954 * The first matching object is returned, or NULL if none.
2054 */ 1955 */
2055 1956
2056object * 1957object *
2057present_arch (const archetype *at, mapstruct *m, int x, int y) 1958present_arch (const archetype *at, maptile *m, int x, int y)
2058{ 1959{
2059 object * 1960 object *
2060 tmp; 1961 tmp;
2061 1962
2062 if (m == NULL || out_of_map (m, x, y)) 1963 if (m == NULL || out_of_map (m, x, y))
… …
2075 * a matching type variable at the given map and coordinates. 1976 * a matching type variable at the given map and coordinates.
2076 * The first matching object is returned, or NULL if none. 1977 * The first matching object is returned, or NULL if none.
2077 */ 1978 */
2078 1979
2079object * 1980object *
2080present (unsigned char type, mapstruct *m, int x, int y) 1981present (unsigned char type, maptile *m, int x, int y)
2081{ 1982{
2082 object * 1983 object *
2083 tmp; 1984 tmp;
2084 1985
2085 if (out_of_map (m, x, y)) 1986 if (out_of_map (m, x, y))
… …
2225 * 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
2226 * customized, changed states, etc. 2127 * customized, changed states, etc.
2227 */ 2128 */
2228 2129
2229int 2130int
2230find_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)
2231{ 2132{
2232 int 2133 int
2233 i, 2134 i,
2234 index = 0, flag; 2135 index = 0, flag;
2235 static int 2136 static int
… …
2256 return -1; 2157 return -1;
2257 return altern[RANDOM () % index]; 2158 return altern[RANDOM () % index];
2258} 2159}
2259 2160
2260/* 2161/*
2261 * find_first_free_spot(archetype, mapstruct, x, y) works like 2162 * find_first_free_spot(archetype, maptile, x, y) works like
2262 * find_free_spot(), but it will search max number of squares. 2163 * find_free_spot(), but it will search max number of squares.
2263 * 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.
2264 * 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.
2265 */ 2166 */
2266 2167
2267int 2168int
2268find_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)
2269{ 2170{
2270 int 2171 int
2271 i; 2172 i;
2272 2173
2273 for (i = 0; i < SIZEOFFREE; i++) 2174 for (i = 0; i < SIZEOFFREE; i++)
… …
2337 * 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
2338 * there is capable of. 2239 * there is capable of.
2339 */ 2240 */
2340 2241
2341int 2242int
2342find_dir (mapstruct *m, int x, int y, object *exclude) 2243find_dir (maptile *m, int x, int y, object *exclude)
2343{ 2244{
2344 int 2245 int
2345 i, 2246 i,
2346 max = SIZEOFFREE, mflags; 2247 max = SIZEOFFREE, mflags;
2347 2248
2348 sint16 nx, ny; 2249 sint16 nx, ny;
2349 object * 2250 object *
2350 tmp; 2251 tmp;
2351 mapstruct * 2252 maptile *
2352 mp; 2253 mp;
2353 2254
2354 MoveType blocked, move_type; 2255 MoveType blocked, move_type;
2355 2256
2356 if (exclude && exclude->head) 2257 if (exclude && exclude->head)
… …
2564 * Modified to be map tile aware -.MSW 2465 * Modified to be map tile aware -.MSW
2565 */ 2466 */
2566 2467
2567 2468
2568int 2469int
2569can_see_monsterP (mapstruct *m, int x, int y, int dir) 2470can_see_monsterP (maptile *m, int x, int y, int dir)
2570{ 2471{
2571 sint16 dx, dy; 2472 sint16 dx, dy;
2572 int 2473 int
2573 mflags; 2474 mflags;
2574 2475
… …
2623 * create clone from object to another 2524 * create clone from object to another
2624 */ 2525 */
2625object * 2526object *
2626object_create_clone (object *asrc) 2527object_create_clone (object *asrc)
2627{ 2528{
2628 object *
2629 dst = NULL, *tmp, *src, *part, *prev, *item; 2529 object *dst = 0, *tmp, *src, *part, *prev, *item;
2630 2530
2631 if (!asrc) 2531 if (!asrc)
2632 return NULL; 2532 return 0;
2533
2633 src = asrc; 2534 src = asrc;
2634 if (src->head) 2535 if (src->head)
2635 src = src->head; 2536 src = src->head;
2636 2537
2637 prev = NULL; 2538 prev = 0;
2638 for (part = src; part; part = part->more) 2539 for (part = src; part; part = part->more)
2639 { 2540 {
2640 tmp = get_object (); 2541 tmp = get_object ();
2641 copy_object (part, tmp); 2542 copy_object (part, tmp);
2642 tmp->x -= src->x; 2543 tmp->x -= src->x;
2643 tmp->y -= src->y; 2544 tmp->y -= src->y;
2545
2644 if (!part->head) 2546 if (!part->head)
2645 { 2547 {
2646 dst = tmp; 2548 dst = tmp;
2647 tmp->head = NULL; 2549 tmp->head = 0;
2648 } 2550 }
2649 else 2551 else
2650 { 2552 {
2651 tmp->head = dst; 2553 tmp->head = dst;
2652 } 2554 }
2555
2653 tmp->more = NULL; 2556 tmp->more = 0;
2557
2654 if (prev) 2558 if (prev)
2655 prev->more = tmp; 2559 prev->more = tmp;
2560
2656 prev = tmp; 2561 prev = tmp;
2657 } 2562 }
2658 2563
2659 /*** copy inventory ***/
2660 for (item = src->inv; item; item = item->below) 2564 for (item = src->inv; item; item = item->below)
2661 {
2662 (void) insert_ob_in_ob (object_create_clone (item), dst); 2565 insert_ob_in_ob (object_create_clone (item), dst);
2663 }
2664 2566
2665 return dst; 2567 return dst;
2666} 2568}
2667 2569
2668/* return true if the object was destroyed, 0 otherwise */
2669int
2670was_destroyed (const object *op, tag_t old_tag)
2671{
2672 /* checking for FLAG_FREED isn't necessary, but makes this function more
2673 * robust */
2674 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2675}
2676
2677/* GROS - Creates an object using a string representing its content. */ 2570/* GROS - Creates an object using a string representing its content. */
2678
2679/* 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 */
2680
2681/* 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, */
2682
2683/* 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. */
2684
2685/* 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. */
2686
2687/* Also remember that multiparts objects are not supported for now. */ 2575/* Also remember that multiparts objects are not supported for now. */
2688 2576
2689object * 2577object *
2690load_object_str (const char *obstr) 2578load_object_str (const char *obstr)
2691{ 2579{
2692 object * 2580 object *op;
2693 op;
2694 char
2695 filename[MAX_BUF]; 2581 char filename[MAX_BUF];
2696 2582
2697 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2583 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698 2584
2699 FILE *
2700 tempfile = fopen (filename, "w"); 2585 FILE *tempfile = fopen (filename, "w");
2701 2586
2702 if (tempfile == NULL) 2587 if (tempfile == NULL)
2703 { 2588 {
2704 LOG (llevError, "Error - Unable to access load object temp file\n"); 2589 LOG (llevError, "Error - Unable to access load object temp file\n");
2705 return NULL; 2590 return NULL;
… …
2726 * returns NULL if no match. 2611 * returns NULL if no match.
2727 */ 2612 */
2728object * 2613object *
2729find_obj_by_type_subtype (const object *who, int type, int subtype) 2614find_obj_by_type_subtype (const object *who, int type, int subtype)
2730{ 2615{
2731 object * 2616 object *tmp;
2732 tmp;
2733 2617
2734 for (tmp = who->inv; tmp; tmp = tmp->below) 2618 for (tmp = who->inv; tmp; tmp = tmp->below)
2735 if (tmp->type == type && tmp->subtype == subtype) 2619 if (tmp->type == type && tmp->subtype == subtype)
2736 return tmp; 2620 return tmp;
2737 2621
… …
2745 * do the desired thing. 2629 * do the desired thing.
2746 */ 2630 */
2747key_value * 2631key_value *
2748get_ob_key_link (const object *ob, const char *key) 2632get_ob_key_link (const object *ob, const char *key)
2749{ 2633{
2750 key_value * 2634 key_value *link;
2751 link;
2752 2635
2753 for (link = ob->key_values; link != NULL; link = link->next) 2636 for (link = ob->key_values; link != NULL; link = link->next)
2754 {
2755 if (link->key == key) 2637 if (link->key == key)
2756 {
2757 return link; 2638 return link;
2758 }
2759 }
2760 2639
2761 return NULL; 2640 return NULL;
2762} 2641}
2763 2642
2764/* 2643/*

Diff Legend

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