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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 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 %s\n", 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;
489 420
490 return op; 421 return 0;
491} 422}
492 423
493/* 424/*
494 * 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.
495 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
622 553
623 op2->clone (op); 554 op2->clone (op);
624 555
625 if (is_freed) 556 if (is_freed)
626 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
627 if (is_removed) 559 if (is_removed)
628 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
629 561
630 if (op2->speed < 0) 562 if (op2->speed < 0)
631 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
873 update_now = 1; 805 update_now = 1;
874 806
875 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
876 update_now = 1; 808 update_now = 1;
877 } 809 }
810
878 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
879 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
880 * that is being removed. 813 * that is being removed.
881 */ 814 */
882 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
908 else 841 else
909 { 842 {
910 delete *i; 843 delete *i;
911 mortals.erase (i); 844 mortals.erase (i);
912 } 845 }
913
914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals && lastmortals > 100)//D
917 {
918 lastmortals = mortals.size ();//D
919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
921} 846}
922 847
923object::object () 848object::object ()
924{ 849{
925 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
… …
984 909
985 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
986 remove_friendly_object (this); 911 remove_friendly_object (this);
987 912
988 if (!QUERY_FLAG (this, FLAG_REMOVED)) 913 if (!QUERY_FLAG (this, FLAG_REMOVED))
989 remove_ob (this); 914 remove ();
990 915
991 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
992 917
993 if (more) 918 if (more)
994 { 919 {
… …
1019 944
1020 while (op) 945 while (op)
1021 { 946 {
1022 object *tmp = op->below; 947 object *tmp = op->below;
1023 948
1024 remove_ob (op); 949 op->remove ();
1025 950
1026 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 951 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1027 || 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))
1028 free_object (op); 953 op->destroy (0);
1029 else 954 else
1030 { 955 {
1031 op->x = x; 956 op->x = x;
1032 op->y = y; 957 op->y = y;
1033 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 */
… …
1036 op = tmp; 961 op = tmp;
1037 } 962 }
1038 } 963 }
1039 } 964 }
1040 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
1041 // clear those pointers that likely might have circular references to us 986 // clear those pointers that likely might have circular references to us
1042 owner = 0; 987 owner = 0;
1043 enemy = 0; 988 enemy = 0;
1044 attacked_by = 0; 989 attacked_by = 0;
1045 990
… …
1057 1002
1058/* 1003/*
1059 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1060 * 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)).
1061 */ 1006 */
1062
1063void 1007void
1064sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1065{ 1009{
1066 while (op != NULL) 1010 while (op != NULL)
1067 { 1011 {
… …
1071 op->carrying -= weight; 1015 op->carrying -= weight;
1072 op = op->env; 1016 op = op->env;
1073 } 1017 }
1074} 1018}
1075 1019
1076/* remove_ob(op): 1020/* op->remove ():
1077 * 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
1078 * 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
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{
1088 object *tmp, *last = 0; 1031 object *tmp, *last = 0;
1089 object *otmp; 1032 object *otmp;
1090 1033
1091 int check_walk_off; 1034 int check_walk_off;
1092 maptile *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 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1198 1121
1199 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)
1200 { 1123 {
1201 /* 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
1202 * being removed. 1125 * being removed.
1203 */ 1126 */
1204 1127
1205 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1206 { 1129 {
1207 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1208 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1209 * appropriately. 1132 * appropriately.
1210 */ 1133 */
1211 if (tmp->container == op) 1134 if (tmp->container == this)
1212 { 1135 {
1213 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1214 tmp->container = NULL; 1137 tmp->container = 0;
1215 } 1138 }
1216 1139
1217 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1218 } 1141 }
1219 1142
1220 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1221 if (check_walk_off 1144 if (check_walk_off
1222 && ((op->move_type & tmp->move_off) 1145 && ((move_type & tmp->move_off)
1223 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1146 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224 { 1147 {
1225 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1226 1149
1227 if (op->destroyed ()) 1150 if (destroyed ())
1228 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1151 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1229 } 1152 }
1230 1153
1231 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1232 1155
1233 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1234 tmp->above = NULL; 1157 tmp->above = 0;
1235 1158
1236 last = tmp; 1159 last = tmp;
1237 } 1160 }
1238 1161
1239 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1240 if (last == NULL) 1163 if (!last)
1241 { 1164 {
1242 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1243 * 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
1244 * 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
1245 * be correct anyways. 1168 * be correct anyways.
1246 */ 1169 */
1247 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1248 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1249 } 1172 }
1250 else 1173 else
1251 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1252 1175
1253 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1254 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1255 } 1178 }
1256} 1179}
1257 1180
1258/* 1181/*
1259 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1280 { 1203 {
1281 top->nrof += op->nrof; 1204 top->nrof += op->nrof;
1282 1205
1283/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1284 op->weight = 0; /* Don't want any adjustements now */ 1207 op->weight = 0; /* Don't want any adjustements now */
1285 remove_ob (op); 1208 op->remove ();
1286 free_object (op); 1209 op->destroy (0);
1287 return top; 1210 return top;
1288 } 1211 }
1289 } 1212 }
1290 1213
1291 return 0; 1214 return 0;
… …
1345 return NULL; 1268 return NULL;
1346 } 1269 }
1347 1270
1348 if (m == NULL) 1271 if (m == NULL)
1349 { 1272 {
1350 dump_object (op); 1273 char *dump = dump_object (op);
1351 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);
1352 return op; 1276 return op;
1353 } 1277 }
1354 1278
1355 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1356 { 1280 {
1357 dump_object (op); 1281 char *dump = dump_object (op);
1358 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);
1359#ifdef MANY_CORES 1283#ifdef MANY_CORES
1360 /* 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
1361 * 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
1362 * improperly inserted. 1286 * improperly inserted.
1363 */ 1287 */
1364 abort (); 1288 abort ();
1365#endif 1289#endif
1290 free (dump);
1366 return op; 1291 return op;
1367 } 1292 }
1368 1293
1369 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1370 { 1295 {
1371 dump_object (op); 1296 char *dump = dump_object (op);
1372 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);
1373 return op; 1299 return op;
1374 } 1300 }
1375 1301
1376 if (op->more != NULL) 1302 if (op->more != NULL)
1377 { 1303 {
… …
1418 if (op->nrof && !(flag & INS_NO_MERGE)) 1344 if (op->nrof && !(flag & INS_NO_MERGE))
1419 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)
1420 if (CAN_MERGE (op, tmp)) 1346 if (CAN_MERGE (op, tmp))
1421 { 1347 {
1422 op->nrof += tmp->nrof; 1348 op->nrof += tmp->nrof;
1423 remove_ob (tmp); 1349 tmp->remove ();
1424 free_object (tmp); 1350 tmp->destroy (0);
1425 } 1351 }
1426 1352
1427 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 */
1428 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1429 1355
… …
1618 1544
1619 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)
1620 { 1546 {
1621 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1622 { 1548 {
1623 remove_ob (tmp); 1549 tmp->remove ();
1624 free_object (tmp); 1550 tmp->destroy (0);
1625 } 1551 }
1626 } 1552 }
1627 1553
1628 tmp1 = arch_to_object (archetype::find (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1629 1555
… …
1655 } 1581 }
1656 1582
1657 newob = object_create_clone (orig_ob); 1583 newob = object_create_clone (orig_ob);
1658 1584
1659 if ((orig_ob->nrof -= nr) < 1) 1585 if ((orig_ob->nrof -= nr) < 1)
1660 { 1586 orig_ob->destroy (1);
1661 if (!is_removed)
1662 remove_ob (orig_ob);
1663 free_object2 (orig_ob, 1);
1664 }
1665 else if (!is_removed) 1587 else if (!is_removed)
1666 { 1588 {
1667 if (orig_ob->env != NULL) 1589 if (orig_ob->env != NULL)
1668 sub_weight (orig_ob->env, orig_ob->weight * nr); 1590 sub_weight (orig_ob->env, orig_ob->weight * nr);
1669 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)
… …
1733 esrv_send_item (tmp, op); 1655 esrv_send_item (tmp, op);
1734 } 1656 }
1735 } 1657 }
1736 else 1658 else
1737 { 1659 {
1738 remove_ob (op); 1660 op->remove ();
1739 op->nrof = 0; 1661 op->nrof = 0;
1740 if (tmp) 1662 if (tmp)
1741 { 1663 {
1742 esrv_del_item (tmp->contr, op->count); 1664 esrv_del_item (tmp->contr, op->count);
1743 } 1665 }
… …
1749 1671
1750 if (i < op->nrof) 1672 if (i < op->nrof)
1751 op->nrof -= i; 1673 op->nrof -= i;
1752 else 1674 else
1753 { 1675 {
1754 remove_ob (op); 1676 op->remove ();
1755 op->nrof = 0; 1677 op->nrof = 0;
1756 } 1678 }
1757 1679
1758 /* Since we just removed op, op->above is null */ 1680 /* Since we just removed op, op->above is null */
1759 for (tmp = above; tmp != NULL; tmp = tmp->above) 1681 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1768 1690
1769 if (op->nrof) 1691 if (op->nrof)
1770 return op; 1692 return op;
1771 else 1693 else
1772 { 1694 {
1773 free_object (op); 1695 op->destroy (0);
1774 return NULL; 1696 return NULL;
1775 } 1697 }
1776} 1698}
1777 1699
1778/* 1700/*
… …
1791 op->carrying += weight; 1713 op->carrying += weight;
1792 op = op->env; 1714 op = op->env;
1793 } 1715 }
1794} 1716}
1795 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
1796/* 1738/*
1797 * insert_ob_in_ob(op,environment): 1739 * env->insert (op)
1798 * This function inserts the object op in the linked list 1740 * This function inserts the object op in the linked list
1799 * inside the object environment. 1741 * inside the object environment.
1800 * 1742 *
1801 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1802 * the inventory at the last position or next to other objects of the same
1803 * type.
1804 * Frank: Now sorted by type, archetype and magic!
1805 *
1806 * 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
1807 * be != op, if items are merged. -Tero 1744 * be != op, if items are merged. -Tero
1808 */ 1745 */
1809 1746
1810object * 1747object *
1811insert_ob_in_ob (object *op, object *where) 1748object::insert (object *op)
1812{ 1749{
1813 object * 1750 object *tmp, *otmp;
1814 tmp, *
1815 otmp;
1816 1751
1817 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1752 if (!QUERY_FLAG (op, FLAG_REMOVED))
1818 { 1753 op->remove ();
1819 dump_object (op);
1820 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1821 return op;
1822 }
1823
1824 if (where == NULL)
1825 {
1826 dump_object (op);
1827 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1828 return op;
1829 }
1830
1831 if (where->head)
1832 {
1833 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1834 where = where->head;
1835 }
1836 1754
1837 if (op->more) 1755 if (op->more)
1838 { 1756 {
1839 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);
1840 return op; 1758 return op;
… …
1842 1760
1843 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1761 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1844 CLEAR_FLAG (op, FLAG_REMOVED); 1762 CLEAR_FLAG (op, FLAG_REMOVED);
1845 if (op->nrof) 1763 if (op->nrof)
1846 { 1764 {
1847 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1765 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1848 if (CAN_MERGE (tmp, op)) 1766 if (CAN_MERGE (tmp, op))
1849 { 1767 {
1850 /* return the original object and remove inserted object 1768 /* return the original object and remove inserted object
1851 (client needs the original object) */ 1769 (client needs the original object) */
1852 tmp->nrof += op->nrof; 1770 tmp->nrof += op->nrof;
1853 /* Weight handling gets pretty funky. Since we are adding to 1771 /* Weight handling gets pretty funky. Since we are adding to
1854 * tmp->nrof, we need to increase the weight. 1772 * tmp->nrof, we need to increase the weight.
1855 */ 1773 */
1856 add_weight (where, op->weight * op->nrof); 1774 add_weight (this, op->weight * op->nrof);
1857 SET_FLAG (op, FLAG_REMOVED); 1775 SET_FLAG (op, FLAG_REMOVED);
1858 free_object (op); /* free the inserted object */ 1776 op->destroy (); /* free the inserted object */
1859 op = tmp; 1777 op = tmp;
1860 remove_ob (op); /* and fix old object's links */ 1778 op->remove (); /* and fix old object's links */
1861 CLEAR_FLAG (op, FLAG_REMOVED); 1779 CLEAR_FLAG (op, FLAG_REMOVED);
1862 break; 1780 break;
1863 } 1781 }
1864 1782
1865 /* I assume combined objects have no inventory 1783 /* I assume combined objects have no inventory
1866 * We add the weight - this object could have just been removed 1784 * We add the weight - this object could have just been removed
1867 * (if it was possible to merge). calling remove_ob will subtract 1785 * (if it was possible to merge). calling remove_ob will subtract
1868 * 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
1869 * the linking below 1787 * the linking below
1870 */ 1788 */
1871 add_weight (where, op->weight * op->nrof); 1789 add_weight (this, op->weight * op->nrof);
1872 } 1790 }
1873 else 1791 else
1874 add_weight (where, (op->weight + op->carrying)); 1792 add_weight (this, (op->weight + op->carrying));
1875 1793
1876 otmp = is_player_inv (where); 1794 otmp = is_player_inv (this);
1877 if (otmp && otmp->contr != NULL) 1795 if (otmp && otmp->contr)
1878 {
1879 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1796 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1880 fix_player (otmp); 1797 fix_player (otmp);
1881 }
1882 1798
1883 op->map = NULL; 1799 op->map = NULL;
1884 op->env = where; 1800 op->env = this;
1885 op->above = NULL; 1801 op->above = NULL;
1886 op->below = NULL; 1802 op->below = NULL;
1887 op->x = 0, op->y = 0; 1803 op->x = 0, op->y = 0;
1888 1804
1889 /* 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 */
1890 if ((op->glow_radius != 0) && where->map) 1806 if ((op->glow_radius != 0) && map)
1891 { 1807 {
1892#ifdef DEBUG_LIGHTS 1808#ifdef DEBUG_LIGHTS
1893 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);
1894#endif /* DEBUG_LIGHTS */ 1810#endif /* DEBUG_LIGHTS */
1895 if (MAP_DARKNESS (where->map)) 1811 if (MAP_DARKNESS (map))
1896 update_all_los (where->map, where->x, where->y); 1812 update_all_los (map, x, y);
1897 } 1813 }
1898 1814
1899 /* 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.
1900 * It sure simplifies this function... 1816 * It sure simplifies this function...
1901 */ 1817 */
1902 if (where->inv == NULL) 1818 if (!inv)
1903 where->inv = op; 1819 inv = op;
1904 else 1820 else
1905 { 1821 {
1906 op->below = where->inv; 1822 op->below = inv;
1907 op->below->above = op; 1823 op->below->above = op;
1908 where->inv = op; 1824 inv = op;
1909 } 1825 }
1826
1910 return op; 1827 return op;
1911} 1828}
1912 1829
1913/* 1830/*
1914 * Checks if any objects has a move_type that matches objects 1831 * Checks if any objects has a move_type that matches objects
… …
2603 * create clone from object to another 2520 * create clone from object to another
2604 */ 2521 */
2605object * 2522object *
2606object_create_clone (object *asrc) 2523object_create_clone (object *asrc)
2607{ 2524{
2608 object *
2609 dst = NULL, *tmp, *src, *part, *prev, *item; 2525 object *dst = 0, *tmp, *src, *part, *prev, *item;
2610 2526
2611 if (!asrc) 2527 if (!asrc)
2612 return NULL; 2528 return 0;
2529
2613 src = asrc; 2530 src = asrc;
2614 if (src->head) 2531 if (src->head)
2615 src = src->head; 2532 src = src->head;
2616 2533
2617 prev = NULL; 2534 prev = 0;
2618 for (part = src; part; part = part->more) 2535 for (part = src; part; part = part->more)
2619 { 2536 {
2620 tmp = get_object (); 2537 tmp = get_object ();
2621 copy_object (part, tmp); 2538 copy_object (part, tmp);
2622 tmp->x -= src->x; 2539 tmp->x -= src->x;
2623 tmp->y -= src->y; 2540 tmp->y -= src->y;
2541
2624 if (!part->head) 2542 if (!part->head)
2625 { 2543 {
2626 dst = tmp; 2544 dst = tmp;
2627 tmp->head = NULL; 2545 tmp->head = 0;
2628 } 2546 }
2629 else 2547 else
2630 { 2548 {
2631 tmp->head = dst; 2549 tmp->head = dst;
2632 } 2550 }
2551
2633 tmp->more = NULL; 2552 tmp->more = 0;
2553
2634 if (prev) 2554 if (prev)
2635 prev->more = tmp; 2555 prev->more = tmp;
2556
2636 prev = tmp; 2557 prev = tmp;
2637 } 2558 }
2638 2559
2639 for (item = src->inv; item; item = item->below) 2560 for (item = src->inv; item; item = item->below)
2640 insert_ob_in_ob (object_create_clone (item), dst); 2561 insert_ob_in_ob (object_create_clone (item), dst);

Diff Legend

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