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.55 by root, Sun Dec 3 00:41:33 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.
… …
988 if (!QUERY_FLAG (this, FLAG_REMOVED)) 919 if (!QUERY_FLAG (this, FLAG_REMOVED))
989 remove_ob (this); 920 remove_ob (this);
990 921
991 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
992 923
924 // hack to ensure that freed objects still have a valid map
925 {
926 static maptile *freed_map; // freed objects are moved here to avoid crashes
927
928 if (!freed_map)
929 {
930 freed_map = get_empty_map (3, 3);
931 freed_map->name = "freed objects map";
932 allocate_map (freed_map);
933 }
934
935 map = freed_map;
936 x = 1;
937 y = 1;
938 }
939
993 if (more) 940 if (more)
994 { 941 {
995 more->destroy (destroy_inventory); 942 more->destroy (destroy_inventory);
996 more = 0; 943 more = 0;
997 } 944 }
… …
1176 * use translated coordinates in case some oddness with map tiling is 1123 * use translated coordinates in case some oddness with map tiling is
1177 * evident 1124 * evident
1178 */ 1125 */
1179 if (GET_MAP_OB (m, x, y) != op) 1126 if (GET_MAP_OB (m, x, y) != op)
1180 { 1127 {
1181 dump_object (op); 1128 char *dump = dump_object (op);
1182 LOG (llevError, 1129 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); 1130 "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);
1131 free (dump);
1184 dump_object (GET_MAP_OB (m, x, y)); 1132 dump = dump_object (GET_MAP_OB (m, x, y));
1185 LOG (llevError, "%s\n", errmsg); 1133 LOG (llevError, "%s\n", dump);
1134 free (dump);
1186 } 1135 }
1187 1136
1188 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1137 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1189 } 1138 }
1190 1139
… …
1345 return NULL; 1294 return NULL;
1346 } 1295 }
1347 1296
1348 if (m == NULL) 1297 if (m == NULL)
1349 { 1298 {
1350 dump_object (op); 1299 char *dump = dump_object (op);
1351 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1300 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1301 free (dump);
1352 return op; 1302 return op;
1353 } 1303 }
1354 1304
1355 if (out_of_map (m, op->x, op->y)) 1305 if (out_of_map (m, op->x, op->y))
1356 { 1306 {
1357 dump_object (op); 1307 char *dump = dump_object (op);
1358 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1308 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1359#ifdef MANY_CORES 1309#ifdef MANY_CORES
1360 /* Better to catch this here, as otherwise the next use of this object 1310 /* 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 1311 * is likely to cause a crash. Better to find out where it is getting
1362 * improperly inserted. 1312 * improperly inserted.
1363 */ 1313 */
1364 abort (); 1314 abort ();
1365#endif 1315#endif
1316 free (dump);
1366 return op; 1317 return op;
1367 } 1318 }
1368 1319
1369 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1320 if (!QUERY_FLAG (op, FLAG_REMOVED))
1370 { 1321 {
1371 dump_object (op); 1322 char *dump = dump_object (op);
1372 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1323 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1324 free (dump);
1373 return op; 1325 return op;
1374 } 1326 }
1375 1327
1376 if (op->more != NULL) 1328 if (op->more != NULL)
1377 { 1329 {
… …
1814 tmp, * 1766 tmp, *
1815 otmp; 1767 otmp;
1816 1768
1817 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1769 if (!QUERY_FLAG (op, FLAG_REMOVED))
1818 { 1770 {
1819 dump_object (op); 1771 char *dump = dump_object (op);
1820 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1772 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1773 free (dump);
1821 return op; 1774 return op;
1822 } 1775 }
1823 1776
1824 if (where == NULL) 1777 if (where == NULL)
1825 { 1778 {
1826 dump_object (op); 1779 char *dump = dump_object (op);
1827 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1780 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1781 free (dump);
1828 return op; 1782 return op;
1829 } 1783 }
1830 1784
1831 if (where->head) 1785 if (where->head)
1832 { 1786 {

Diff Legend

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