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.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.61 by root, Mon Dec 11 21:32:16 2006 UTC

… …
104 _exit (1); 104 _exit (1);
105 } 105 }
106 106
107 uuid.seq = uid; 107 uuid.seq = uid;
108 write_uuid (); 108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 110 fclose (fp);
111} 111}
112 112
113UUID 113UUID
114gen_uuid () 114gen_uuid ()
… …
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 375 * Some error messages.
376 * 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.
377 */ 377 */
378 378
379void 379char *
380dump_object2 (object *op)
381{
382 errmsg[0] = 0;
383 return;
384 //TODO//D#d#
385#if 0
386 char *cp;
387
388/* object *tmp;*/
389
390 if (op->arch != NULL)
391 {
392 strcat (errmsg, "arch ");
393 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
394 strcat (errmsg, "\n");
395 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
396 strcat (errmsg, cp);
397# if 0
398 /* Don't dump player diffs - they are too long, mostly meaningless, and
399 * will overflow the buffer.
400 * Changed so that we don't dump inventory either. This may
401 * also overflow the buffer.
402 */
403 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
404 strcat (errmsg, cp);
405 for (tmp = op->inv; tmp; tmp = tmp->below)
406 dump_object2 (tmp);
407# endif
408 strcat (errmsg, "end\n");
409 }
410 else
411 {
412 strcat (errmsg, "Object ");
413 if (op->name == NULL)
414 strcat (errmsg, "(null)");
415 else
416 strcat (errmsg, op->name);
417 strcat (errmsg, "\n");
418# if 0
419 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
420 strcat (errmsg, cp);
421 for (tmp = op->inv; tmp; tmp = tmp->below)
422 dump_object2 (tmp);
423# endif
424 strcat (errmsg, "end\n");
425 }
426#endif
427}
428
429/*
430 * Dumps an object. Returns output in the static global errmsg array.
431 */
432
433void
434dump_object (object *op) 380dump_object (object *op)
435{ 381{
436 if (op == NULL) 382 if (!op)
437 { 383 return strdup ("[NULLOBJ]");
438 strcpy (errmsg, "[NULL pointer]");
439 return;
440 }
441 errmsg[0] = '\0';
442 dump_object2 (op);
443}
444 384
445void 385 object_freezer freezer;
446dump_all_objects (void) 386 save_object (freezer, op, 3);
447{ 387 return freezer.as_string ();
448 object *op;
449
450 for (op = object::first; op != NULL; op = op->next)
451 {
452 dump_object (op);
453 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
454 }
455} 388}
456 389
457/* 390/*
458 * 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
459 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
479 */ 412 */
480 413
481object * 414object *
482find_object (tag_t i) 415find_object (tag_t i)
483{ 416{
484 object *op;
485
486 for (op = object::first; op != NULL; op = op->next) 417 for (object *op = object::first; op; op = op->next)
487 if (op->count == i) 418 if (op->count == i)
488 break; 419 return op;
420
489 return op; 421 return 0;
490} 422}
491 423
492/* 424/*
493 * 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.
494 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
621 553
622 op2->clone (op); 554 op2->clone (op);
623 555
624 if (is_freed) 556 if (is_freed)
625 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
626 if (is_removed) 559 if (is_removed)
627 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
628 561
629 if (op2->speed < 0) 562 if (op2->speed < 0)
630 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
872 update_now = 1; 805 update_now = 1;
873 806
874 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
875 update_now = 1; 808 update_now = 1;
876 } 809 }
810
877 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
878 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
879 * that is being removed. 813 * that is being removed.
880 */ 814 */
881 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
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);
… …
946 object::first = 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 == object::first) 877 if (this == object::first)
955 object::first = 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;
… …
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 {
… …
1078 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1079 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1080 * the previous environment. 1025 * the previous environment.
1081 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1082 */ 1027 */
1083
1084void 1028void
1085remove_ob (object *op) 1029object::remove ()
1086{ 1030{
1087 object *tmp, *last = 0; 1031 object *tmp, *last = 0;
1088 object *otmp; 1032 object *otmp;
1089 1033
1090 tag_t tag;
1091 int check_walk_off; 1034 int check_walk_off;
1092 mapstruct *m;
1093 1035
1094 sint16 x, y;
1095
1096 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1097 return; 1037 return;
1098 1038
1099 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1100 1040
1101 if (op->more != NULL) 1041 if (more)
1102 remove_ob (op->more); 1042 more->remove ();
1103 1043
1104 /* 1044 /*
1105 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1106 * inventory. 1046 * inventory.
1107 */ 1047 */
1108 if (op->env != NULL) 1048 if (env)
1109 { 1049 {
1110 if (op->nrof) 1050 if (nrof)
1111 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1112 else 1052 else
1113 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1114 1054
1115 /* 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
1116 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1117 * to save cpu time. 1057 * to save cpu time.
1118 */ 1058 */
1119 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))
1120 fix_player (otmp); 1060 fix_player (otmp);
1121 1061
1122 if (op->above != NULL) 1062 if (above != NULL)
1123 op->above->below = op->below; 1063 above->below = below;
1124 else 1064 else
1125 op->env->inv = op->below; 1065 env->inv = below;
1126 1066
1127 if (op->below != NULL) 1067 if (below != NULL)
1128 op->below->above = op->above; 1068 below->above = above;
1129 1069
1130 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1131 * 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
1132 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1133 */ 1073 */
1134 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1135 op->map = op->env->map; 1075 map = env->map;
1136 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1137 op->env = NULL; 1077 env = 0;
1138 } 1078 }
1139 else if (op->map) 1079 else if (map)
1140 { 1080 {
1141 x = op->x;
1142 y = op->y;
1143 m = get_map_from_coord (op->map, &x, &y);
1144
1145 if (!m)
1146 {
1147 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1148 op->map->path, op->x, op->y);
1149 /* in old days, we used to set x and y to 0 and continue.
1150 * it seems if we get into this case, something is probablye
1151 * screwed up and should be fixed.
1152 */
1153 abort ();
1154 }
1155
1156 if (op->map != m)
1157 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1158 op->map->path, m->path, op->x, op->y, x, y);
1159
1160 /* 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
1161 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1162 */ 1083 */
1163 1084
1164 /* link the object above us */ 1085 /* link the object above us */
1165 if (op->above) 1086 if (above)
1166 op->above->below = op->below; 1087 above->below = below;
1167 else 1088 else
1168 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 */
1169 1090
1170 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1171 if (op->below) 1092 if (below)
1172 op->below->above = op->above; 1093 below->above = above;
1173 else 1094 else
1174 { 1095 {
1175 /* 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
1176 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1177 * evident 1098 * evident
1178 */ 1099 */
1179 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1180 { 1101 {
1181 dump_object (op); 1102 char *dump = dump_object (this);
1182 LOG (llevError, 1103 LOG (llevError,
1183 "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);
1184 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1185 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1186 } 1109 }
1187 1110
1188 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1189 } 1112 }
1190 1113
1191 op->above = 0; 1114 above = 0;
1192 op->below = 0; 1115 below = 0;
1193 1116
1194 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1195 return; 1118 return;
1196 1119
1197 tag = op->count;
1198 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1199 1121
1200 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)
1201 { 1123 {
1202 /* 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
1203 * being removed. 1125 * being removed.
1204 */ 1126 */
1205 1127
1206 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1207 { 1129 {
1208 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1209 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1210 * appropriately. 1132 * appropriately.
1211 */ 1133 */
1212 if (tmp->container == op) 1134 if (tmp->container == this)
1213 { 1135 {
1214 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1215 tmp->container = NULL; 1137 tmp->container = 0;
1216 } 1138 }
1217 1139
1218 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1219 } 1141 }
1220 1142
1221 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1222 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))
1223 { 1147 {
1224 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1225 1149
1226 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1227 {
1228 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 ());
1229 }
1230 } 1152 }
1231 1153
1232 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1233 1155
1234 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1235 tmp->above = NULL; 1157 tmp->above = 0;
1236 1158
1237 last = tmp; 1159 last = tmp;
1238 } 1160 }
1239 1161
1240 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1241 if (last == NULL) 1163 if (!last)
1242 { 1164 {
1243 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1244 * 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
1245 * 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
1246 * be correct anyways. 1168 * be correct anyways.
1247 */ 1169 */
1248 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1249 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1250 } 1172 }
1251 else 1173 else
1252 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1253 1175
1254 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1255 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1256 } 1178 }
1257} 1179}
1258 1180
1259/* 1181/*
1260 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1295/* 1217/*
1296 * 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
1297 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1298 */ 1220 */
1299object * 1221object *
1300insert_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)
1301{ 1223{
1302 object *tmp; 1224 object *tmp;
1303 1225
1304 if (op->head) 1226 if (op->head)
1305 op = op->head; 1227 op = op->head;
… …
1333 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1334 * just 'op' otherwise 1256 * just 'op' otherwise
1335 */ 1257 */
1336 1258
1337object * 1259object *
1338insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1339{ 1261{
1340 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1341 sint16 x, y; 1263 sint16 x, y;
1342 1264
1343 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
… …
1346 return NULL; 1268 return NULL;
1347 } 1269 }
1348 1270
1349 if (m == NULL) 1271 if (m == NULL)
1350 { 1272 {
1351 dump_object (op); 1273 char *dump = dump_object (op);
1352 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);
1353 return op; 1276 return op;
1354 } 1277 }
1355 1278
1356 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1357 { 1280 {
1358 dump_object (op); 1281 char *dump = dump_object (op);
1359 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);
1360#ifdef MANY_CORES 1283#ifdef MANY_CORES
1361 /* 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
1362 * 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
1363 * improperly inserted. 1286 * improperly inserted.
1364 */ 1287 */
1365 abort (); 1288 abort ();
1366#endif 1289#endif
1290 free (dump);
1367 return op; 1291 return op;
1368 } 1292 }
1369 1293
1370 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1371 { 1295 {
1372 dump_object (op); 1296 char *dump = dump_object (op);
1373 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);
1374 return op; 1299 return op;
1375 } 1300 }
1376 1301
1377 if (op->more != NULL) 1302 if (op->more != NULL)
1378 { 1303 {
… …
1792 op->carrying += weight; 1717 op->carrying += weight;
1793 op = op->env; 1718 op = op->env;
1794 } 1719 }
1795} 1720}
1796 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
1797/* 1742/*
1798 * insert_ob_in_ob(op,environment): 1743 * env->insert (op)
1799 * This function inserts the object op in the linked list 1744 * This function inserts the object op in the linked list
1800 * inside the object environment. 1745 * inside the object environment.
1801 * 1746 *
1802 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1803 * the inventory at the last position or next to other objects of the same
1804 * type.
1805 * Frank: Now sorted by type, archetype and magic!
1806 *
1807 * 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
1808 * be != op, if items are merged. -Tero 1748 * be != op, if items are merged. -Tero
1809 */ 1749 */
1810 1750
1811object * 1751object *
1812insert_ob_in_ob (object *op, object *where) 1752object::insert (object *op)
1813{ 1753{
1814 object * 1754 object *tmp, *otmp;
1815 tmp, *
1816 otmp;
1817 1755
1818 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1756 if (!QUERY_FLAG (op, FLAG_REMOVED))
1819 { 1757 op->remove ();
1820 dump_object (op);
1821 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1822 return op;
1823 }
1824
1825 if (where == NULL)
1826 {
1827 dump_object (op);
1828 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1829 return op;
1830 }
1831
1832 if (where->head)
1833 {
1834 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1835 where = where->head;
1836 }
1837 1758
1838 if (op->more) 1759 if (op->more)
1839 { 1760 {
1840 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);
1841 return op; 1762 return op;
… …
1843 1764
1844 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1845 CLEAR_FLAG (op, FLAG_REMOVED); 1766 CLEAR_FLAG (op, FLAG_REMOVED);
1846 if (op->nrof) 1767 if (op->nrof)
1847 { 1768 {
1848 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1769 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1849 if (CAN_MERGE (tmp, op)) 1770 if (CAN_MERGE (tmp, op))
1850 { 1771 {
1851 /* return the original object and remove inserted object 1772 /* return the original object and remove inserted object
1852 (client needs the original object) */ 1773 (client needs the original object) */
1853 tmp->nrof += op->nrof; 1774 tmp->nrof += op->nrof;
1854 /* Weight handling gets pretty funky. Since we are adding to 1775 /* Weight handling gets pretty funky. Since we are adding to
1855 * tmp->nrof, we need to increase the weight. 1776 * tmp->nrof, we need to increase the weight.
1856 */ 1777 */
1857 add_weight (where, op->weight * op->nrof); 1778 add_weight (this, op->weight * op->nrof);
1858 SET_FLAG (op, FLAG_REMOVED); 1779 SET_FLAG (op, FLAG_REMOVED);
1859 free_object (op); /* free the inserted object */ 1780 op->destroy (); /* free the inserted object */
1860 op = tmp; 1781 op = tmp;
1861 remove_ob (op); /* and fix old object's links */ 1782 op->remove (); /* and fix old object's links */
1862 CLEAR_FLAG (op, FLAG_REMOVED); 1783 CLEAR_FLAG (op, FLAG_REMOVED);
1863 break; 1784 break;
1864 } 1785 }
1865 1786
1866 /* I assume combined objects have no inventory 1787 /* I assume combined objects have no inventory
1867 * We add the weight - this object could have just been removed 1788 * We add the weight - this object could have just been removed
1868 * (if it was possible to merge). calling remove_ob will subtract 1789 * (if it was possible to merge). calling remove_ob will subtract
1869 * 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
1870 * the linking below 1791 * the linking below
1871 */ 1792 */
1872 add_weight (where, op->weight * op->nrof); 1793 add_weight (this, op->weight * op->nrof);
1873 } 1794 }
1874 else 1795 else
1875 add_weight (where, (op->weight + op->carrying)); 1796 add_weight (this, (op->weight + op->carrying));
1876 1797
1877 otmp = is_player_inv (where); 1798 otmp = is_player_inv (this);
1878 if (otmp && otmp->contr != NULL) 1799 if (otmp && otmp->contr)
1879 {
1880 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1800 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1881 fix_player (otmp); 1801 fix_player (otmp);
1882 }
1883 1802
1884 op->map = NULL; 1803 op->map = NULL;
1885 op->env = where; 1804 op->env = this;
1886 op->above = NULL; 1805 op->above = NULL;
1887 op->below = NULL; 1806 op->below = NULL;
1888 op->x = 0, op->y = 0; 1807 op->x = 0, op->y = 0;
1889 1808
1890 /* 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 */
1891 if ((op->glow_radius != 0) && where->map) 1810 if ((op->glow_radius != 0) && map)
1892 { 1811 {
1893#ifdef DEBUG_LIGHTS 1812#ifdef DEBUG_LIGHTS
1894 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);
1895#endif /* DEBUG_LIGHTS */ 1814#endif /* DEBUG_LIGHTS */
1896 if (MAP_DARKNESS (where->map)) 1815 if (MAP_DARKNESS (map))
1897 update_all_los (where->map, where->x, where->y); 1816 update_all_los (map, x, y);
1898 } 1817 }
1899 1818
1900 /* 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.
1901 * It sure simplifies this function... 1820 * It sure simplifies this function...
1902 */ 1821 */
1903 if (where->inv == NULL) 1822 if (!inv)
1904 where->inv = op; 1823 inv = op;
1905 else 1824 else
1906 { 1825 {
1907 op->below = where->inv; 1826 op->below = inv;
1908 op->below->above = op; 1827 op->below->above = op;
1909 where->inv = op; 1828 inv = op;
1910 } 1829 }
1830
1911 return op; 1831 return op;
1912} 1832}
1913 1833
1914/* 1834/*
1915 * Checks if any objects has a move_type that matches objects 1835 * Checks if any objects has a move_type that matches objects
… …
1933 */ 1853 */
1934 1854
1935int 1855int
1936check_move_on (object *op, object *originator) 1856check_move_on (object *op, object *originator)
1937{ 1857{
1938 object * 1858 object *tmp;
1939 tmp; 1859 maptile *m = op->map;
1940 tag_t
1941 tag;
1942 mapstruct *
1943 m = op->map;
1944 int
1945 x = op->x, y = op->y; 1860 int x = op->x, y = op->y;
1946 1861
1947 MoveType 1862 MoveType move_on, move_slow, move_block;
1948 move_on,
1949 move_slow,
1950 move_block;
1951 1863
1952 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1864 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1953 return 0; 1865 return 0;
1954
1955 tag = op->count;
1956 1866
1957 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);
1958 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);
1959 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);
1960 1870
… …
2021 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1931 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2022 ((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))
2023 { 1933 {
2024 move_apply (tmp, op, originator); 1934 move_apply (tmp, op, originator);
2025 1935
2026 if (was_destroyed (op, tag)) 1936 if (op->destroyed ())
2027 return 1; 1937 return 1;
2028 1938
2029 /* what the person/creature stepped onto has moved the object 1939 /* what the person/creature stepped onto has moved the object
2030 * someplace new. Don't process any further - if we did, 1940 * someplace new. Don't process any further - if we did,
2031 * have a feeling strange problems would result. 1941 * have a feeling strange problems would result.
… …
2043 * a matching archetype at the given map and coordinates. 1953 * a matching archetype at the given map and coordinates.
2044 * The first matching object is returned, or NULL if none. 1954 * The first matching object is returned, or NULL if none.
2045 */ 1955 */
2046 1956
2047object * 1957object *
2048present_arch (const archetype *at, mapstruct *m, int x, int y) 1958present_arch (const archetype *at, maptile *m, int x, int y)
2049{ 1959{
2050 object * 1960 object *
2051 tmp; 1961 tmp;
2052 1962
2053 if (m == NULL || out_of_map (m, x, y)) 1963 if (m == NULL || out_of_map (m, x, y))
… …
2066 * a matching type variable at the given map and coordinates. 1976 * a matching type variable at the given map and coordinates.
2067 * The first matching object is returned, or NULL if none. 1977 * The first matching object is returned, or NULL if none.
2068 */ 1978 */
2069 1979
2070object * 1980object *
2071present (unsigned char type, mapstruct *m, int x, int y) 1981present (unsigned char type, maptile *m, int x, int y)
2072{ 1982{
2073 object * 1983 object *
2074 tmp; 1984 tmp;
2075 1985
2076 if (out_of_map (m, x, y)) 1986 if (out_of_map (m, x, y))
… …
2216 * 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
2217 * customized, changed states, etc. 2127 * customized, changed states, etc.
2218 */ 2128 */
2219 2129
2220int 2130int
2221find_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)
2222{ 2132{
2223 int 2133 int
2224 i, 2134 i,
2225 index = 0, flag; 2135 index = 0, flag;
2226 static int 2136 static int
… …
2247 return -1; 2157 return -1;
2248 return altern[RANDOM () % index]; 2158 return altern[RANDOM () % index];
2249} 2159}
2250 2160
2251/* 2161/*
2252 * find_first_free_spot(archetype, mapstruct, x, y) works like 2162 * find_first_free_spot(archetype, maptile, x, y) works like
2253 * find_free_spot(), but it will search max number of squares. 2163 * find_free_spot(), but it will search max number of squares.
2254 * 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.
2255 * 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.
2256 */ 2166 */
2257 2167
2258int 2168int
2259find_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)
2260{ 2170{
2261 int 2171 int
2262 i; 2172 i;
2263 2173
2264 for (i = 0; i < SIZEOFFREE; i++) 2174 for (i = 0; i < SIZEOFFREE; i++)
… …
2328 * 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
2329 * there is capable of. 2239 * there is capable of.
2330 */ 2240 */
2331 2241
2332int 2242int
2333find_dir (mapstruct *m, int x, int y, object *exclude) 2243find_dir (maptile *m, int x, int y, object *exclude)
2334{ 2244{
2335 int 2245 int
2336 i, 2246 i,
2337 max = SIZEOFFREE, mflags; 2247 max = SIZEOFFREE, mflags;
2338 2248
2339 sint16 nx, ny; 2249 sint16 nx, ny;
2340 object * 2250 object *
2341 tmp; 2251 tmp;
2342 mapstruct * 2252 maptile *
2343 mp; 2253 mp;
2344 2254
2345 MoveType blocked, move_type; 2255 MoveType blocked, move_type;
2346 2256
2347 if (exclude && exclude->head) 2257 if (exclude && exclude->head)
… …
2555 * Modified to be map tile aware -.MSW 2465 * Modified to be map tile aware -.MSW
2556 */ 2466 */
2557 2467
2558 2468
2559int 2469int
2560can_see_monsterP (mapstruct *m, int x, int y, int dir) 2470can_see_monsterP (maptile *m, int x, int y, int dir)
2561{ 2471{
2562 sint16 dx, dy; 2472 sint16 dx, dy;
2563 int 2473 int
2564 mflags; 2474 mflags;
2565 2475
… …
2645 if (prev) 2555 if (prev)
2646 prev->more = tmp; 2556 prev->more = tmp;
2647 prev = tmp; 2557 prev = tmp;
2648 } 2558 }
2649 2559
2650 /*** copy inventory ***/
2651 for (item = src->inv; item; item = item->below) 2560 for (item = src->inv; item; item = item->below)
2652 {
2653 (void) insert_ob_in_ob (object_create_clone (item), dst); 2561 insert_ob_in_ob (object_create_clone (item), dst);
2654 }
2655 2562
2656 return dst; 2563 return dst;
2657} 2564}
2658 2565
2659/* return true if the object was destroyed, 0 otherwise */
2660int
2661was_destroyed (const object *op, tag_t old_tag)
2662{
2663 /* checking for FLAG_FREED isn't necessary, but makes this function more
2664 * robust */
2665 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2666}
2667
2668/* GROS - Creates an object using a string representing its content. */ 2566/* GROS - Creates an object using a string representing its content. */
2669
2670/* 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 */
2671
2672/* 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, */
2673
2674/* 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. */
2675
2676/* 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. */
2677
2678/* Also remember that multiparts objects are not supported for now. */ 2571/* Also remember that multiparts objects are not supported for now. */
2679 2572
2680object * 2573object *
2681load_object_str (const char *obstr) 2574load_object_str (const char *obstr)
2682{ 2575{
2683 object * 2576 object *op;
2684 op;
2685 char
2686 filename[MAX_BUF]; 2577 char filename[MAX_BUF];
2687 2578
2688 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2579 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2689 2580
2690 FILE *
2691 tempfile = fopen (filename, "w"); 2581 FILE *tempfile = fopen (filename, "w");
2692 2582
2693 if (tempfile == NULL) 2583 if (tempfile == NULL)
2694 { 2584 {
2695 LOG (llevError, "Error - Unable to access load object temp file\n"); 2585 LOG (llevError, "Error - Unable to access load object temp file\n");
2696 return NULL; 2586 return NULL;
… …
2717 * returns NULL if no match. 2607 * returns NULL if no match.
2718 */ 2608 */
2719object * 2609object *
2720find_obj_by_type_subtype (const object *who, int type, int subtype) 2610find_obj_by_type_subtype (const object *who, int type, int subtype)
2721{ 2611{
2722 object * 2612 object *tmp;
2723 tmp;
2724 2613
2725 for (tmp = who->inv; tmp; tmp = tmp->below) 2614 for (tmp = who->inv; tmp; tmp = tmp->below)
2726 if (tmp->type == type && tmp->subtype == subtype) 2615 if (tmp->type == type && tmp->subtype == subtype)
2727 return tmp; 2616 return tmp;
2728 2617
… …
2736 * do the desired thing. 2625 * do the desired thing.
2737 */ 2626 */
2738key_value * 2627key_value *
2739get_ob_key_link (const object *ob, const char *key) 2628get_ob_key_link (const object *ob, const char *key)
2740{ 2629{
2741 key_value * 2630 key_value *link;
2742 link;
2743 2631
2744 for (link = ob->key_values; link != NULL; link = link->next) 2632 for (link = ob->key_values; link != NULL; link = link->next)
2745 {
2746 if (link->key == key) 2633 if (link->key == key)
2747 {
2748 return link; 2634 return link;
2749 }
2750 }
2751 2635
2752 return NULL; 2636 return NULL;
2753} 2637}
2754 2638
2755/* 2639/*

Diff Legend

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