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.66 by root, Wed Dec 13 03:28:42 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};
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};
55 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}
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{
60 key_value *wants_field; 136 key_value *wants_field;
107 * 183 *
108 * Note that this function appears a lot longer than the macro it 184 * Note that this function appears a lot longer than the macro it
109 * replaces - this is mostly for clarity - a decent compiler should hopefully 185 * replaces - this is mostly for clarity - a decent compiler should hopefully
110 * reduce this to the same efficiency. 186 * reduce this to the same efficiency.
111 * 187 *
112 * Check nrof variable *before* calling CAN_MERGE() 188 * Check nrof variable *before* calling can_merge()
113 * 189 *
114 * Improvements made with merge: Better checking on potion, and also 190 * Improvements made with merge: Better checking on potion, and also
115 * check weight 191 * check weight
116 */ 192 */
117 193
118bool object::can_merge (object *ob1, object *ob2) 194bool object::can_merge_slow (object *ob1, object *ob2)
119{ 195{
120 /* A couple quicksanity checks */ 196 /* A couple quicksanity checks */
121 if ((ob1 == ob2) || (ob1->type != ob2->type)) 197 if (ob1 == ob2
198 || ob1->type != ob2->type
199 || ob1->speed != ob2->speed
200 || ob1->value != ob2->value
201 || ob1->name != ob2->name)
122 return 0; 202 return 0;
123 203
124 if (ob1->speed != ob2->speed) 204 //TODO: this ain't working well, use nicer and correct overflow check
125 return 0;
126
127 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
128 * value could not be stored in a sint32 (which unfortunately sometimes is 206 * value could not be stored in a sint32 (which unfortunately sometimes is
129 * used to store nrof). 207 * used to store nrof).
130 */ 208 */
131 if (ob1->nrof + ob2->nrof >= 1UL << 31) 209 if (ob1->nrof + ob2->nrof >= 1UL << 31)
184 /* if one object has inventory but the other doesn't, not equiv */ 262 /* if one object has inventory but the other doesn't, not equiv */
185 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186 return 0; 264 return 0;
187 265
188 /* Now check to see if the two inventory objects could merge */ 266 /* Now check to see if the two inventory objects could merge */
189 if (!CAN_MERGE (ob1->inv, ob2->inv)) 267 if (!object::can_merge (ob1->inv, ob2->inv))
190 return 0; 268 return 0;
191 269
192 /* inventory ok - still need to check rest of this object to see 270 /* inventory ok - still need to check rest of this object to see
193 * if it is valid. 271 * if it is valid.
194 */ 272 */
255 { 333 {
256 if (inv->inv) 334 if (inv->inv)
257 sum_weight (inv); 335 sum_weight (inv);
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 336 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 337 }
338
260 if (op->type == CONTAINER && op->stats.Str) 339 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 340 sum = (sum * (100 - op->stats.Str)) / 100;
341
262 if (op->carrying != sum) 342 if (op->carrying != sum)
263 op->carrying = sum; 343 op->carrying = sum;
344
264 return sum; 345 return sum;
265} 346}
266 347
267/** 348/**
268 * Return the outermost environment object for a given object. 349 * Return the outermost environment object for a given object.
295 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296 * Some error messages. 377 * Some error messages.
297 * The result of the dump is stored in the static global errmsg array. 378 * The result of the dump is stored in the static global errmsg array.
298 */ 379 */
299 380
300void 381char *
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) 382dump_object (object *op)
356{ 383{
357 if (op == NULL) 384 if (!op)
358 { 385 return strdup ("[NULLOBJ]");
359 strcpy (errmsg, "[NULL pointer]");
360 return;
361 }
362 errmsg[0] = '\0';
363 dump_object2 (op);
364}
365 386
366void 387 object_freezer freezer;
367dump_all_objects (void) 388 save_object (freezer, op, 3);
368{ 389 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} 390}
377 391
378/* 392/*
379 * get_nearest_part(multi-object, object 2) returns the part of the 393 * get_nearest_part(multi-object, object 2) returns the part of the
380 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
400 */ 414 */
401 415
402object * 416object *
403find_object (tag_t i) 417find_object (tag_t i)
404{ 418{
405 object *op; 419 for (object *op = object::first; op; op = op->next)
406
407 for (op = objects; op != NULL; op = op->next)
408 if (op->count == i) 420 if (op->count == i)
409 break; 421 return op;
422
410 return op; 423 return 0;
411} 424}
412 425
413/* 426/*
414 * Returns the first object which has a name equal to the argument. 427 * Returns the first object which has a name equal to the argument.
415 * Used only by the patch command, but not all that useful. 428 * Used only by the patch command, but not all that useful.
417 */ 430 */
418 431
419object * 432object *
420find_object_name (const char *str) 433find_object_name (const char *str)
421{ 434{
422 const char *name = shstr::find (str); 435 shstr_cmp str_ (str);
423 object *op; 436 object *op;
424 437
425 for (op = objects; op != NULL; op = op->next) 438 for (op = object::first; op != NULL; op = op->next)
426 if (&op->name == name) 439 if (op->name == str_)
427 break; 440 break;
428 441
429 return op; 442 return op;
430} 443}
431 444
434{ 447{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 448 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436} 449}
437 450
438/* 451/*
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 452 * Sets the owner and sets the skill and exp pointers to owner's current
478 * skill and experience objects. 453 * skill and experience objects.
479 */ 454 */
480void 455void
481set_owner (object *op, object *owner) 456object::set_owner (object *owner)
482{ 457{
483 if (owner == NULL || op == NULL) 458 if (!owner)
484 return; 459 return;
485 460
486 /* next line added to allow objects which own objects */ 461 /* next line added to allow objects which own objects */
487 /* Add a check for ownercounts in here, as I got into an endless loop 462 /* 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 463 * with the fireball owning a poison cloud which then owned the
489 * fireball. I believe that was caused by one of the objects getting 464 * fireball. I believe that was caused by one of the objects getting
490 * freed and then another object replacing it. Since the ownercounts 465 * 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. 466 * didn't match, this check is valid and I believe that cause is valid.
492 */ 467 */
493 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 468 while (owner->owner)
494 owner = owner->owner; 469 owner = owner->owner;
495 470
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; 471 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} 472}
536 473
537/* Zero the key_values on op, decrementing the shared-string 474/* Zero the key_values on op, decrementing the shared-string
538 * refcounts and freeing the links. 475 * refcounts and freeing the links.
539 */ 476 */
555{ 492{
556 attachable_base::clear (); 493 attachable_base::clear ();
557 494
558 free_key_values (this); 495 free_key_values (this);
559 496
560 clear_owner (this); 497 owner = 0;
561
562 name = 0; 498 name = 0;
563 name_pl = 0; 499 name_pl = 0;
564 title = 0; 500 title = 0;
565 race = 0; 501 race = 0;
566 slaying = 0; 502 slaying = 0;
567 skill = 0; 503 skill = 0;
568 msg = 0; 504 msg = 0;
569 lore = 0; 505 lore = 0;
570 custom_name = 0; 506 custom_name = 0;
571 materialname = 0; 507 materialname = 0;
508 contr = 0;
509 below = 0;
510 above = 0;
511 inv = 0;
512 container = 0;
513 env = 0;
514 more = 0;
515 head = 0;
516 map = 0;
517 active_next = 0;
518 active_prev = 0;
572 519
573 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); 520 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574 521
575 SET_FLAG (this, FLAG_REMOVED); 522 SET_FLAG (this, FLAG_REMOVED);
576}
577 523
578void object::clone (object *destination)
579{
580 *(object_copy *) destination = *this;
581 *(object_pod *) destination = *this;
582
583 if (self || cb)
584 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 */ 524 /* What is not cleared is next, prev, and count */
610 525
611 op->expmul = 1.0; 526 expmul = 1.0;
612 op->face = blank_face; 527 face = blank_face;
613 op->attacked_by_count = -1;
614 528
615 if (settings.casting_time) 529 if (settings.casting_time)
616 op->casting_time = -1; 530 casting_time = -1;
617} 531}
618 532
619/* 533/*
620 * copy object first frees everything allocated by the second object, 534 * copy_to first frees everything allocated by the dst object,
621 * and then copies the contends of the first object into the second 535 * and then copies the contents of itself into the second
622 * object, allocating what needs to be allocated. Basically, any 536 * object, allocating what needs to be allocated. Basically, any
623 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 537 * 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 538 * if the first object is freed, the pointers in the new object
625 * will point at garbage. 539 * will point at garbage.
626 */ 540 */
627
628void 541void
629copy_object (object *op2, object *op) 542object::copy_to (object *dst)
630{ 543{
631 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 544 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
632 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 545 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
633 546
634 op2->clone (op); 547 *(object_copy *)dst = *this;
548 *(object_pod *)dst = *this;
549
550 if (self || cb)
551 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
635 552
636 if (is_freed) 553 if (is_freed)
637 SET_FLAG (op, FLAG_FREED); 554 SET_FLAG (dst, FLAG_FREED);
555
638 if (is_removed) 556 if (is_removed)
639 SET_FLAG (op, FLAG_REMOVED); 557 SET_FLAG (dst, FLAG_REMOVED);
640 558
641 if (op2->speed < 0) 559 if (speed < 0)
642 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 560 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
643 561
644 /* Copy over key_values, if any. */ 562 /* Copy over key_values, if any. */
645 if (op2->key_values) 563 if (key_values)
646 { 564 {
647 key_value *tail = 0; 565 key_value *tail = 0;
648 key_value *i; 566 key_value *i;
649 567
650 op->key_values = 0; 568 dst->key_values = 0;
651 569
652 for (i = op2->key_values; i; i = i->next) 570 for (i = key_values; i; i = i->next)
653 { 571 {
654 key_value *new_link = new key_value; 572 key_value *new_link = new key_value;
655 573
656 new_link->next = 0; 574 new_link->next = 0;
657 new_link->key = i->key; 575 new_link->key = i->key;
658 new_link->value = i->value; 576 new_link->value = i->value;
659 577
660 /* Try and be clever here, too. */ 578 /* Try and be clever here, too. */
661 if (!op->key_values) 579 if (!dst->key_values)
662 { 580 {
663 op->key_values = new_link; 581 dst->key_values = new_link;
664 tail = new_link; 582 tail = new_link;
665 } 583 }
666 else 584 else
667 { 585 {
668 tail->next = new_link; 586 tail->next = new_link;
669 tail = new_link; 587 tail = new_link;
670 } 588 }
671 } 589 }
672 } 590 }
673 591
674 update_ob_speed (op); 592 update_ob_speed (dst);
593}
594
595object *
596object::clone ()
597{
598 object *neu = create ();
599 copy_to (neu);
600 return neu;
675} 601}
676 602
677/* 603/*
678 * If an object with the IS_TURNABLE() flag needs to be turned due 604 * If an object with the IS_TURNABLE() flag needs to be turned due
679 * to the closest player being on the other side, this function can 605 * to the closest player being on the other side, this function can
692/* 618/*
693 * Updates the speed of an object. If the speed changes from 0 to another 619 * 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. 620 * 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. 621 * This function needs to be called whenever the speed of an object changes.
696 */ 622 */
697
698void 623void
699update_ob_speed (object *op) 624update_ob_speed (object *op)
700{ 625{
701 extern int arch_init; 626 extern int arch_init;
702 627
711 abort (); 636 abort ();
712#else 637#else
713 op->speed = 0; 638 op->speed = 0;
714#endif 639#endif
715 } 640 }
641
716 if (arch_init) 642 if (arch_init)
717 {
718 return; 643 return;
719 } 644
720 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 645 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721 { 646 {
722 /* If already on active list, don't do anything */ 647 /* If already on active list, don't do anything */
723 if (op->active_next || op->active_prev || op == active_objects) 648 if (op->active_next || op->active_prev || op == active_objects)
724 return; 649 return;
725 650
726 /* process_events() expects us to insert the object at the beginning 651 /* process_events() expects us to insert the object at the beginning
727 * of the list. */ 652 * of the list. */
728 op->active_next = active_objects; 653 op->active_next = active_objects;
654
729 if (op->active_next != NULL) 655 if (op->active_next != NULL)
730 op->active_next->active_prev = op; 656 op->active_next->active_prev = op;
657
731 active_objects = op; 658 active_objects = op;
732 } 659 }
733 else 660 else
734 { 661 {
735 /* If not on the active list, nothing needs to be done */ 662 /* If not on the active list, nothing needs to be done */
737 return; 664 return;
738 665
739 if (op->active_prev == NULL) 666 if (op->active_prev == NULL)
740 { 667 {
741 active_objects = op->active_next; 668 active_objects = op->active_next;
669
742 if (op->active_next != NULL) 670 if (op->active_next != NULL)
743 op->active_next->active_prev = NULL; 671 op->active_next->active_prev = NULL;
744 } 672 }
745 else 673 else
746 { 674 {
747 op->active_prev->active_next = op->active_next; 675 op->active_prev->active_next = op->active_next;
676
748 if (op->active_next) 677 if (op->active_next)
749 op->active_next->active_prev = op->active_prev; 678 op->active_next->active_prev = op->active_prev;
750 } 679 }
680
751 op->active_next = NULL; 681 op->active_next = NULL;
752 op->active_prev = NULL; 682 op->active_prev = NULL;
753 } 683 }
754} 684}
755 685
880 update_now = 1; 810 update_now = 1;
881 811
882 if ((move_slow | op->move_slow) != move_slow) 812 if ((move_slow | op->move_slow) != move_slow)
883 update_now = 1; 813 update_now = 1;
884 } 814 }
815
885 /* if the object is being removed, we can't make intelligent 816 /* if the object is being removed, we can't make intelligent
886 * decisions, because remove_ob can't really pass the object 817 * decisions, because remove_ob can't really pass the object
887 * that is being removed. 818 * that is being removed.
888 */ 819 */
889 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
901 832
902 if (op->more != NULL) 833 if (op->more != NULL)
903 update_object (op->more, action); 834 update_object (op->more, action);
904} 835}
905 836
906static unordered_vector < object *>mortals; 837object::vector object::mortals;
907static 838object::vector object::objects; // not yet used
908std::vector < object *> 839object *object::first;
909 freed;
910 840
911void object::free_mortals () 841void object::free_mortals ()
912{ 842{
913 for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();) 843 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914 if (!(*i)->refcount) 844 if ((*i)->refcnt)
845 ++i; // further delay freeing
846 else
915 { 847 {
916 freed.push_back (*i); 848 delete *i;
917 mortals.erase (i); 849 mortals.erase (i);
918 } 850 }
919 else
920 ++i;
921} 851}
922 852
923object::object () 853object::object ()
924{ 854{
925 SET_FLAG (this, FLAG_REMOVED); 855 SET_FLAG (this, FLAG_REMOVED);
926 856
927 expmul = 1.0; 857 expmul = 1.0;
928 face = blank_face; 858 face = blank_face;
929 attacked_by_count = -1;
930} 859}
931 860
932object::~object () 861object::~object ()
933{ 862{
934 free_key_values (this); 863 free_key_values (this);
935} 864}
936 865
937void object::link () 866void object::link ()
938{ 867{
939 count = ++ob_count; 868 count = ++ob_count;
869 uuid = gen_uuid ();
940 870
941 prev = 0; 871 prev = 0;
942 next = objects; 872 next = object::first;
943 873
944 if (objects) 874 if (object::first)
945 objects->prev = this; 875 object::first->prev = this;
946 876
947 objects = this; 877 object::first = this;
948} 878}
949 879
950void object::unlink () 880void object::unlink ()
951{ 881{
952 count = 0; 882 if (this == object::first)
883 object::first = next;
953 884
954 /* Remove this object from the list of used objects */ 885 /* Remove this object from the list of used objects */
955 if (prev)
956 {
957 prev->next = next; 886 if (prev) prev->next = next;
887 if (next) next->prev = prev;
888
958 prev = 0; 889 prev = 0;
959 }
960
961 if (next)
962 {
963 next->prev = prev;
964 next = 0; 890 next = 0;
965 }
966
967 if (this == objects)
968 objects = next;
969} 891}
970 892
971object *object::create () 893object *object::create ()
972{ 894{
973 object *
974 op;
975
976 if (freed.empty ())
977 op = new object; 895 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 (); 896 op->link ();
989 return op; 897 return op;
990} 898}
991 899
992/* 900/*
994 * it from the list of used objects, and puts it on the list of 902 * 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. 903 * free objects. The IS_FREED() flag is set in the object.
996 * The object must have been removed by remove_ob() first for 904 * The object must have been removed by remove_ob() first for
997 * this function to succeed. 905 * this function to succeed.
998 * 906 *
999 * If free_inventory is set, free inventory as well. Else drop items in 907 * If destroy_inventory is set, free inventory as well. Else drop items in
1000 * inventory to the ground. 908 * inventory to the ground.
1001 */ 909 */
1002void object::free (bool free_inventory) 910void object::destroy (bool destroy_inventory)
1003{ 911{
1004 if (QUERY_FLAG (this, FLAG_FREED)) 912 if (QUERY_FLAG (this, FLAG_FREED))
1005 return; 913 return;
1006 914
1007 if (!QUERY_FLAG (this, FLAG_REMOVED))
1008 remove_ob (this);
1009
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 915 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011 remove_friendly_object (this); 916 remove_friendly_object (this);
1012 917
918 if (!QUERY_FLAG (this, FLAG_REMOVED))
919 remove ();
920
1013 SET_FLAG (this, FLAG_FREED); 921 SET_FLAG (this, FLAG_FREED);
1014 922
1015 if (more) 923 if (more)
1016 { 924 {
1017 more->free (free_inventory); 925 more->destroy (destroy_inventory);
1018 more = 0; 926 more = 0;
1019 } 927 }
1020 928
1021 if (inv) 929 if (inv)
1022 { 930 {
1023 /* Only if the space blocks everything do we not process - 931 /* Only if the space blocks everything do we not process -
1024 * if some form of movement is allowed, let objects 932 * if some form of movement is allowed, let objects
1025 * drop on that space. 933 * drop on that space.
1026 */ 934 */
1027 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) 935 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028 { 936 {
1029 object *op = inv; 937 object *op = inv;
1030 938
1031 while (op) 939 while (op)
1032 { 940 {
1033 object *tmp = op->below; 941 object *tmp = op->below;
1034 op->free (free_inventory); 942 op->destroy (destroy_inventory);
1035 op = tmp; 943 op = tmp;
1036 } 944 }
1037 } 945 }
1038 else 946 else
1039 { /* Put objects in inventory onto this space */ 947 { /* Put objects in inventory onto this space */
1041 949
1042 while (op) 950 while (op)
1043 { 951 {
1044 object *tmp = op->below; 952 object *tmp = op->below;
1045 953
1046 remove_ob (op); 954 op->remove ();
1047 955
1048 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 956 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)) 957 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1050 free_object (op); 958 op->destroy ();
1051 else 959 else
1052 { 960 {
1053 op->x = x; 961 op->x = x;
1054 op->y = y; 962 op->y = y;
1055 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 963 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1058 op = tmp; 966 op = tmp;
1059 } 967 }
1060 } 968 }
1061 } 969 }
1062 970
1063 clear_owner (this); 971 // hack to ensure that freed objects still have a valid map
972 {
973 static maptile *freed_map; // freed objects are moved here to avoid crashes
974
975 if (!freed_map)
976 {
977 freed_map = new maptile;
978
979 freed_map->name = "/internal/freed_objects_map";
980 freed_map->width = 3;
981 freed_map->height = 3;
982
983 freed_map->allocate ();
984 }
985
986 map = freed_map;
987 x = 1;
988 y = 1;
989 }
990
991 // clear those pointers that likely might have circular references to us
992 owner = 0;
993 enemy = 0;
994 attacked_by = 0;
995
996 // only relevant for players(?), but make sure of it anyways
997 contr = 0;
1064 998
1065 /* Remove object from the active list */ 999 /* Remove object from the active list */
1066 speed = 0; 1000 speed = 0;
1067 update_ob_speed (this); 1001 update_ob_speed (this);
1068 1002
1073 1007
1074/* 1008/*
1075 * sub_weight() recursively (outwards) subtracts a number from the 1009 * sub_weight() recursively (outwards) subtracts a number from the
1076 * weight of an object (and what is carried by it's environment(s)). 1010 * weight of an object (and what is carried by it's environment(s)).
1077 */ 1011 */
1078
1079void 1012void
1080sub_weight (object *op, signed long weight) 1013sub_weight (object *op, signed long weight)
1081{ 1014{
1082 while (op != NULL) 1015 while (op != NULL)
1083 { 1016 {
1084 if (op->type == CONTAINER) 1017 if (op->type == CONTAINER)
1085 {
1086 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1018 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087 } 1019
1088 op->carrying -= weight; 1020 op->carrying -= weight;
1089 op = op->env; 1021 op = op->env;
1090 } 1022 }
1091} 1023}
1092 1024
1093/* remove_ob(op): 1025/* op->remove ():
1094 * This function removes the object op from the linked list of objects 1026 * 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 1027 * which it is currently tied to. When this function is done, the
1096 * object will have no environment. If the object previously had an 1028 * object will have no environment. If the object previously had an
1097 * environment, the x and y coordinates will be updated to 1029 * environment, the x and y coordinates will be updated to
1098 * the previous environment. 1030 * the previous environment.
1099 * Beware: This function is called from the editor as well! 1031 * Beware: This function is called from the editor as well!
1100 */ 1032 */
1101
1102void 1033void
1103remove_ob (object *op) 1034object::remove ()
1104{ 1035{
1036 object *tmp, *last = 0;
1105 object * 1037 object *otmp;
1106 tmp, *
1107 last = NULL;
1108 object *
1109 otmp;
1110 1038
1111 tag_t
1112 tag;
1113 int
1114 check_walk_off; 1039 int check_walk_off;
1115 mapstruct *
1116 m;
1117 1040
1118 sint16
1119 x,
1120 y;
1121
1122 if (QUERY_FLAG (op, FLAG_REMOVED)) 1041 if (QUERY_FLAG (this, FLAG_REMOVED))
1123 return; 1042 return;
1124 1043
1125 SET_FLAG (op, FLAG_REMOVED); 1044 SET_FLAG (this, FLAG_REMOVED);
1126 1045
1127 if (op->more != NULL) 1046 if (more)
1128 remove_ob (op->more); 1047 more->remove ();
1129 1048
1130 /* 1049 /*
1131 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1132 * inventory. 1051 * inventory.
1133 */ 1052 */
1134 if (op->env != NULL) 1053 if (env)
1135 { 1054 {
1136 if (op->nrof) 1055 if (nrof)
1137 sub_weight (op->env, op->weight * op->nrof); 1056 sub_weight (env, weight * nrof);
1138 else 1057 else
1139 sub_weight (op->env, op->weight + op->carrying); 1058 sub_weight (env, weight + carrying);
1140 1059
1141 /* NO_FIX_PLAYER is set when a great many changes are being 1060 /* NO_FIX_PLAYER is set when a great many changes are being
1142 * made to players inventory. If set, avoiding the call 1061 * made to players inventory. If set, avoiding the call
1143 * to save cpu time. 1062 * to save cpu time.
1144 */ 1063 */
1145 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1064 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1146 fix_player (otmp); 1065 fix_player (otmp);
1147 1066
1148 if (op->above != NULL) 1067 if (above != NULL)
1149 op->above->below = op->below; 1068 above->below = below;
1150 else 1069 else
1151 op->env->inv = op->below; 1070 env->inv = below;
1152 1071
1153 if (op->below != NULL) 1072 if (below != NULL)
1154 op->below->above = op->above; 1073 below->above = above;
1155 1074
1156 /* we set up values so that it could be inserted into 1075 /* we set up values so that it could be inserted into
1157 * the map, but we don't actually do that - it is up 1076 * the map, but we don't actually do that - it is up
1158 * to the caller to decide what we want to do. 1077 * to the caller to decide what we want to do.
1159 */ 1078 */
1160 op->x = op->env->x, op->y = op->env->y; 1079 x = env->x, y = env->y;
1161 op->map = op->env->map; 1080 map = env->map;
1162 op->above = NULL, op->below = NULL; 1081 above = 0, below = 0;
1163 op->env = NULL; 1082 env = 0;
1164 } 1083 }
1165 else if (op->map) 1084 else if (map)
1166 { 1085 {
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 1086 /* Re did the following section of code - it looks like it had
1187 * lots of logic for things we no longer care about 1087 * lots of logic for things we no longer care about
1188 */ 1088 */
1189 1089
1190 /* link the object above us */ 1090 /* link the object above us */
1191 if (op->above) 1091 if (above)
1192 op->above->below = op->below; 1092 above->below = below;
1193 else 1093 else
1194 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1094 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1195 1095
1196 /* Relink the object below us, if there is one */ 1096 /* Relink the object below us, if there is one */
1197 if (op->below) 1097 if (below)
1198 op->below->above = op->above; 1098 below->above = above;
1199 else 1099 else
1200 { 1100 {
1201 /* Nothing below, which means we need to relink map object for this space 1101 /* 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 1102 * use translated coordinates in case some oddness with map tiling is
1203 * evident 1103 * evident
1204 */ 1104 */
1205 if (GET_MAP_OB (m, x, y) != op) 1105 if (GET_MAP_OB (map, x, y) != this)
1206 { 1106 {
1207 dump_object (op); 1107 char *dump = dump_object (this);
1208 LOG (llevError, 1108 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); 1109 "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);
1110 free (dump);
1210 dump_object (GET_MAP_OB (m, x, y)); 1111 dump = dump_object (GET_MAP_OB (map, x, y));
1211 LOG (llevError, "%s\n", errmsg); 1112 LOG (llevError, "%s\n", dump);
1113 free (dump);
1212 } 1114 }
1213 1115
1214 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1116 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1215 } 1117 }
1216 1118
1217 op->above = 0; 1119 above = 0;
1218 op->below = 0; 1120 below = 0;
1219 1121
1220 if (op->map->in_memory == MAP_SAVING) 1122 if (map->in_memory == MAP_SAVING)
1221 return; 1123 return;
1222 1124
1223 tag = op->count;
1224 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1125 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1225 1126
1226 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1127 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1227 { 1128 {
1228 /* No point updating the players look faces if he is the object 1129 /* No point updating the players look faces if he is the object
1229 * being removed. 1130 * being removed.
1230 */ 1131 */
1231 1132
1232 if (tmp->type == PLAYER && tmp != op) 1133 if (tmp->type == PLAYER && tmp != this)
1233 { 1134 {
1234 /* If a container that the player is currently using somehow gets 1135 /* If a container that the player is currently using somehow gets
1235 * removed (most likely destroyed), update the player view 1136 * removed (most likely destroyed), update the player view
1236 * appropriately. 1137 * appropriately.
1237 */ 1138 */
1238 if (tmp->container == op) 1139 if (tmp->container == this)
1239 { 1140 {
1240 CLEAR_FLAG (op, FLAG_APPLIED); 1141 CLEAR_FLAG (this, FLAG_APPLIED);
1241 tmp->container = NULL; 1142 tmp->container = 0;
1242 } 1143 }
1243 1144
1244 tmp->contr->socket.update_look = 1; 1145 tmp->contr->socket.update_look = 1;
1245 } 1146 }
1246 1147
1247 /* See if player moving off should effect something */ 1148 /* 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)) 1149 if (check_walk_off
1150 && ((move_type & tmp->move_off)
1151 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249 { 1152 {
1250 move_apply (tmp, op, NULL); 1153 move_apply (tmp, this, 0);
1251 1154
1252 if (was_destroyed (op, tag)) 1155 if (destroyed ())
1253 {
1254 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1156 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255 }
1256 } 1157 }
1257 1158
1258 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1159 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259 1160
1260 if (tmp->above == tmp) 1161 if (tmp->above == tmp)
1261 tmp->above = NULL; 1162 tmp->above = 0;
1262 1163
1263 last = tmp; 1164 last = tmp;
1264 } 1165 }
1265 1166
1266 /* last == NULL of there are no objects on this space */ 1167 /* last == NULL of there are no objects on this space */
1267 if (last == NULL) 1168 if (!last)
1268 { 1169 {
1269 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1171 * 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 1172 * those out anyways, and if there are any flags set right now, they won't
1272 * be correct anyways. 1173 * be correct anyways.
1273 */ 1174 */
1274 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1175 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1275 update_position (op->map, op->x, op->y); 1176 update_position (map, x, y);
1276 } 1177 }
1277 else 1178 else
1278 update_object (last, UP_OBJ_REMOVE); 1179 update_object (last, UP_OBJ_REMOVE);
1279 1180
1280 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1181 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1281 update_all_los (op->map, op->x, op->y); 1182 update_all_los (map, x, y);
1282 } 1183 }
1283} 1184}
1284 1185
1285/* 1186/*
1286 * merge_ob(op,top): 1187 * merge_ob(op,top):
1288 * This function goes through all objects below and including top, and 1189 * This function goes through all objects below and including top, and
1289 * merges op to the first matching object. 1190 * merges op to the first matching object.
1290 * If top is NULL, it is calculated. 1191 * If top is NULL, it is calculated.
1291 * Returns pointer to object if it succeded in the merge, otherwise NULL 1192 * Returns pointer to object if it succeded in the merge, otherwise NULL
1292 */ 1193 */
1293
1294object * 1194object *
1295merge_ob (object *op, object *top) 1195merge_ob (object *op, object *top)
1296{ 1196{
1297 if (!op->nrof) 1197 if (!op->nrof)
1298 return 0; 1198 return 0;
1302 1202
1303 for (; top != NULL; top = top->below) 1203 for (; top != NULL; top = top->below)
1304 { 1204 {
1305 if (top == op) 1205 if (top == op)
1306 continue; 1206 continue;
1307 if (CAN_MERGE (op, top)) 1207
1208 if (object::can_merge (op, top))
1308 { 1209 {
1309 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1310 1211
1311/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312 op->weight = 0; /* Don't want any adjustements now */ 1213 op->weight = 0; /* Don't want any adjustements now */
1313 remove_ob (op); 1214 op->destroy ();
1314 free_object (op);
1315 return top; 1215 return top;
1316 } 1216 }
1317 } 1217 }
1318 1218
1319 return NULL; 1219 return 0;
1320} 1220}
1321 1221
1322/* 1222/*
1323 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1223 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1324 * job preparing multi-part monsters 1224 * job preparing multi-part monsters
1325 */ 1225 */
1326object * 1226object *
1327insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1227insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328{ 1228{
1329 object *tmp; 1229 object *tmp;
1330 1230
1331 if (op->head) 1231 if (op->head)
1332 op = op->head; 1232 op = op->head;
1360 * NULL if 'op' was destroyed 1260 * NULL if 'op' was destroyed
1361 * just 'op' otherwise 1261 * just 'op' otherwise
1362 */ 1262 */
1363 1263
1364object * 1264object *
1365insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1265insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366{ 1266{
1367 object *tmp, *top, *floor = NULL; 1267 object *tmp, *top, *floor = NULL;
1368 sint16 x, y; 1268 sint16 x, y;
1369 1269
1370 if (QUERY_FLAG (op, FLAG_FREED)) 1270 if (QUERY_FLAG (op, FLAG_FREED))
1373 return NULL; 1273 return NULL;
1374 } 1274 }
1375 1275
1376 if (m == NULL) 1276 if (m == NULL)
1377 { 1277 {
1378 dump_object (op); 1278 char *dump = dump_object (op);
1379 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1279 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1280 free (dump);
1380 return op; 1281 return op;
1381 } 1282 }
1382 1283
1383 if (out_of_map (m, op->x, op->y)) 1284 if (out_of_map (m, op->x, op->y))
1384 { 1285 {
1385 dump_object (op); 1286 char *dump = dump_object (op);
1386 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1287 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1387#ifdef MANY_CORES 1288#ifdef MANY_CORES
1388 /* Better to catch this here, as otherwise the next use of this object 1289 /* 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 1290 * is likely to cause a crash. Better to find out where it is getting
1390 * improperly inserted. 1291 * improperly inserted.
1391 */ 1292 */
1392 abort (); 1293 abort ();
1393#endif 1294#endif
1295 free (dump);
1394 return op; 1296 return op;
1395 } 1297 }
1396 1298
1397 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1299 if (!QUERY_FLAG (op, FLAG_REMOVED))
1398 { 1300 {
1399 dump_object (op); 1301 char *dump = dump_object (op);
1400 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1302 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1303 free (dump);
1401 return op; 1304 return op;
1402 } 1305 }
1403 1306
1404 if (op->more != NULL) 1307 if (op->more != NULL)
1405 { 1308 {
1443 1346
1444 /* this has to be done after we translate the coordinates. 1347 /* this has to be done after we translate the coordinates.
1445 */ 1348 */
1446 if (op->nrof && !(flag & INS_NO_MERGE)) 1349 if (op->nrof && !(flag & INS_NO_MERGE))
1447 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1350 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1448 if (CAN_MERGE (op, tmp)) 1351 if (object::can_merge (op, tmp))
1449 { 1352 {
1450 op->nrof += tmp->nrof; 1353 op->nrof += tmp->nrof;
1451 remove_ob (tmp); 1354 tmp->destroy ();
1452 free_object (tmp);
1453 } 1355 }
1454 1356
1455 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1357 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1456 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1358 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457 1359
1643 tmp1; 1545 tmp1;
1644 1546
1645 /* first search for itself and remove any old instances */ 1547 /* first search for itself and remove any old instances */
1646 1548
1647 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1549 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1648 {
1649 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1550 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1650 { 1551 tmp->destroy ();
1651 remove_ob (tmp);
1652 free_object (tmp);
1653 }
1654 }
1655 1552
1656 tmp1 = arch_to_object (find_archetype (arch_string)); 1553 tmp1 = arch_to_object (archetype::find (arch_string));
1657 1554
1658 tmp1->x = op->x; 1555 tmp1->x = op->x;
1659 tmp1->y = op->y; 1556 tmp1->y = op->y;
1660 insert_ob_in_map (tmp1, op->map, op, 0); 1557 insert_ob_in_map (tmp1, op->map, op, 0);
1661} 1558}
1669 */ 1566 */
1670 1567
1671object * 1568object *
1672get_split_ob (object *orig_ob, uint32 nr) 1569get_split_ob (object *orig_ob, uint32 nr)
1673{ 1570{
1674 object * 1571 object *newob;
1675 newob;
1676 int
1677 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1572 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1678 1573
1679 if (orig_ob->nrof < nr) 1574 if (orig_ob->nrof < nr)
1680 { 1575 {
1681 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1576 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1682 return NULL; 1577 return NULL;
1683 } 1578 }
1684 1579
1685 newob = object_create_clone (orig_ob); 1580 newob = object_create_clone (orig_ob);
1686 1581
1687 if ((orig_ob->nrof -= nr) < 1) 1582 if ((orig_ob->nrof -= nr) < 1)
1688 { 1583 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) 1584 else if (!is_removed)
1694 { 1585 {
1695 if (orig_ob->env != NULL) 1586 if (orig_ob->env != NULL)
1696 sub_weight (orig_ob->env, orig_ob->weight * nr); 1587 sub_weight (orig_ob->env, orig_ob->weight * nr);
1697 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1588 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1761 esrv_send_item (tmp, op); 1652 esrv_send_item (tmp, op);
1762 } 1653 }
1763 } 1654 }
1764 else 1655 else
1765 { 1656 {
1766 remove_ob (op); 1657 op->remove ();
1767 op->nrof = 0; 1658 op->nrof = 0;
1768 if (tmp) 1659 if (tmp)
1769 { 1660 {
1770 esrv_del_item (tmp->contr, op->count); 1661 esrv_del_item (tmp->contr, op->count);
1771 } 1662 }
1777 1668
1778 if (i < op->nrof) 1669 if (i < op->nrof)
1779 op->nrof -= i; 1670 op->nrof -= i;
1780 else 1671 else
1781 { 1672 {
1782 remove_ob (op); 1673 op->remove ();
1783 op->nrof = 0; 1674 op->nrof = 0;
1784 } 1675 }
1785 1676
1786 /* Since we just removed op, op->above is null */ 1677 /* Since we just removed op, op->above is null */
1787 for (tmp = above; tmp != NULL; tmp = tmp->above) 1678 for (tmp = above; tmp != NULL; tmp = tmp->above)
1796 1687
1797 if (op->nrof) 1688 if (op->nrof)
1798 return op; 1689 return op;
1799 else 1690 else
1800 { 1691 {
1801 free_object (op); 1692 op->destroy ();
1802 return NULL; 1693 return NULL;
1803 } 1694 }
1804} 1695}
1805 1696
1806/* 1697/*
1819 op->carrying += weight; 1710 op->carrying += weight;
1820 op = op->env; 1711 op = op->env;
1821 } 1712 }
1822} 1713}
1823 1714
1715object *
1716insert_ob_in_ob (object *op, object *where)
1717{
1718 if (!where)
1719 {
1720 char *dump = dump_object (op);
1721 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1722 free (dump);
1723 return op;
1724 }
1725
1726 if (where->head)
1727 {
1728 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1729 where = where->head;
1730 }
1731
1732 return where->insert (op);
1733}
1734
1824/* 1735/*
1825 * insert_ob_in_ob(op,environment): 1736 * env->insert (op)
1826 * This function inserts the object op in the linked list 1737 * This function inserts the object op in the linked list
1827 * inside the object environment. 1738 * inside the object environment.
1828 * 1739 *
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 1740 * The function returns now pointer to inserted item, and return value can
1835 * be != op, if items are merged. -Tero 1741 * be != op, if items are merged. -Tero
1836 */ 1742 */
1837 1743
1838object * 1744object *
1839insert_ob_in_ob (object *op, object *where) 1745object::insert (object *op)
1840{ 1746{
1841 object * 1747 object *tmp, *otmp;
1842 tmp, *
1843 otmp;
1844 1748
1845 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1749 if (!QUERY_FLAG (op, FLAG_REMOVED))
1846 { 1750 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 1751
1865 if (op->more) 1752 if (op->more)
1866 { 1753 {
1867 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1754 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1868 return op; 1755 return op;
1870 1757
1871 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1758 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872 CLEAR_FLAG (op, FLAG_REMOVED); 1759 CLEAR_FLAG (op, FLAG_REMOVED);
1873 if (op->nrof) 1760 if (op->nrof)
1874 { 1761 {
1875 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1762 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876 if (CAN_MERGE (tmp, op)) 1763 if (object::can_merge (tmp, op))
1877 { 1764 {
1878 /* return the original object and remove inserted object 1765 /* return the original object and remove inserted object
1879 (client needs the original object) */ 1766 (client needs the original object) */
1880 tmp->nrof += op->nrof; 1767 tmp->nrof += op->nrof;
1881 /* Weight handling gets pretty funky. Since we are adding to 1768 /* Weight handling gets pretty funky. Since we are adding to
1882 * tmp->nrof, we need to increase the weight. 1769 * tmp->nrof, we need to increase the weight.
1883 */ 1770 */
1884 add_weight (where, op->weight * op->nrof); 1771 add_weight (this, op->weight * op->nrof);
1885 SET_FLAG (op, FLAG_REMOVED); 1772 SET_FLAG (op, FLAG_REMOVED);
1886 free_object (op); /* free the inserted object */ 1773 op->destroy (); /* free the inserted object */
1887 op = tmp; 1774 op = tmp;
1888 remove_ob (op); /* and fix old object's links */ 1775 op->remove (); /* and fix old object's links */
1889 CLEAR_FLAG (op, FLAG_REMOVED); 1776 CLEAR_FLAG (op, FLAG_REMOVED);
1890 break; 1777 break;
1891 } 1778 }
1892 1779
1893 /* I assume combined objects have no inventory 1780 /* I assume combined objects have no inventory
1894 * We add the weight - this object could have just been removed 1781 * We add the weight - this object could have just been removed
1895 * (if it was possible to merge). calling remove_ob will subtract 1782 * (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 1783 * the weight, so we need to add it in again, since we actually do
1897 * the linking below 1784 * the linking below
1898 */ 1785 */
1899 add_weight (where, op->weight * op->nrof); 1786 add_weight (this, op->weight * op->nrof);
1900 } 1787 }
1901 else 1788 else
1902 add_weight (where, (op->weight + op->carrying)); 1789 add_weight (this, (op->weight + op->carrying));
1903 1790
1904 otmp = is_player_inv (where); 1791 otmp = is_player_inv (this);
1905 if (otmp && otmp->contr != NULL) 1792 if (otmp && otmp->contr)
1906 {
1907 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1793 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908 fix_player (otmp); 1794 fix_player (otmp);
1909 }
1910 1795
1911 op->map = NULL; 1796 op->map = NULL;
1912 op->env = where; 1797 op->env = this;
1913 op->above = NULL; 1798 op->above = NULL;
1914 op->below = NULL; 1799 op->below = NULL;
1915 op->x = 0, op->y = 0; 1800 op->x = 0, op->y = 0;
1916 1801
1917 /* reset the light list and los of the players on the map */ 1802 /* reset the light list and los of the players on the map */
1918 if ((op->glow_radius != 0) && where->map) 1803 if ((op->glow_radius != 0) && map)
1919 { 1804 {
1920#ifdef DEBUG_LIGHTS 1805#ifdef DEBUG_LIGHTS
1921 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1806 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1922#endif /* DEBUG_LIGHTS */ 1807#endif /* DEBUG_LIGHTS */
1923 if (MAP_DARKNESS (where->map)) 1808 if (MAP_DARKNESS (map))
1924 update_all_los (where->map, where->x, where->y); 1809 update_all_los (map, x, y);
1925 } 1810 }
1926 1811
1927 /* Client has no idea of ordering so lets not bother ordering it here. 1812 /* Client has no idea of ordering so lets not bother ordering it here.
1928 * It sure simplifies this function... 1813 * It sure simplifies this function...
1929 */ 1814 */
1930 if (where->inv == NULL) 1815 if (!inv)
1931 where->inv = op; 1816 inv = op;
1932 else 1817 else
1933 { 1818 {
1934 op->below = where->inv; 1819 op->below = inv;
1935 op->below->above = op; 1820 op->below->above = op;
1936 where->inv = op; 1821 inv = op;
1937 } 1822 }
1823
1938 return op; 1824 return op;
1939} 1825}
1940 1826
1941/* 1827/*
1942 * Checks if any objects has a move_type that matches objects 1828 * Checks if any objects has a move_type that matches objects
1960 */ 1846 */
1961 1847
1962int 1848int
1963check_move_on (object *op, object *originator) 1849check_move_on (object *op, object *originator)
1964{ 1850{
1965 object * 1851 object *tmp;
1966 tmp; 1852 maptile *m = op->map;
1967 tag_t
1968 tag;
1969 mapstruct *
1970 m = op->map;
1971 int
1972 x = op->x, y = op->y; 1853 int x = op->x, y = op->y;
1973 1854
1974 MoveType 1855 MoveType move_on, move_slow, move_block;
1975 move_on,
1976 move_slow,
1977 move_block;
1978 1856
1979 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1857 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980 return 0; 1858 return 0;
1981
1982 tag = op->count;
1983 1859
1984 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1860 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); 1861 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); 1862 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987 1863
2048 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1924 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)) 1925 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050 { 1926 {
2051 move_apply (tmp, op, originator); 1927 move_apply (tmp, op, originator);
2052 1928
2053 if (was_destroyed (op, tag)) 1929 if (op->destroyed ())
2054 return 1; 1930 return 1;
2055 1931
2056 /* what the person/creature stepped onto has moved the object 1932 /* what the person/creature stepped onto has moved the object
2057 * someplace new. Don't process any further - if we did, 1933 * someplace new. Don't process any further - if we did,
2058 * have a feeling strange problems would result. 1934 * have a feeling strange problems would result.
2070 * a matching archetype at the given map and coordinates. 1946 * a matching archetype at the given map and coordinates.
2071 * The first matching object is returned, or NULL if none. 1947 * The first matching object is returned, or NULL if none.
2072 */ 1948 */
2073 1949
2074object * 1950object *
2075present_arch (const archetype *at, mapstruct *m, int x, int y) 1951present_arch (const archetype *at, maptile *m, int x, int y)
2076{ 1952{
2077 object * 1953 object *
2078 tmp; 1954 tmp;
2079 1955
2080 if (m == NULL || out_of_map (m, x, y)) 1956 if (m == NULL || out_of_map (m, x, y))
2093 * a matching type variable at the given map and coordinates. 1969 * a matching type variable at the given map and coordinates.
2094 * The first matching object is returned, or NULL if none. 1970 * The first matching object is returned, or NULL if none.
2095 */ 1971 */
2096 1972
2097object * 1973object *
2098present (unsigned char type, mapstruct *m, int x, int y) 1974present (unsigned char type, maptile *m, int x, int y)
2099{ 1975{
2100 object * 1976 object *
2101 tmp; 1977 tmp;
2102 1978
2103 if (out_of_map (m, x, y)) 1979 if (out_of_map (m, x, y))
2243 * the archetype because that isn't correct if the monster has been 2119 * the archetype because that isn't correct if the monster has been
2244 * customized, changed states, etc. 2120 * customized, changed states, etc.
2245 */ 2121 */
2246 2122
2247int 2123int
2248find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2124find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249{ 2125{
2250 int 2126 int
2251 i, 2127 i,
2252 index = 0, flag; 2128 index = 0, flag;
2253 static int 2129 static int
2274 return -1; 2150 return -1;
2275 return altern[RANDOM () % index]; 2151 return altern[RANDOM () % index];
2276} 2152}
2277 2153
2278/* 2154/*
2279 * find_first_free_spot(archetype, mapstruct, x, y) works like 2155 * find_first_free_spot(archetype, maptile, x, y) works like
2280 * find_free_spot(), but it will search max number of squares. 2156 * find_free_spot(), but it will search max number of squares.
2281 * But it will return the first available spot, not a random choice. 2157 * 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. 2158 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2283 */ 2159 */
2284 2160
2285int 2161int
2286find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2162find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287{ 2163{
2288 int 2164 int
2289 i; 2165 i;
2290 2166
2291 for (i = 0; i < SIZEOFFREE; i++) 2167 for (i = 0; i < SIZEOFFREE; i++)
2355 * because we have to know what movement the thing looking to move 2231 * because we have to know what movement the thing looking to move
2356 * there is capable of. 2232 * there is capable of.
2357 */ 2233 */
2358 2234
2359int 2235int
2360find_dir (mapstruct *m, int x, int y, object *exclude) 2236find_dir (maptile *m, int x, int y, object *exclude)
2361{ 2237{
2362 int 2238 int
2363 i, 2239 i,
2364 max = SIZEOFFREE, mflags; 2240 max = SIZEOFFREE, mflags;
2365 2241
2366 sint16 nx, ny; 2242 sint16 nx, ny;
2367 object * 2243 object *
2368 tmp; 2244 tmp;
2369 mapstruct * 2245 maptile *
2370 mp; 2246 mp;
2371 2247
2372 MoveType blocked, move_type; 2248 MoveType blocked, move_type;
2373 2249
2374 if (exclude && exclude->head) 2250 if (exclude && exclude->head)
2582 * Modified to be map tile aware -.MSW 2458 * Modified to be map tile aware -.MSW
2583 */ 2459 */
2584 2460
2585 2461
2586int 2462int
2587can_see_monsterP (mapstruct *m, int x, int y, int dir) 2463can_see_monsterP (maptile *m, int x, int y, int dir)
2588{ 2464{
2589 sint16 dx, dy; 2465 sint16 dx, dy;
2590 int 2466 int
2591 mflags; 2467 mflags;
2592 2468
2641 * create clone from object to another 2517 * create clone from object to another
2642 */ 2518 */
2643object * 2519object *
2644object_create_clone (object *asrc) 2520object_create_clone (object *asrc)
2645{ 2521{
2646 object *
2647 dst = NULL, *tmp, *src, *part, *prev, *item; 2522 object *dst = 0, *tmp, *src, *part, *prev, *item;
2648 2523
2649 if (!asrc) 2524 if (!asrc)
2650 return NULL; 2525 return 0;
2526
2651 src = asrc; 2527 src = asrc;
2652 if (src->head) 2528 if (src->head)
2653 src = src->head; 2529 src = src->head;
2654 2530
2655 prev = NULL; 2531 prev = 0;
2656 for (part = src; part; part = part->more) 2532 for (part = src; part; part = part->more)
2657 { 2533 {
2658 tmp = get_object (); 2534 tmp = part->clone ();
2659 copy_object (part, tmp);
2660 tmp->x -= src->x; 2535 tmp->x -= src->x;
2661 tmp->y -= src->y; 2536 tmp->y -= src->y;
2537
2662 if (!part->head) 2538 if (!part->head)
2663 { 2539 {
2664 dst = tmp; 2540 dst = tmp;
2665 tmp->head = NULL; 2541 tmp->head = 0;
2666 } 2542 }
2667 else 2543 else
2668 { 2544 {
2669 tmp->head = dst; 2545 tmp->head = dst;
2670 } 2546 }
2547
2671 tmp->more = NULL; 2548 tmp->more = 0;
2549
2672 if (prev) 2550 if (prev)
2673 prev->more = tmp; 2551 prev->more = tmp;
2552
2674 prev = tmp; 2553 prev = tmp;
2675 } 2554 }
2676 2555
2677 /*** copy inventory ***/
2678 for (item = src->inv; item; item = item->below) 2556 for (item = src->inv; item; item = item->below)
2679 {
2680 (void) insert_ob_in_ob (object_create_clone (item), dst); 2557 insert_ob_in_ob (object_create_clone (item), dst);
2681 }
2682 2558
2683 return dst; 2559 return dst;
2684} 2560}
2685 2561
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. */ 2562/* 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 */ 2563/* 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, */ 2564/* 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. */ 2565/* 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. */ 2566/* Remember not to use load_object_str in a time-critical situation. */
2704
2705/* Also remember that multiparts objects are not supported for now. */ 2567/* Also remember that multiparts objects are not supported for now. */
2706 2568
2707object * 2569object *
2708load_object_str (const char *obstr) 2570load_object_str (const char *obstr)
2709{ 2571{
2710 object * 2572 object *op;
2711 op;
2712 char
2713 filename[MAX_BUF]; 2573 char filename[MAX_BUF];
2714 2574
2715 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2575 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716 2576
2717 FILE *
2718 tempfile = fopen (filename, "w"); 2577 FILE *tempfile = fopen (filename, "w");
2719 2578
2720 if (tempfile == NULL) 2579 if (tempfile == NULL)
2721 { 2580 {
2722 LOG (llevError, "Error - Unable to access load object temp file\n"); 2581 LOG (llevError, "Error - Unable to access load object temp file\n");
2723 return NULL; 2582 return NULL;
2724 }; 2583 }
2584
2725 fprintf (tempfile, obstr); 2585 fprintf (tempfile, obstr);
2726 fclose (tempfile); 2586 fclose (tempfile);
2727 2587
2728 op = get_object (); 2588 op = object::create ();
2729 2589
2730 object_thawer thawer (filename); 2590 object_thawer thawer (filename);
2731 2591
2732 if (thawer) 2592 if (thawer)
2733 load_object (thawer, op, 0); 2593 load_object (thawer, op, 0);
2743 * returns NULL if no match. 2603 * returns NULL if no match.
2744 */ 2604 */
2745object * 2605object *
2746find_obj_by_type_subtype (const object *who, int type, int subtype) 2606find_obj_by_type_subtype (const object *who, int type, int subtype)
2747{ 2607{
2748 object * 2608 object *tmp;
2749 tmp;
2750 2609
2751 for (tmp = who->inv; tmp; tmp = tmp->below) 2610 for (tmp = who->inv; tmp; tmp = tmp->below)
2752 if (tmp->type == type && tmp->subtype == subtype) 2611 if (tmp->type == type && tmp->subtype == subtype)
2753 return tmp; 2612 return tmp;
2754 2613
2762 * do the desired thing. 2621 * do the desired thing.
2763 */ 2622 */
2764key_value * 2623key_value *
2765get_ob_key_link (const object *ob, const char *key) 2624get_ob_key_link (const object *ob, const char *key)
2766{ 2625{
2767 key_value * 2626 key_value *link;
2768 link;
2769 2627
2770 for (link = ob->key_values; link != NULL; link = link->next) 2628 for (link = ob->key_values; link != NULL; link = link->next)
2771 {
2772 if (link->key == key) 2629 if (link->key == key)
2773 {
2774 return link; 2630 return link;
2775 }
2776 }
2777 2631
2778 return NULL; 2632 return NULL;
2779} 2633}
2780 2634
2781/* 2635/*
2786 * The returned string is shared. 2640 * The returned string is shared.
2787 */ 2641 */
2788const char * 2642const char *
2789get_ob_key_value (const object *op, const char *const key) 2643get_ob_key_value (const object *op, const char *const key)
2790{ 2644{
2791 key_value * 2645 key_value *link;
2792 link; 2646 shstr_cmp canonical_key (key);
2793 const char *
2794 canonical_key;
2795 2647
2796 canonical_key = shstr::find (key);
2797
2798 if (canonical_key == NULL) 2648 if (!canonical_key)
2799 { 2649 {
2800 /* 1. There being a field named key on any object 2650 /* 1. There being a field named key on any object
2801 * implies there'd be a shared string to find. 2651 * implies there'd be a shared string to find.
2802 * 2. Since there isn't, no object has this field. 2652 * 2. Since there isn't, no object has this field.
2803 * 3. Therefore, *this* object doesn't have this field. 2653 * 3. Therefore, *this* object doesn't have this field.
2804 */ 2654 */
2805 return NULL; 2655 return 0;
2806 } 2656 }
2807 2657
2808 /* This is copied from get_ob_key_link() above - 2658 /* This is copied from get_ob_key_link() above -
2809 * only 4 lines, and saves the function call overhead. 2659 * only 4 lines, and saves the function call overhead.
2810 */ 2660 */
2811 for (link = op->key_values; link != NULL; link = link->next) 2661 for (link = op->key_values; link; link = link->next)
2812 {
2813 if (link->key == canonical_key) 2662 if (link->key == canonical_key)
2814 {
2815 return link->value; 2663 return link->value;
2816 } 2664
2817 }
2818 return NULL; 2665 return 0;
2819} 2666}
2820 2667
2821 2668
2822/* 2669/*
2823 * Updates the canonical_key in op to value. 2670 * Updates the canonical_key in op to value.
2908{ 2755{
2909 shstr key_ (key); 2756 shstr key_ (key);
2910 2757
2911 return set_ob_key_value_s (op, key_, value, add_key); 2758 return set_ob_key_value_s (op, key_, value, add_key);
2912} 2759}
2760
2761object::depth_iterator::depth_iterator (object *container)
2762: iterator_base (container)
2763{
2764 while (item->inv)
2765 item = item->inv;
2766}
2767
2768void
2769object::depth_iterator::next ()
2770{
2771 if (item->below)
2772 {
2773 item = item->below;
2774
2775 while (item->inv)
2776 item = item->inv;
2777 }
2778 else
2779 item = item->env;
2780}
2781
2782// return a suitable string describing an objetc in enough detail to find it
2783const char *
2784object::debug_desc (char *info) const
2785{
2786 char info2[256 * 3];
2787 char *p = info;
2788
2789 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2790 count,
2791 &name,
2792 title ? " " : "",
2793 title ? (const char *)title : "");
2794
2795 if (env)
2796 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2797
2798 if (map)
2799 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2800
2801 return info;
2802}
2803
2804const char *
2805object::debug_desc () const
2806{
2807 static char info[256 * 3];
2808 return debug_desc (info);
2809}
2810

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines