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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 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. */
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <skills.h>
35#include <loader.h> 33#include <loader.h>
36 34
37int nrofallocobjects = 0; 35int nrofallocobjects = 0;
36static UUID uuid;
37const uint64 UUID_SKIP = 1<<19;
38 38
39object *objects; /* Pointer to the list of used objects */
40object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
41 40
42short 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,
43 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
44}; 43};
50}; 49};
51int freedir[SIZEOFFREE] = { 50int freedir[SIZEOFFREE] = {
52 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54}; 53};
54
55static void
56write_uuid (void)
57{
58 char filename1[MAX_BUF], filename2[MAX_BUF];
59
60 sprintf (filename1, "%s/uuid", settings.localdir);
61 sprintf (filename2, "%s/uuid~", settings.localdir);
62
63 FILE *fp;
64
65 if (!(fp = fopen (filename2, "w")))
66 {
67 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68 return;
69 }
70
71 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72 fclose (fp);
73 rename (filename2, filename1);
74}
75
76static void
77read_uuid (void)
78{
79 char filename[MAX_BUF];
80
81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 FILE *fp;
84
85 if (!(fp = fopen (filename, "r")))
86 {
87 if (errno == ENOENT)
88 {
89 LOG (llevInfo, "RESET uid to 1\n");
90 uuid.seq = 0;
91 write_uuid ();
92 return;
93 }
94
95 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96 _exit (1);
97 }
98
99 int version;
100 unsigned long long uid;
101 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
102 {
103 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
104 _exit (1);
105 }
106
107 uuid.seq = uid;
108 write_uuid ();
109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp);
111}
112
113UUID
114gen_uuid ()
115{
116 UUID uid;
117
118 uid.seq = ++uuid.seq;
119
120 if (!(uuid.seq & (UUID_SKIP - 1)))
121 write_uuid ();
122
123 return uid;
124}
125
126void
127init_uuid ()
128{
129 read_uuid ();
130}
55 131
56/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 132/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57static int 133static int
58compare_ob_value_lists_one (const object *wants, const object *has) 134compare_ob_value_lists_one (const object *wants, const object *has)
59{ 135{
255 { 331 {
256 if (inv->inv) 332 if (inv->inv)
257 sum_weight (inv); 333 sum_weight (inv);
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 335 }
336
260 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
262 if (op->carrying != sum) 340 if (op->carrying != sum)
263 op->carrying = sum; 341 op->carrying = sum;
342
264 return sum; 343 return sum;
265} 344}
266 345
267/** 346/**
268 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
295 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296 * Some error messages. 375 * Some error messages.
297 * 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.
298 */ 377 */
299 378
300void 379char *
301dump_object2 (object *op)
302{
303 errmsg[0] = 0;
304 return;
305 //TODO//D#d#
306#if 0
307 char *cp;
308
309/* object *tmp;*/
310
311 if (op->arch != NULL)
312 {
313 strcat (errmsg, "arch ");
314 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315 strcat (errmsg, "\n");
316 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317 strcat (errmsg, cp);
318# if 0
319 /* Don't dump player diffs - they are too long, mostly meaningless, and
320 * will overflow the buffer.
321 * Changed so that we don't dump inventory either. This may
322 * also overflow the buffer.
323 */
324 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325 strcat (errmsg, cp);
326 for (tmp = op->inv; tmp; tmp = tmp->below)
327 dump_object2 (tmp);
328# endif
329 strcat (errmsg, "end\n");
330 }
331 else
332 {
333 strcat (errmsg, "Object ");
334 if (op->name == NULL)
335 strcat (errmsg, "(null)");
336 else
337 strcat (errmsg, op->name);
338 strcat (errmsg, "\n");
339# if 0
340 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341 strcat (errmsg, cp);
342 for (tmp = op->inv; tmp; tmp = tmp->below)
343 dump_object2 (tmp);
344# endif
345 strcat (errmsg, "end\n");
346 }
347#endif
348}
349
350/*
351 * Dumps an object. Returns output in the static global errmsg array.
352 */
353
354void
355dump_object (object *op) 380dump_object (object *op)
356{ 381{
357 if (op == NULL) 382 if (!op)
358 { 383 return strdup ("[NULLOBJ]");
359 strcpy (errmsg, "[NULL pointer]");
360 return;
361 }
362 errmsg[0] = '\0';
363 dump_object2 (op);
364}
365 384
366void 385 object_freezer freezer;
367dump_all_objects (void) 386 save_object (freezer, op, 3);
368{ 387 return freezer.as_string ();
369 object *op;
370
371 for (op = objects; op != NULL; op = op->next)
372 {
373 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375 }
376} 388}
377 389
378/* 390/*
379 * 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
380 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
400 */ 412 */
401 413
402object * 414object *
403find_object (tag_t i) 415find_object (tag_t i)
404{ 416{
405 object *op; 417 for (object *op = object::first; op; op = op->next)
406
407 for (op = objects; op != NULL; op = op->next)
408 if (op->count == i) 418 if (op->count == i)
409 break; 419 return op;
420
410 return op; 421 return 0;
411} 422}
412 423
413/* 424/*
414 * 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.
415 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
417 */ 428 */
418 429
419object * 430object *
420find_object_name (const char *str) 431find_object_name (const char *str)
421{ 432{
422 const char *name = shstr::find (str); 433 shstr_cmp str_ (str);
423 object *op; 434 object *op;
424 435
425 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
426 if (&op->name == name) 437 if (op->name == str_)
427 break; 438 break;
428 439
429 return op; 440 return op;
430} 441}
431 442
434{ 445{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436} 447}
437 448
438/* 449/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448
449object *
450get_owner (object *op)
451{
452 if (op->owner == NULL)
453 return NULL;
454
455 if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
456 return op->owner;
457
458 op->owner = NULL;
459 op->ownercount = 0;
460 return NULL;
461}
462
463void
464clear_owner (object *op)
465{
466 if (!op)
467 return;
468
469 if (op->owner && op->ownercount == op->owner->count)
470 op->owner->refcount--;
471
472 op->owner = NULL;
473 op->ownercount = 0;
474}
475
476/*
477 * Sets the owner and sets the skill and exp pointers to owner's current 450 * Sets the owner and sets the skill and exp pointers to owner's current
478 * skill and experience objects. 451 * skill and experience objects.
479 */ 452 */
480void 453void
481set_owner (object *op, object *owner) 454object::set_owner (object *owner)
482{ 455{
483 if (owner == NULL || op == NULL) 456 if (!owner)
484 return; 457 return;
485 458
486 /* next line added to allow objects which own objects */ 459 /* next line added to allow objects which own objects */
487 /* Add a check for ownercounts in here, as I got into an endless loop 460 /* Add a check for ownercounts in here, as I got into an endless loop
488 * with the fireball owning a poison cloud which then owned the 461 * with the fireball owning a poison cloud which then owned the
489 * fireball. I believe that was caused by one of the objects getting 462 * fireball. I believe that was caused by one of the objects getting
490 * freed and then another object replacing it. Since the ownercounts 463 * freed and then another object replacing it. Since the ownercounts
491 * didn't match, this check is valid and I believe that cause is valid. 464 * didn't match, this check is valid and I believe that cause is valid.
492 */ 465 */
493 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 466 while (owner->owner)
494 owner = owner->owner; 467 owner = owner->owner;
495 468
496 /* IF the owner still has an owner, we did not resolve to a final owner.
497 * so lets not add to that.
498 */
499 if (owner->owner)
500 return;
501
502 op->owner = owner; 469 this->owner = owner;
503
504 op->ownercount = owner->count;
505 owner->refcount++;
506}
507
508/* Set the owner to clone's current owner and set the skill and experience
509 * objects to clone's objects (typically those objects that where the owner's
510 * current skill and experience objects at the time when clone's owner was
511 * set - not the owner's current skill and experience objects).
512 *
513 * Use this function if player created an object (e.g. fire bullet, swarm
514 * spell), and this object creates further objects whose kills should be
515 * accounted for the player's original skill, even if player has changed
516 * skills meanwhile.
517 */
518void
519copy_owner (object *op, object *clone)
520{
521 object *owner = get_owner (clone);
522
523 if (owner == NULL)
524 {
525 /* players don't have owners - they own themselves. Update
526 * as appropriate.
527 */
528 if (clone->type == PLAYER)
529 owner = clone;
530 else
531 return;
532 }
533
534 set_owner (op, owner);
535} 470}
536 471
537/* Zero the key_values on op, decrementing the shared-string 472/* Zero the key_values on op, decrementing the shared-string
538 * refcounts and freeing the links. 473 * refcounts and freeing the links.
539 */ 474 */
555{ 490{
556 attachable_base::clear (); 491 attachable_base::clear ();
557 492
558 free_key_values (this); 493 free_key_values (this);
559 494
560 clear_owner (this); 495 owner = 0;
561
562 name = 0; 496 name = 0;
563 name_pl = 0; 497 name_pl = 0;
564 title = 0; 498 title = 0;
565 race = 0; 499 race = 0;
566 slaying = 0; 500 slaying = 0;
567 skill = 0; 501 skill = 0;
568 msg = 0; 502 msg = 0;
569 lore = 0; 503 lore = 0;
570 custom_name = 0; 504 custom_name = 0;
571 materialname = 0; 505 materialname = 0;
506 contr = 0;
507 below = 0;
508 above = 0;
509 inv = 0;
510 container = 0;
511 env = 0;
512 more = 0;
513 head = 0;
514 map = 0;
515 active_next = 0;
516 active_prev = 0;
572 517
573 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); 518 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574 519
575 SET_FLAG (this, FLAG_REMOVED); 520 SET_FLAG (this, FLAG_REMOVED);
521
522 /* What is not cleared is next, prev, and count */
523
524 expmul = 1.0;
525 face = blank_face;
526
527 if (settings.casting_time)
528 casting_time = -1;
576} 529}
577 530
578void object::clone (object *destination) 531void object::clone (object *destination)
579{ 532{
580 *(object_copy *) destination = *this; 533 *(object_copy *)destination = *this;
581 *(object_pod *) destination = *this; 534 *(object_pod *)destination = *this;
582 535
583 if (self || cb) 536 if (self || cb)
584 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
585}
586
587/*
588 * clear_object() frees everything allocated by an object, and also
589 * clears all variables and flags to default settings.
590 */
591
592void
593clear_object (object *op)
594{
595 op->clear ();
596
597 op->contr = NULL;
598 op->below = NULL;
599 op->above = NULL;
600 op->inv = NULL;
601 op->container = NULL;
602 op->env = NULL;
603 op->more = NULL;
604 op->head = NULL;
605 op->map = NULL;
606 op->refcount = 0;
607 op->active_next = NULL;
608 op->active_prev = NULL;
609 /* What is not cleared is next, prev, and count */
610
611 op->expmul = 1.0;
612 op->face = blank_face;
613 op->attacked_by_count = -1;
614
615 if (settings.casting_time)
616 op->casting_time = -1;
617} 538}
618 539
619/* 540/*
620 * copy object first frees everything allocated by the second object, 541 * copy object first frees everything allocated by the second object,
621 * and then copies the contends of the first object into the second 542 * and then copies the contends of the first object into the second
622 * object, allocating what needs to be allocated. Basically, any 543 * object, allocating what needs to be allocated. Basically, any
623 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 544 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
624 * if the first object is freed, the pointers in the new object 545 * if the first object is freed, the pointers in the new object
625 * will point at garbage. 546 * will point at garbage.
626 */ 547 */
627
628void 548void
629copy_object (object *op2, object *op) 549copy_object (object *op2, object *op)
630{ 550{
631 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 551 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
632 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
633 553
634 op2->clone (op); 554 op2->clone (op);
635 555
636 if (is_freed) 556 if (is_freed)
637 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
638 if (is_removed) 559 if (is_removed)
639 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
640 561
641 if (op2->speed < 0) 562 if (op2->speed < 0)
642 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
692/* 613/*
693 * Updates the speed of an object. If the speed changes from 0 to another 614 * Updates the speed of an object. If the speed changes from 0 to another
694 * value, or vice versa, then add/remove the object from the active list. 615 * value, or vice versa, then add/remove the object from the active list.
695 * This function needs to be called whenever the speed of an object changes. 616 * This function needs to be called whenever the speed of an object changes.
696 */ 617 */
697
698void 618void
699update_ob_speed (object *op) 619update_ob_speed (object *op)
700{ 620{
701 extern int arch_init; 621 extern int arch_init;
702 622
711 abort (); 631 abort ();
712#else 632#else
713 op->speed = 0; 633 op->speed = 0;
714#endif 634#endif
715 } 635 }
636
716 if (arch_init) 637 if (arch_init)
717 {
718 return; 638 return;
719 } 639
720 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 640 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721 { 641 {
722 /* If already on active list, don't do anything */ 642 /* If already on active list, don't do anything */
723 if (op->active_next || op->active_prev || op == active_objects) 643 if (op->active_next || op->active_prev || op == active_objects)
724 return; 644 return;
725 645
726 /* process_events() expects us to insert the object at the beginning 646 /* process_events() expects us to insert the object at the beginning
727 * of the list. */ 647 * of the list. */
728 op->active_next = active_objects; 648 op->active_next = active_objects;
649
729 if (op->active_next != NULL) 650 if (op->active_next != NULL)
730 op->active_next->active_prev = op; 651 op->active_next->active_prev = op;
652
731 active_objects = op; 653 active_objects = op;
732 } 654 }
733 else 655 else
734 { 656 {
735 /* If not on the active list, nothing needs to be done */ 657 /* If not on the active list, nothing needs to be done */
737 return; 659 return;
738 660
739 if (op->active_prev == NULL) 661 if (op->active_prev == NULL)
740 { 662 {
741 active_objects = op->active_next; 663 active_objects = op->active_next;
664
742 if (op->active_next != NULL) 665 if (op->active_next != NULL)
743 op->active_next->active_prev = NULL; 666 op->active_next->active_prev = NULL;
744 } 667 }
745 else 668 else
746 { 669 {
747 op->active_prev->active_next = op->active_next; 670 op->active_prev->active_next = op->active_next;
671
748 if (op->active_next) 672 if (op->active_next)
749 op->active_next->active_prev = op->active_prev; 673 op->active_next->active_prev = op->active_prev;
750 } 674 }
675
751 op->active_next = NULL; 676 op->active_next = NULL;
752 op->active_prev = NULL; 677 op->active_prev = NULL;
753 } 678 }
754} 679}
755 680
880 update_now = 1; 805 update_now = 1;
881 806
882 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
883 update_now = 1; 808 update_now = 1;
884 } 809 }
810
885 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
886 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
887 * that is being removed. 813 * that is being removed.
888 */ 814 */
889 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
901 827
902 if (op->more != NULL) 828 if (op->more != NULL)
903 update_object (op->more, action); 829 update_object (op->more, action);
904} 830}
905 831
906static unordered_vector < object *>mortals; 832object::vector object::mortals;
907static 833object::vector object::objects; // not yet used
908std::vector < object *> 834object *object::first;
909 freed;
910 835
911void object::free_mortals () 836void object::free_mortals ()
912{ 837{
913 for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914 if (!(*i)->refcount) 839 if ((*i)->refcnt)
840 ++i; // further delay freeing
841 else
915 { 842 {
916 freed.push_back (*i); 843 delete *i;
917 mortals.erase (i); 844 mortals.erase (i);
918 } 845 }
919 else
920 ++i;
921} 846}
922 847
923object::object () 848object::object ()
924{ 849{
925 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
926 851
927 expmul = 1.0; 852 expmul = 1.0;
928 face = blank_face; 853 face = blank_face;
929 attacked_by_count = -1;
930} 854}
931 855
932object::~object () 856object::~object ()
933{ 857{
934 free_key_values (this); 858 free_key_values (this);
935} 859}
936 860
937void object::link () 861void object::link ()
938{ 862{
939 count = ++ob_count; 863 count = ++ob_count;
864 uuid = gen_uuid ();
940 865
941 prev = 0; 866 prev = 0;
942 next = objects; 867 next = object::first;
943 868
944 if (objects) 869 if (object::first)
945 objects->prev = this; 870 object::first->prev = this;
946 871
947 objects = this; 872 object::first = this;
948} 873}
949 874
950void object::unlink () 875void object::unlink ()
951{ 876{
952 count = 0; 877 if (this == object::first)
878 object::first = next;
953 879
954 /* Remove this object from the list of used objects */ 880 /* Remove this object from the list of used objects */
955 if (prev)
956 {
957 prev->next = next; 881 if (prev) prev->next = next;
882 if (next) next->prev = prev;
883
958 prev = 0; 884 prev = 0;
959 }
960
961 if (next)
962 {
963 next->prev = prev;
964 next = 0; 885 next = 0;
965 }
966
967 if (this == objects)
968 objects = next;
969} 886}
970 887
971object *object::create () 888object *object::create ()
972{ 889{
973 object *
974 op;
975
976 if (freed.empty ())
977 op = new object; 890 object *op = new object;
978
979 else
980 {
981 // highly annoying, but the only way to get it stable right now
982 op = freed.back ();
983 freed.pop_back ();
984 op->~object ();
985 new ((void *) op) object;
986 }
987
988 op->link (); 891 op->link ();
989 return op; 892 return op;
990} 893}
991 894
992/* 895/*
994 * 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
995 * free objects. The IS_FREED() flag is set in the object. 898 * free objects. The IS_FREED() flag is set in the object.
996 * The object must have been removed by remove_ob() first for 899 * The object must have been removed by remove_ob() first for
997 * this function to succeed. 900 * this function to succeed.
998 * 901 *
999 * 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
1000 * inventory to the ground. 903 * inventory to the ground.
1001 */ 904 */
1002void object::free (bool free_inventory) 905void object::destroy (bool destroy_inventory)
1003{ 906{
1004 if (QUERY_FLAG (this, FLAG_FREED)) 907 if (QUERY_FLAG (this, FLAG_FREED))
1005 return; 908 return;
1006 909
1007 if (!QUERY_FLAG (this, FLAG_REMOVED))
1008 remove_ob (this);
1009
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011 remove_friendly_object (this); 911 remove_friendly_object (this);
1012 912
913 if (!QUERY_FLAG (this, FLAG_REMOVED))
914 remove ();
915
1013 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
1014 917
1015 if (more) 918 if (more)
1016 { 919 {
1017 more->free (free_inventory); 920 more->destroy (destroy_inventory);
1018 more = 0; 921 more = 0;
1019 } 922 }
1020 923
1021 if (inv) 924 if (inv)
1022 { 925 {
1023 /* Only if the space blocks everything do we not process - 926 /* Only if the space blocks everything do we not process -
1024 * if some form of movement is allowed, let objects 927 * if some form of movement is allowed, let objects
1025 * drop on that space. 928 * drop on that space.
1026 */ 929 */
1027 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)
1028 { 931 {
1029 object *op = inv; 932 object *op = inv;
1030 933
1031 while (op) 934 while (op)
1032 { 935 {
1033 object *tmp = op->below; 936 object *tmp = op->below;
1034 op->free (free_inventory); 937 op->destroy (destroy_inventory);
1035 op = tmp; 938 op = tmp;
1036 } 939 }
1037 } 940 }
1038 else 941 else
1039 { /* Put objects in inventory onto this space */ 942 { /* Put objects in inventory onto this space */
1041 944
1042 while (op) 945 while (op)
1043 { 946 {
1044 object *tmp = op->below; 947 object *tmp = op->below;
1045 948
1046 remove_ob (op); 949 op->remove ();
1047 950
1048 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 951 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1049 || 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))
1050 free_object (op); 953 op->destroy (0);
1051 else 954 else
1052 { 955 {
1053 op->x = x; 956 op->x = x;
1054 op->y = y; 957 op->y = y;
1055 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 */
1058 op = tmp; 961 op = tmp;
1059 } 962 }
1060 } 963 }
1061 } 964 }
1062 965
1063 clear_owner (this); 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
986 // clear those pointers that likely might have circular references to us
987 owner = 0;
988 enemy = 0;
989 attacked_by = 0;
990
991 // only relevant for players(?), but make sure of it anyways
992 contr = 0;
1064 993
1065 /* Remove object from the active list */ 994 /* Remove object from the active list */
1066 speed = 0; 995 speed = 0;
1067 update_ob_speed (this); 996 update_ob_speed (this);
1068 997
1073 1002
1074/* 1003/*
1075 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1076 * 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)).
1077 */ 1006 */
1078
1079void 1007void
1080sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1081{ 1009{
1082 while (op != NULL) 1010 while (op != NULL)
1083 { 1011 {
1084 if (op->type == CONTAINER) 1012 if (op->type == CONTAINER)
1085 {
1086 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087 } 1014
1088 op->carrying -= weight; 1015 op->carrying -= weight;
1089 op = op->env; 1016 op = op->env;
1090 } 1017 }
1091} 1018}
1092 1019
1093/* remove_ob(op): 1020/* op->remove ():
1094 * 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
1095 * 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
1096 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1097 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1098 * the previous environment. 1025 * the previous environment.
1099 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1100 */ 1027 */
1101
1102void 1028void
1103remove_ob (object *op) 1029object::remove ()
1104{ 1030{
1031 object *tmp, *last = 0;
1105 object * 1032 object *otmp;
1106 tmp, *
1107 last = NULL;
1108 object *
1109 otmp;
1110 1033
1111 tag_t
1112 tag;
1113 int
1114 check_walk_off; 1034 int check_walk_off;
1115 mapstruct *
1116 m;
1117 1035
1118 sint16
1119 x,
1120 y;
1121
1122 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1123 return; 1037 return;
1124 1038
1125 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1126 1040
1127 if (op->more != NULL) 1041 if (more)
1128 remove_ob (op->more); 1042 more->remove ();
1129 1043
1130 /* 1044 /*
1131 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1132 * inventory. 1046 * inventory.
1133 */ 1047 */
1134 if (op->env != NULL) 1048 if (env)
1135 { 1049 {
1136 if (op->nrof) 1050 if (nrof)
1137 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1138 else 1052 else
1139 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1140 1054
1141 /* 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
1142 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1143 * to save cpu time. 1057 * to save cpu time.
1144 */ 1058 */
1145 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))
1146 fix_player (otmp); 1060 fix_player (otmp);
1147 1061
1148 if (op->above != NULL) 1062 if (above != NULL)
1149 op->above->below = op->below; 1063 above->below = below;
1150 else 1064 else
1151 op->env->inv = op->below; 1065 env->inv = below;
1152 1066
1153 if (op->below != NULL) 1067 if (below != NULL)
1154 op->below->above = op->above; 1068 below->above = above;
1155 1069
1156 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1157 * 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
1158 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1159 */ 1073 */
1160 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1161 op->map = op->env->map; 1075 map = env->map;
1162 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1163 op->env = NULL; 1077 env = 0;
1164 } 1078 }
1165 else if (op->map) 1079 else if (map)
1166 { 1080 {
1167 x = op->x;
1168 y = op->y;
1169 m = get_map_from_coord (op->map, &x, &y);
1170
1171 if (!m)
1172 {
1173 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1174 op->map->path, op->x, op->y);
1175 /* in old days, we used to set x and y to 0 and continue.
1176 * it seems if we get into this case, something is probablye
1177 * screwed up and should be fixed.
1178 */
1179 abort ();
1180 }
1181
1182 if (op->map != m)
1183 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1184 op->map->path, m->path, op->x, op->y, x, y);
1185
1186 /* 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
1187 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1188 */ 1083 */
1189 1084
1190 /* link the object above us */ 1085 /* link the object above us */
1191 if (op->above) 1086 if (above)
1192 op->above->below = op->below; 1087 above->below = below;
1193 else 1088 else
1194 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 */
1195 1090
1196 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1197 if (op->below) 1092 if (below)
1198 op->below->above = op->above; 1093 below->above = above;
1199 else 1094 else
1200 { 1095 {
1201 /* 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
1202 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1203 * evident 1098 * evident
1204 */ 1099 */
1205 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1206 { 1101 {
1207 dump_object (op); 1102 char *dump = dump_object (this);
1208 LOG (llevError, 1103 LOG (llevError,
1209 "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);
1210 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1211 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1212 } 1109 }
1213 1110
1214 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1215 } 1112 }
1216 1113
1217 op->above = 0; 1114 above = 0;
1218 op->below = 0; 1115 below = 0;
1219 1116
1220 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1221 return; 1118 return;
1222 1119
1223 tag = op->count;
1224 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1225 1121
1226 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)
1227 { 1123 {
1228 /* 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
1229 * being removed. 1125 * being removed.
1230 */ 1126 */
1231 1127
1232 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1233 { 1129 {
1234 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1235 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1236 * appropriately. 1132 * appropriately.
1237 */ 1133 */
1238 if (tmp->container == op) 1134 if (tmp->container == this)
1239 { 1135 {
1240 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1241 tmp->container = NULL; 1137 tmp->container = 0;
1242 } 1138 }
1243 1139
1244 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1245 } 1141 }
1246 1142
1247 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1248 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))
1249 { 1147 {
1250 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1251 1149
1252 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1253 {
1254 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 ());
1255 }
1256 } 1152 }
1257 1153
1258 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259 1155
1260 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1261 tmp->above = NULL; 1157 tmp->above = 0;
1262 1158
1263 last = tmp; 1159 last = tmp;
1264 } 1160 }
1265 1161
1266 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1267 if (last == NULL) 1163 if (!last)
1268 { 1164 {
1269 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270 * 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
1271 * 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
1272 * be correct anyways. 1168 * be correct anyways.
1273 */ 1169 */
1274 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1275 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1276 } 1172 }
1277 else 1173 else
1278 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1279 1175
1280 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1281 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1282 } 1178 }
1283} 1179}
1284 1180
1285/* 1181/*
1286 * merge_ob(op,top): 1182 * merge_ob(op,top):
1288 * This function goes through all objects below and including top, and 1184 * This function goes through all objects below and including top, and
1289 * merges op to the first matching object. 1185 * merges op to the first matching object.
1290 * If top is NULL, it is calculated. 1186 * If top is NULL, it is calculated.
1291 * Returns pointer to object if it succeded in the merge, otherwise NULL 1187 * Returns pointer to object if it succeded in the merge, otherwise NULL
1292 */ 1188 */
1293
1294object * 1189object *
1295merge_ob (object *op, object *top) 1190merge_ob (object *op, object *top)
1296{ 1191{
1297 if (!op->nrof) 1192 if (!op->nrof)
1298 return 0; 1193 return 0;
1308 { 1203 {
1309 top->nrof += op->nrof; 1204 top->nrof += op->nrof;
1310 1205
1311/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312 op->weight = 0; /* Don't want any adjustements now */ 1207 op->weight = 0; /* Don't want any adjustements now */
1313 remove_ob (op); 1208 op->remove ();
1314 free_object (op); 1209 op->destroy (0);
1315 return top; 1210 return top;
1316 } 1211 }
1317 } 1212 }
1318 1213
1319 return NULL; 1214 return 0;
1320} 1215}
1321 1216
1322/* 1217/*
1323 * 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
1324 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1325 */ 1220 */
1326object * 1221object *
1327insert_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)
1328{ 1223{
1329 object *tmp; 1224 object *tmp;
1330 1225
1331 if (op->head) 1226 if (op->head)
1332 op = op->head; 1227 op = op->head;
1360 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1361 * just 'op' otherwise 1256 * just 'op' otherwise
1362 */ 1257 */
1363 1258
1364object * 1259object *
1365insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366{ 1261{
1367 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1368 sint16 x, y; 1263 sint16 x, y;
1369 1264
1370 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
1373 return NULL; 1268 return NULL;
1374 } 1269 }
1375 1270
1376 if (m == NULL) 1271 if (m == NULL)
1377 { 1272 {
1378 dump_object (op); 1273 char *dump = dump_object (op);
1379 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);
1380 return op; 1276 return op;
1381 } 1277 }
1382 1278
1383 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1384 { 1280 {
1385 dump_object (op); 1281 char *dump = dump_object (op);
1386 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);
1387#ifdef MANY_CORES 1283#ifdef MANY_CORES
1388 /* 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
1389 * 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
1390 * improperly inserted. 1286 * improperly inserted.
1391 */ 1287 */
1392 abort (); 1288 abort ();
1393#endif 1289#endif
1290 free (dump);
1394 return op; 1291 return op;
1395 } 1292 }
1396 1293
1397 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1398 { 1295 {
1399 dump_object (op); 1296 char *dump = dump_object (op);
1400 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);
1401 return op; 1299 return op;
1402 } 1300 }
1403 1301
1404 if (op->more != NULL) 1302 if (op->more != NULL)
1405 { 1303 {
1446 if (op->nrof && !(flag & INS_NO_MERGE)) 1344 if (op->nrof && !(flag & INS_NO_MERGE))
1447 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)
1448 if (CAN_MERGE (op, tmp)) 1346 if (CAN_MERGE (op, tmp))
1449 { 1347 {
1450 op->nrof += tmp->nrof; 1348 op->nrof += tmp->nrof;
1451 remove_ob (tmp); 1349 tmp->remove ();
1452 free_object (tmp); 1350 tmp->destroy (0);
1453 } 1351 }
1454 1352
1455 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 */
1456 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457 1355
1646 1544
1647 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)
1648 { 1546 {
1649 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1650 { 1548 {
1651 remove_ob (tmp); 1549 tmp->remove ();
1652 free_object (tmp); 1550 tmp->destroy (0);
1653 } 1551 }
1654 } 1552 }
1655 1553
1656 tmp1 = arch_to_object (find_archetype (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1657 1555
1658 tmp1->x = op->x; 1556 tmp1->x = op->x;
1659 tmp1->y = op->y; 1557 tmp1->y = op->y;
1660 insert_ob_in_map (tmp1, op->map, op, 0); 1558 insert_ob_in_map (tmp1, op->map, op, 0);
1661} 1559}
1683 } 1581 }
1684 1582
1685 newob = object_create_clone (orig_ob); 1583 newob = object_create_clone (orig_ob);
1686 1584
1687 if ((orig_ob->nrof -= nr) < 1) 1585 if ((orig_ob->nrof -= nr) < 1)
1688 { 1586 orig_ob->destroy (1);
1689 if (!is_removed)
1690 remove_ob (orig_ob);
1691 free_object2 (orig_ob, 1);
1692 }
1693 else if (!is_removed) 1587 else if (!is_removed)
1694 { 1588 {
1695 if (orig_ob->env != NULL) 1589 if (orig_ob->env != NULL)
1696 sub_weight (orig_ob->env, orig_ob->weight * nr); 1590 sub_weight (orig_ob->env, orig_ob->weight * nr);
1697 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)
1761 esrv_send_item (tmp, op); 1655 esrv_send_item (tmp, op);
1762 } 1656 }
1763 } 1657 }
1764 else 1658 else
1765 { 1659 {
1766 remove_ob (op); 1660 op->remove ();
1767 op->nrof = 0; 1661 op->nrof = 0;
1768 if (tmp) 1662 if (tmp)
1769 { 1663 {
1770 esrv_del_item (tmp->contr, op->count); 1664 esrv_del_item (tmp->contr, op->count);
1771 } 1665 }
1777 1671
1778 if (i < op->nrof) 1672 if (i < op->nrof)
1779 op->nrof -= i; 1673 op->nrof -= i;
1780 else 1674 else
1781 { 1675 {
1782 remove_ob (op); 1676 op->remove ();
1783 op->nrof = 0; 1677 op->nrof = 0;
1784 } 1678 }
1785 1679
1786 /* Since we just removed op, op->above is null */ 1680 /* Since we just removed op, op->above is null */
1787 for (tmp = above; tmp != NULL; tmp = tmp->above) 1681 for (tmp = above; tmp != NULL; tmp = tmp->above)
1796 1690
1797 if (op->nrof) 1691 if (op->nrof)
1798 return op; 1692 return op;
1799 else 1693 else
1800 { 1694 {
1801 free_object (op); 1695 op->destroy (0);
1802 return NULL; 1696 return NULL;
1803 } 1697 }
1804} 1698}
1805 1699
1806/* 1700/*
1819 op->carrying += weight; 1713 op->carrying += weight;
1820 op = op->env; 1714 op = op->env;
1821 } 1715 }
1822} 1716}
1823 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
1824/* 1738/*
1825 * insert_ob_in_ob(op,environment): 1739 * env->insert (op)
1826 * This function inserts the object op in the linked list 1740 * This function inserts the object op in the linked list
1827 * inside the object environment. 1741 * inside the object environment.
1828 * 1742 *
1829 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1830 * the inventory at the last position or next to other objects of the same
1831 * type.
1832 * Frank: Now sorted by type, archetype and magic!
1833 *
1834 * 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
1835 * be != op, if items are merged. -Tero 1744 * be != op, if items are merged. -Tero
1836 */ 1745 */
1837 1746
1838object * 1747object *
1839insert_ob_in_ob (object *op, object *where) 1748object::insert (object *op)
1840{ 1749{
1841 object * 1750 object *tmp, *otmp;
1842 tmp, *
1843 otmp;
1844 1751
1845 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1752 if (!QUERY_FLAG (op, FLAG_REMOVED))
1846 { 1753 op->remove ();
1847 dump_object (op);
1848 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1849 return op;
1850 }
1851
1852 if (where == NULL)
1853 {
1854 dump_object (op);
1855 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1856 return op;
1857 }
1858
1859 if (where->head)
1860 {
1861 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1862 where = where->head;
1863 }
1864 1754
1865 if (op->more) 1755 if (op->more)
1866 { 1756 {
1867 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);
1868 return op; 1758 return op;
1870 1760
1871 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1761 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872 CLEAR_FLAG (op, FLAG_REMOVED); 1762 CLEAR_FLAG (op, FLAG_REMOVED);
1873 if (op->nrof) 1763 if (op->nrof)
1874 { 1764 {
1875 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1765 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876 if (CAN_MERGE (tmp, op)) 1766 if (CAN_MERGE (tmp, op))
1877 { 1767 {
1878 /* return the original object and remove inserted object 1768 /* return the original object and remove inserted object
1879 (client needs the original object) */ 1769 (client needs the original object) */
1880 tmp->nrof += op->nrof; 1770 tmp->nrof += op->nrof;
1881 /* Weight handling gets pretty funky. Since we are adding to 1771 /* Weight handling gets pretty funky. Since we are adding to
1882 * tmp->nrof, we need to increase the weight. 1772 * tmp->nrof, we need to increase the weight.
1883 */ 1773 */
1884 add_weight (where, op->weight * op->nrof); 1774 add_weight (this, op->weight * op->nrof);
1885 SET_FLAG (op, FLAG_REMOVED); 1775 SET_FLAG (op, FLAG_REMOVED);
1886 free_object (op); /* free the inserted object */ 1776 op->destroy (); /* free the inserted object */
1887 op = tmp; 1777 op = tmp;
1888 remove_ob (op); /* and fix old object's links */ 1778 op->remove (); /* and fix old object's links */
1889 CLEAR_FLAG (op, FLAG_REMOVED); 1779 CLEAR_FLAG (op, FLAG_REMOVED);
1890 break; 1780 break;
1891 } 1781 }
1892 1782
1893 /* I assume combined objects have no inventory 1783 /* I assume combined objects have no inventory
1894 * We add the weight - this object could have just been removed 1784 * We add the weight - this object could have just been removed
1895 * (if it was possible to merge). calling remove_ob will subtract 1785 * (if it was possible to merge). calling remove_ob will subtract
1896 * 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
1897 * the linking below 1787 * the linking below
1898 */ 1788 */
1899 add_weight (where, op->weight * op->nrof); 1789 add_weight (this, op->weight * op->nrof);
1900 } 1790 }
1901 else 1791 else
1902 add_weight (where, (op->weight + op->carrying)); 1792 add_weight (this, (op->weight + op->carrying));
1903 1793
1904 otmp = is_player_inv (where); 1794 otmp = is_player_inv (this);
1905 if (otmp && otmp->contr != NULL) 1795 if (otmp && otmp->contr)
1906 {
1907 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1796 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908 fix_player (otmp); 1797 fix_player (otmp);
1909 }
1910 1798
1911 op->map = NULL; 1799 op->map = NULL;
1912 op->env = where; 1800 op->env = this;
1913 op->above = NULL; 1801 op->above = NULL;
1914 op->below = NULL; 1802 op->below = NULL;
1915 op->x = 0, op->y = 0; 1803 op->x = 0, op->y = 0;
1916 1804
1917 /* 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 */
1918 if ((op->glow_radius != 0) && where->map) 1806 if ((op->glow_radius != 0) && map)
1919 { 1807 {
1920#ifdef DEBUG_LIGHTS 1808#ifdef DEBUG_LIGHTS
1921 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);
1922#endif /* DEBUG_LIGHTS */ 1810#endif /* DEBUG_LIGHTS */
1923 if (MAP_DARKNESS (where->map)) 1811 if (MAP_DARKNESS (map))
1924 update_all_los (where->map, where->x, where->y); 1812 update_all_los (map, x, y);
1925 } 1813 }
1926 1814
1927 /* 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.
1928 * It sure simplifies this function... 1816 * It sure simplifies this function...
1929 */ 1817 */
1930 if (where->inv == NULL) 1818 if (!inv)
1931 where->inv = op; 1819 inv = op;
1932 else 1820 else
1933 { 1821 {
1934 op->below = where->inv; 1822 op->below = inv;
1935 op->below->above = op; 1823 op->below->above = op;
1936 where->inv = op; 1824 inv = op;
1937 } 1825 }
1826
1938 return op; 1827 return op;
1939} 1828}
1940 1829
1941/* 1830/*
1942 * Checks if any objects has a move_type that matches objects 1831 * Checks if any objects has a move_type that matches objects
1960 */ 1849 */
1961 1850
1962int 1851int
1963check_move_on (object *op, object *originator) 1852check_move_on (object *op, object *originator)
1964{ 1853{
1965 object * 1854 object *tmp;
1966 tmp; 1855 maptile *m = op->map;
1967 tag_t
1968 tag;
1969 mapstruct *
1970 m = op->map;
1971 int
1972 x = op->x, y = op->y; 1856 int x = op->x, y = op->y;
1973 1857
1974 MoveType 1858 MoveType move_on, move_slow, move_block;
1975 move_on,
1976 move_slow,
1977 move_block;
1978 1859
1979 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1860 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980 return 0; 1861 return 0;
1981
1982 tag = op->count;
1983 1862
1984 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1863 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1985 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1864 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1986 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1865 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987 1866
2048 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1927 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2049 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1928 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050 { 1929 {
2051 move_apply (tmp, op, originator); 1930 move_apply (tmp, op, originator);
2052 1931
2053 if (was_destroyed (op, tag)) 1932 if (op->destroyed ())
2054 return 1; 1933 return 1;
2055 1934
2056 /* what the person/creature stepped onto has moved the object 1935 /* what the person/creature stepped onto has moved the object
2057 * someplace new. Don't process any further - if we did, 1936 * someplace new. Don't process any further - if we did,
2058 * have a feeling strange problems would result. 1937 * have a feeling strange problems would result.
2070 * a matching archetype at the given map and coordinates. 1949 * a matching archetype at the given map and coordinates.
2071 * The first matching object is returned, or NULL if none. 1950 * The first matching object is returned, or NULL if none.
2072 */ 1951 */
2073 1952
2074object * 1953object *
2075present_arch (const archetype *at, mapstruct *m, int x, int y) 1954present_arch (const archetype *at, maptile *m, int x, int y)
2076{ 1955{
2077 object * 1956 object *
2078 tmp; 1957 tmp;
2079 1958
2080 if (m == NULL || out_of_map (m, x, y)) 1959 if (m == NULL || out_of_map (m, x, y))
2093 * a matching type variable at the given map and coordinates. 1972 * a matching type variable at the given map and coordinates.
2094 * The first matching object is returned, or NULL if none. 1973 * The first matching object is returned, or NULL if none.
2095 */ 1974 */
2096 1975
2097object * 1976object *
2098present (unsigned char type, mapstruct *m, int x, int y) 1977present (unsigned char type, maptile *m, int x, int y)
2099{ 1978{
2100 object * 1979 object *
2101 tmp; 1980 tmp;
2102 1981
2103 if (out_of_map (m, x, y)) 1982 if (out_of_map (m, x, y))
2243 * the archetype because that isn't correct if the monster has been 2122 * the archetype because that isn't correct if the monster has been
2244 * customized, changed states, etc. 2123 * customized, changed states, etc.
2245 */ 2124 */
2246 2125
2247int 2126int
2248find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2127find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249{ 2128{
2250 int 2129 int
2251 i, 2130 i,
2252 index = 0, flag; 2131 index = 0, flag;
2253 static int 2132 static int
2274 return -1; 2153 return -1;
2275 return altern[RANDOM () % index]; 2154 return altern[RANDOM () % index];
2276} 2155}
2277 2156
2278/* 2157/*
2279 * find_first_free_spot(archetype, mapstruct, x, y) works like 2158 * find_first_free_spot(archetype, maptile, x, y) works like
2280 * find_free_spot(), but it will search max number of squares. 2159 * find_free_spot(), but it will search max number of squares.
2281 * But it will return the first available spot, not a random choice. 2160 * But it will return the first available spot, not a random choice.
2282 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2161 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2283 */ 2162 */
2284 2163
2285int 2164int
2286find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2165find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287{ 2166{
2288 int 2167 int
2289 i; 2168 i;
2290 2169
2291 for (i = 0; i < SIZEOFFREE; i++) 2170 for (i = 0; i < SIZEOFFREE; i++)
2355 * because we have to know what movement the thing looking to move 2234 * because we have to know what movement the thing looking to move
2356 * there is capable of. 2235 * there is capable of.
2357 */ 2236 */
2358 2237
2359int 2238int
2360find_dir (mapstruct *m, int x, int y, object *exclude) 2239find_dir (maptile *m, int x, int y, object *exclude)
2361{ 2240{
2362 int 2241 int
2363 i, 2242 i,
2364 max = SIZEOFFREE, mflags; 2243 max = SIZEOFFREE, mflags;
2365 2244
2366 sint16 nx, ny; 2245 sint16 nx, ny;
2367 object * 2246 object *
2368 tmp; 2247 tmp;
2369 mapstruct * 2248 maptile *
2370 mp; 2249 mp;
2371 2250
2372 MoveType blocked, move_type; 2251 MoveType blocked, move_type;
2373 2252
2374 if (exclude && exclude->head) 2253 if (exclude && exclude->head)
2582 * Modified to be map tile aware -.MSW 2461 * Modified to be map tile aware -.MSW
2583 */ 2462 */
2584 2463
2585 2464
2586int 2465int
2587can_see_monsterP (mapstruct *m, int x, int y, int dir) 2466can_see_monsterP (maptile *m, int x, int y, int dir)
2588{ 2467{
2589 sint16 dx, dy; 2468 sint16 dx, dy;
2590 int 2469 int
2591 mflags; 2470 mflags;
2592 2471
2641 * create clone from object to another 2520 * create clone from object to another
2642 */ 2521 */
2643object * 2522object *
2644object_create_clone (object *asrc) 2523object_create_clone (object *asrc)
2645{ 2524{
2646 object *
2647 dst = NULL, *tmp, *src, *part, *prev, *item; 2525 object *dst = 0, *tmp, *src, *part, *prev, *item;
2648 2526
2649 if (!asrc) 2527 if (!asrc)
2650 return NULL; 2528 return 0;
2529
2651 src = asrc; 2530 src = asrc;
2652 if (src->head) 2531 if (src->head)
2653 src = src->head; 2532 src = src->head;
2654 2533
2655 prev = NULL; 2534 prev = 0;
2656 for (part = src; part; part = part->more) 2535 for (part = src; part; part = part->more)
2657 { 2536 {
2658 tmp = get_object (); 2537 tmp = get_object ();
2659 copy_object (part, tmp); 2538 copy_object (part, tmp);
2660 tmp->x -= src->x; 2539 tmp->x -= src->x;
2661 tmp->y -= src->y; 2540 tmp->y -= src->y;
2541
2662 if (!part->head) 2542 if (!part->head)
2663 { 2543 {
2664 dst = tmp; 2544 dst = tmp;
2665 tmp->head = NULL; 2545 tmp->head = 0;
2666 } 2546 }
2667 else 2547 else
2668 { 2548 {
2669 tmp->head = dst; 2549 tmp->head = dst;
2670 } 2550 }
2551
2671 tmp->more = NULL; 2552 tmp->more = 0;
2553
2672 if (prev) 2554 if (prev)
2673 prev->more = tmp; 2555 prev->more = tmp;
2556
2674 prev = tmp; 2557 prev = tmp;
2675 } 2558 }
2676 2559
2677 /*** copy inventory ***/
2678 for (item = src->inv; item; item = item->below) 2560 for (item = src->inv; item; item = item->below)
2679 {
2680 (void) insert_ob_in_ob (object_create_clone (item), dst); 2561 insert_ob_in_ob (object_create_clone (item), dst);
2681 }
2682 2562
2683 return dst; 2563 return dst;
2684} 2564}
2685 2565
2686/* return true if the object was destroyed, 0 otherwise */
2687int
2688was_destroyed (const object *op, tag_t old_tag)
2689{
2690 /* checking for FLAG_FREED isn't necessary, but makes this function more
2691 * robust */
2692 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2693}
2694
2695/* GROS - Creates an object using a string representing its content. */ 2566/* GROS - Creates an object using a string representing its content. */
2696
2697/* 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 */
2698
2699/* 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, */
2700
2701/* 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. */
2702
2703/* 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. */
2704
2705/* Also remember that multiparts objects are not supported for now. */ 2571/* Also remember that multiparts objects are not supported for now. */
2706 2572
2707object * 2573object *
2708load_object_str (const char *obstr) 2574load_object_str (const char *obstr)
2709{ 2575{
2710 object * 2576 object *op;
2711 op;
2712 char
2713 filename[MAX_BUF]; 2577 char filename[MAX_BUF];
2714 2578
2715 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2579 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716 2580
2717 FILE *
2718 tempfile = fopen (filename, "w"); 2581 FILE *tempfile = fopen (filename, "w");
2719 2582
2720 if (tempfile == NULL) 2583 if (tempfile == NULL)
2721 { 2584 {
2722 LOG (llevError, "Error - Unable to access load object temp file\n"); 2585 LOG (llevError, "Error - Unable to access load object temp file\n");
2723 return NULL; 2586 return NULL;
2724 }; 2587 }
2588
2725 fprintf (tempfile, obstr); 2589 fprintf (tempfile, obstr);
2726 fclose (tempfile); 2590 fclose (tempfile);
2727 2591
2728 op = get_object (); 2592 op = get_object ();
2729 2593
2743 * returns NULL if no match. 2607 * returns NULL if no match.
2744 */ 2608 */
2745object * 2609object *
2746find_obj_by_type_subtype (const object *who, int type, int subtype) 2610find_obj_by_type_subtype (const object *who, int type, int subtype)
2747{ 2611{
2748 object * 2612 object *tmp;
2749 tmp;
2750 2613
2751 for (tmp = who->inv; tmp; tmp = tmp->below) 2614 for (tmp = who->inv; tmp; tmp = tmp->below)
2752 if (tmp->type == type && tmp->subtype == subtype) 2615 if (tmp->type == type && tmp->subtype == subtype)
2753 return tmp; 2616 return tmp;
2754 2617
2762 * do the desired thing. 2625 * do the desired thing.
2763 */ 2626 */
2764key_value * 2627key_value *
2765get_ob_key_link (const object *ob, const char *key) 2628get_ob_key_link (const object *ob, const char *key)
2766{ 2629{
2767 key_value * 2630 key_value *link;
2768 link;
2769 2631
2770 for (link = ob->key_values; link != NULL; link = link->next) 2632 for (link = ob->key_values; link != NULL; link = link->next)
2771 {
2772 if (link->key == key) 2633 if (link->key == key)
2773 {
2774 return link; 2634 return link;
2775 }
2776 }
2777 2635
2778 return NULL; 2636 return NULL;
2779} 2637}
2780 2638
2781/* 2639/*
2786 * The returned string is shared. 2644 * The returned string is shared.
2787 */ 2645 */
2788const char * 2646const char *
2789get_ob_key_value (const object *op, const char *const key) 2647get_ob_key_value (const object *op, const char *const key)
2790{ 2648{
2791 key_value * 2649 key_value *link;
2792 link; 2650 shstr_cmp canonical_key (key);
2793 const char *
2794 canonical_key;
2795 2651
2796 canonical_key = shstr::find (key);
2797
2798 if (canonical_key == NULL) 2652 if (!canonical_key)
2799 { 2653 {
2800 /* 1. There being a field named key on any object 2654 /* 1. There being a field named key on any object
2801 * implies there'd be a shared string to find. 2655 * implies there'd be a shared string to find.
2802 * 2. Since there isn't, no object has this field. 2656 * 2. Since there isn't, no object has this field.
2803 * 3. Therefore, *this* object doesn't have this field. 2657 * 3. Therefore, *this* object doesn't have this field.
2804 */ 2658 */
2805 return NULL; 2659 return 0;
2806 } 2660 }
2807 2661
2808 /* This is copied from get_ob_key_link() above - 2662 /* This is copied from get_ob_key_link() above -
2809 * only 4 lines, and saves the function call overhead. 2663 * only 4 lines, and saves the function call overhead.
2810 */ 2664 */
2811 for (link = op->key_values; link != NULL; link = link->next) 2665 for (link = op->key_values; link; link = link->next)
2812 {
2813 if (link->key == canonical_key) 2666 if (link->key == canonical_key)
2814 {
2815 return link->value; 2667 return link->value;
2816 } 2668
2817 }
2818 return NULL; 2669 return 0;
2819} 2670}
2820 2671
2821 2672
2822/* 2673/*
2823 * Updates the canonical_key in op to value. 2674 * Updates the canonical_key in op to value.
2908{ 2759{
2909 shstr key_ (key); 2760 shstr key_ (key);
2910 2761
2911 return set_ob_key_value_s (op, key_, value, add_key); 2762 return set_ob_key_value_s (op, key_, value, add_key);
2912} 2763}
2764
2765object::depth_iterator::depth_iterator (object *container)
2766: iterator_base (container)
2767{
2768 while (item->inv)
2769 item = item->inv;
2770}
2771
2772void
2773object::depth_iterator::next ()
2774{
2775 if (item->below)
2776 {
2777 item = item->below;
2778
2779 while (item->inv)
2780 item = item->inv;
2781 }
2782 else
2783 item = item->env;
2784}
2785
2786// return a suitable string describing an objetc in enough detail to find it
2787const char *
2788object::debug_desc (char *info) const
2789{
2790 char info2[256 * 3];
2791 char *p = info;
2792
2793 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2794 count,
2795 &name,
2796 title ? " " : "",
2797 title ? (const char *)title : "");
2798
2799 if (env)
2800 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2801
2802 if (map)
2803 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2804
2805 return info;
2806}
2807
2808const char *
2809object::debug_desc () const
2810{
2811 static char info[256 * 3];
2812 return debug_desc (info);
2813}
2814

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines