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.49 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC

… …
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.
… …
908 else 839 else
909 { 840 {
910 delete *i; 841 delete *i;
911 mortals.erase (i); 842 mortals.erase (i);
912 } 843 }
913
914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals)//D
917 {
918 lastmortals = mortals.size ();//D
919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
921} 844}
922 845
923object::object () 846object::object ()
924{ 847{
925 SET_FLAG (this, FLAG_REMOVED); 848 SET_FLAG (this, FLAG_REMOVED);
… …
972 * it from the list of used objects, and puts it on the list of 895 * it from the list of used objects, and puts it on the list of
973 * free objects. The IS_FREED() flag is set in the object. 896 * free objects. The IS_FREED() flag is set in the object.
974 * The object must have been removed by remove_ob() first for 897 * The object must have been removed by remove_ob() first for
975 * this function to succeed. 898 * this function to succeed.
976 * 899 *
977 * If free_inventory is set, free inventory as well. Else drop items in 900 * If destroy_inventory is set, free inventory as well. Else drop items in
978 * inventory to the ground. 901 * inventory to the ground.
979 */ 902 */
980void object::free (bool free_inventory) 903void object::destroy (bool destroy_inventory)
981{ 904{
982 if (QUERY_FLAG (this, FLAG_FREED)) 905 if (QUERY_FLAG (this, FLAG_FREED))
983 return; 906 return;
984 907
985 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 908 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
990 913
991 SET_FLAG (this, FLAG_FREED); 914 SET_FLAG (this, FLAG_FREED);
992 915
993 if (more) 916 if (more)
994 { 917 {
995 more->free (free_inventory); 918 more->destroy (destroy_inventory);
996 more = 0; 919 more = 0;
997 } 920 }
998 921
999 if (inv) 922 if (inv)
1000 { 923 {
1001 /* Only if the space blocks everything do we not process - 924 /* Only if the space blocks everything do we not process -
1002 * if some form of movement is allowed, let objects 925 * if some form of movement is allowed, let objects
1003 * drop on that space. 926 * drop on that space.
1004 */ 927 */
1005 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 928 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1006 { 929 {
1007 object *op = inv; 930 object *op = inv;
1008 931
1009 while (op) 932 while (op)
1010 { 933 {
1011 object *tmp = op->below; 934 object *tmp = op->below;
1012 op->free (free_inventory); 935 op->destroy (destroy_inventory);
1013 op = tmp; 936 op = tmp;
1014 } 937 }
1015 } 938 }
1016 else 939 else
1017 { /* Put objects in inventory onto this space */ 940 { /* Put objects in inventory onto this space */
… …
1036 op = tmp; 959 op = tmp;
1037 } 960 }
1038 } 961 }
1039 } 962 }
1040 963
964 // hack to ensure that freed objects still have a valid map
965 {
966 static maptile *freed_map; // freed objects are moved here to avoid crashes
967
968 if (!freed_map)
969 {
970 freed_map = new maptile;
971
972 freed_map->name = "/internal/freed_objects_map";
973 freed_map->width = 3;
974 freed_map->height = 3;
975
976 freed_map->allocate ();
977 }
978
979 map = freed_map;
980 x = 1;
981 y = 1;
982 }
983
1041 // clear those pointers that likely might have circular references to us 984 // clear those pointers that likely might have circular references to us
1042 owner = 0; 985 owner = 0;
1043 enemy = 0; 986 enemy = 0;
1044 attacked_by = 0; 987 attacked_by = 0;
988
989 // only relevant for players(?), but make sure of it anyways
990 contr = 0;
1045 991
1046 /* Remove object from the active list */ 992 /* Remove object from the active list */
1047 speed = 0; 993 speed = 0;
1048 update_ob_speed (this); 994 update_ob_speed (this);
1049 995
… …
1173 * use translated coordinates in case some oddness with map tiling is 1119 * use translated coordinates in case some oddness with map tiling is
1174 * evident 1120 * evident
1175 */ 1121 */
1176 if (GET_MAP_OB (m, x, y) != op) 1122 if (GET_MAP_OB (m, x, y) != op)
1177 { 1123 {
1178 dump_object (op); 1124 char *dump = dump_object (op);
1179 LOG (llevError, 1125 LOG (llevError,
1180 "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); 1126 "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);
1127 free (dump);
1181 dump_object (GET_MAP_OB (m, x, y)); 1128 dump = dump_object (GET_MAP_OB (m, x, y));
1182 LOG (llevError, "%s\n", errmsg); 1129 LOG (llevError, "%s\n", dump);
1130 free (dump);
1183 } 1131 }
1184 1132
1185 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1133 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1186 } 1134 }
1187 1135
… …
1213 1161
1214 tmp->contr->socket.update_look = 1; 1162 tmp->contr->socket.update_look = 1;
1215 } 1163 }
1216 1164
1217 /* See if player moving off should effect something */ 1165 /* See if player moving off should effect something */
1218 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1166 if (check_walk_off
1167 && ((op->move_type & tmp->move_off)
1168 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1219 { 1169 {
1220 move_apply (tmp, op, NULL); 1170 move_apply (tmp, op, NULL);
1221 1171
1222 if (op->destroyed ()); 1172 if (op->destroyed ())
1223 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1173 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1224 } 1174 }
1225 1175
1226 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1176 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1227 1177
1228 if (tmp->above == tmp) 1178 if (tmp->above == tmp)
… …
1340 return NULL; 1290 return NULL;
1341 } 1291 }
1342 1292
1343 if (m == NULL) 1293 if (m == NULL)
1344 { 1294 {
1345 dump_object (op); 1295 char *dump = dump_object (op);
1346 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1296 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1297 free (dump);
1347 return op; 1298 return op;
1348 } 1299 }
1349 1300
1350 if (out_of_map (m, op->x, op->y)) 1301 if (out_of_map (m, op->x, op->y))
1351 { 1302 {
1352 dump_object (op); 1303 char *dump = dump_object (op);
1353 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1304 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1354#ifdef MANY_CORES 1305#ifdef MANY_CORES
1355 /* Better to catch this here, as otherwise the next use of this object 1306 /* Better to catch this here, as otherwise the next use of this object
1356 * is likely to cause a crash. Better to find out where it is getting 1307 * is likely to cause a crash. Better to find out where it is getting
1357 * improperly inserted. 1308 * improperly inserted.
1358 */ 1309 */
1359 abort (); 1310 abort ();
1360#endif 1311#endif
1312 free (dump);
1361 return op; 1313 return op;
1362 } 1314 }
1363 1315
1364 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1316 if (!QUERY_FLAG (op, FLAG_REMOVED))
1365 { 1317 {
1366 dump_object (op); 1318 char *dump = dump_object (op);
1367 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1319 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1320 free (dump);
1368 return op; 1321 return op;
1369 } 1322 }
1370 1323
1371 if (op->more != NULL) 1324 if (op->more != NULL)
1372 { 1325 {
… …
1809 tmp, * 1762 tmp, *
1810 otmp; 1763 otmp;
1811 1764
1812 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1765 if (!QUERY_FLAG (op, FLAG_REMOVED))
1813 { 1766 {
1814 dump_object (op); 1767 char *dump = dump_object (op);
1815 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1768 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1769 free (dump);
1816 return op; 1770 return op;
1817 } 1771 }
1818 1772
1819 if (where == NULL) 1773 if (where == NULL)
1820 { 1774 {
1821 dump_object (op); 1775 char *dump = dump_object (op);
1822 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1776 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1777 free (dump);
1823 return op; 1778 return op;
1824 } 1779 }
1825 1780
1826 if (where->head) 1781 if (where->head)
1827 { 1782 {

Diff Legend

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