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.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.154 by root, Thu May 17 21:11:42 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
28#include <stdio.h> 29#include <stdio.h>
29#include <sys/types.h> 30#include <sys/types.h>
30#include <sys/uio.h> 31#include <sys/uio.h>
31#include <object.h> 32#include <object.h>
32#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
33#include <loader.h> 35#include <loader.h>
34 36
35#include <bitset> 37#include <bitset>
36 38
37int nrofallocobjects = 0; 39int nrofallocobjects = 0;
38static UUID uuid; 40static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 41const uint64 UUID_SKIP = 1<<19;
40 42
41object *active_objects; /* List of active objects that need to be processed */ 43objectvec objects;
44activevec actives;
42 45
43short 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, 46short 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,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 48};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
141 * objects with lists are rare, and lists stay short. If not, use a 144 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 145 * different structure or at least keep the lists sorted...
143 */ 146 */
144 147
145 /* For each field in wants, */ 148 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 149 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 150 {
148 key_value *has_field; 151 key_value *has_field;
149 152
150 /* Look for a field in has with the same key. */ 153 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 154 has_field = get_ob_key_link (has, wants_field->key);
190 * Check nrof variable *before* calling can_merge() 193 * Check nrof variable *before* calling can_merge()
191 * 194 *
192 * Improvements made with merge: Better checking on potion, and also 195 * Improvements made with merge: Better checking on potion, and also
193 * check weight 196 * check weight
194 */ 197 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 198bool object::can_merge_slow (object *ob1, object *ob2)
197{ 199{
198 /* A couple quicksanity checks */ 200 /* A couple quicksanity checks */
199 if (ob1 == ob2 201 if (ob1 == ob2
200 || ob1->type != ob2->type 202 || ob1->type != ob2->type
277 279
278 /* Note sure why the following is the case - either the object has to 280 /* Note sure why the following is the case - either the object has to
279 * be animated or have a very low speed. Is this an attempted monster 281 * be animated or have a very low speed. Is this an attempted monster
280 * check? 282 * check?
281 */ 283 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 285 return 0;
284 286
285 switch (ob1->type) 287 switch (ob1->type)
286 { 288 {
287 case SCROLL: 289 case SCROLL:
323sum_weight (object *op) 325sum_weight (object *op)
324{ 326{
325 long sum; 327 long sum;
326 object *inv; 328 object *inv;
327 329
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 331 {
330 if (inv->inv) 332 if (inv->inv)
331 sum_weight (inv); 333 sum_weight (inv);
334
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 336 }
334 337
335 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 359/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 361 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 362 * The result of the dump is stored in the static global errmsg array.
360 */ 363 */
361
362char * 364char *
363dump_object (object *op) 365dump_object (object *op)
364{ 366{
365 if (!op) 367 if (!op)
366 return strdup ("[NULLOBJ]"); 368 return strdup ("[NULLOBJ]");
367 369
368 object_freezer freezer; 370 object_freezer freezer;
369 save_object (freezer, op, 3); 371 op->write (freezer);
370 return freezer.as_string (); 372 return freezer.as_string ();
371} 373}
372 374
373/* 375/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 376 * get_nearest_part(multi-object, object 2) returns the part of the
391} 393}
392 394
393/* 395/*
394 * Returns the object which has the count-variable equal to the argument. 396 * Returns the object which has the count-variable equal to the argument.
395 */ 397 */
396
397object * 398object *
398find_object (tag_t i) 399find_object (tag_t i)
399{ 400{
400 for (object *op = object::first; op; op = op->next) 401 for_all_objects (op)
401 if (op->count == i) 402 if (op->count == i)
402 return op; 403 return op;
403 404
404 return 0; 405 return 0;
405} 406}
406 407
407/* 408/*
408 * Returns the first object which has a name equal to the argument. 409 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 411 * Enables features like "patch <name-of-other-player> food 999"
411 */ 412 */
412
413object * 413object *
414find_object_name (const char *str) 414find_object_name (const char *str)
415{ 415{
416 shstr_cmp str_ (str); 416 shstr_cmp str_ (str);
417 object *op; 417 object *op;
418 418
419 for (op = object::first; op != NULL; op = op->next) 419 for_all_objects (op)
420 if (op->name == str_) 420 if (op->name == str_)
421 break; 421 break;
422 422
423 return op; 423 return op;
424} 424}
450 owner = owner->owner; 450 owner = owner->owner;
451 451
452 this->owner = owner; 452 this->owner = owner;
453} 453}
454 454
455int
456object::slottype () const
457{
458 if (type == SKILL)
459 {
460 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
461 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
462 }
463 else
464 {
465 if (slot [body_combat].info) return slot_combat;
466 if (slot [body_range ].info) return slot_ranged;
467 }
468
469 return slot_none;
470}
471
472bool
473object::change_weapon (object *ob)
474{
475 if (current_weapon == ob)
476 return true;
477
478 if (chosen_skill)
479 chosen_skill->flag [FLAG_APPLIED] = false;
480
481 current_weapon = ob;
482 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
483
484 if (chosen_skill)
485 chosen_skill->flag [FLAG_APPLIED] = true;
486
487 update_stats ();
488
489 if (ob)
490 {
491 // now check wether any body locations became invalid, in which case
492 // we cannot apply the weapon at the moment.
493 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
494 if (slot[i].used < 0)
495 {
496 current_weapon = chosen_skill = 0;
497 update_stats ();
498
499 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance your applied items all at once, but the %s is too much. "
501 "You need to unapply some items first.", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
511 {
512 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
513 &name, ob->debug_desc ());
514 return false;
515 }
516
517 return true;
518}
519
455/* Zero the key_values on op, decrementing the shared-string 520/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 521 * refcounts and freeing the links.
457 */ 522 */
458static void 523static void
459free_key_values (object *op) 524free_key_values (object *op)
460{ 525{
461 for (key_value *i = op->key_values; i != 0;) 526 for (key_value *i = op->key_values; i; )
462 { 527 {
463 key_value *next = i->next; 528 key_value *next = i->next;
464 delete i; 529 delete i;
465 530
466 i = next; 531 i = next;
467 } 532 }
468 533
469 op->key_values = 0; 534 op->key_values = 0;
470} 535}
471 536
472/* 537object &
473 * copy_to first frees everything allocated by the dst object, 538object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 539{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 540 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 541 bool is_removed = flag [FLAG_REMOVED];
485 542
486 *(object_copy *)dst = *this; 543 *(object_copy *)this = src;
487 544
488 if (is_freed) 545 flag [FLAG_FREED] = is_freed;
489 SET_FLAG (dst, FLAG_FREED); 546 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED);
493
494 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496 547
497 /* Copy over key_values, if any. */ 548 /* Copy over key_values, if any. */
498 if (key_values) 549 if (src.key_values)
499 { 550 {
500 key_value *tail = 0; 551 key_value *tail = 0;
501 key_value *i;
502
503 dst->key_values = 0; 552 key_values = 0;
504 553
505 for (i = key_values; i; i = i->next) 554 for (key_value *i = src.key_values; i; i = i->next)
506 { 555 {
507 key_value *new_link = new key_value; 556 key_value *new_link = new key_value;
508 557
509 new_link->next = 0; 558 new_link->next = 0;
510 new_link->key = i->key; 559 new_link->key = i->key;
511 new_link->value = i->value; 560 new_link->value = i->value;
512 561
513 /* Try and be clever here, too. */ 562 /* Try and be clever here, too. */
514 if (!dst->key_values) 563 if (!key_values)
515 { 564 {
516 dst->key_values = new_link; 565 key_values = new_link;
517 tail = new_link; 566 tail = new_link;
518 } 567 }
519 else 568 else
520 { 569 {
521 tail->next = new_link; 570 tail->next = new_link;
522 tail = new_link; 571 tail = new_link;
523 } 572 }
524 } 573 }
525 } 574 }
575}
526 576
527 update_ob_speed (dst); 577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589
590 if (speed < 0)
591 dst->speed_left = speed_left - rndm ();
592
593 dst->set_speed (dst->speed);
594}
595
596void
597object::instantiate ()
598{
599 if (!uuid.seq) // HACK
600 uuid = gen_uuid ();
601
602 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting
606 * values for the body_used info, so when items are created
607 * for it, they can be properly equipped.
608 */
609 for (int i = NUM_BODY_LOCATIONS; i--; )
610 slot[i].used = slot[i].info;
611
612 attachable::instantiate ();
528} 613}
529 614
530object * 615object *
531object::clone () 616object::clone ()
532{ 617{
538/* 623/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 624 * If an object with the IS_TURNABLE() flag needs to be turned due
540 * to the closest player being on the other side, this function can 625 * to the closest player being on the other side, this function can
541 * be called to update the face variable, _and_ how it looks on the map. 626 * be called to update the face variable, _and_ how it looks on the map.
542 */ 627 */
543
544void 628void
545update_turn_face (object *op) 629update_turn_face (object *op)
546{ 630{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 631 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 632 return;
633
549 SET_ANIMATION (op, op->direction); 634 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 635 update_object (op, UP_OBJ_FACE);
551} 636}
552 637
553/* 638/*
554 * Updates the speed of an object. If the speed changes from 0 to another 639 * Updates the speed of an object. If the speed changes from 0 to another
555 * value, or vice versa, then add/remove the object from the active list. 640 * value, or vice versa, then add/remove the object from the active list.
556 * This function needs to be called whenever the speed of an object changes. 641 * This function needs to be called whenever the speed of an object changes.
557 */ 642 */
558void 643void
559update_ob_speed (object *op) 644object::set_speed (float speed)
560{ 645{
561 extern int arch_init; 646 if (flag [FLAG_FREED] && speed)
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566
567 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
568 { 647 {
569 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 648 LOG (llevError, "Object %s is freed but has speed.\n", &name);
570#ifdef MANY_CORES
571 abort ();
572#else
573 op->speed = 0; 649 speed = 0;
574#endif
575 }
576
577 if (arch_init)
578 return;
579
580 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
581 { 650 }
582 /* If already on active list, don't do anything */
583 if (op->active_next || op->active_prev || op == active_objects)
584 return;
585 651
586 /* process_events() expects us to insert the object at the beginning 652 this->speed = speed;
587 * of the list. */
588 op->active_next = active_objects;
589 653
590 if (op->active_next != NULL) 654 if (has_active_speed ())
591 op->active_next->active_prev = op; 655 activate ();
592
593 active_objects = op;
594 }
595 else 656 else
596 { 657 deactivate ();
597 /* If not on the active list, nothing needs to be done */
598 if (!op->active_next && !op->active_prev && op != active_objects)
599 return;
600
601 if (op->active_prev == NULL)
602 {
603 active_objects = op->active_next;
604
605 if (op->active_next != NULL)
606 op->active_next->active_prev = NULL;
607 }
608 else
609 {
610 op->active_prev->active_next = op->active_next;
611
612 if (op->active_next)
613 op->active_next->active_prev = op->active_prev;
614 }
615
616 op->active_next = NULL;
617 op->active_prev = NULL;
618 }
619}
620
621/* This function removes object 'op' from the list of active
622 * objects.
623 * This should only be used for style maps or other such
624 * reference maps where you don't want an object that isn't
625 * in play chewing up cpu time getting processed.
626 * The reverse of this is to call update_ob_speed, which
627 * will do the right thing based on the speed of the object.
628 */
629void
630remove_from_active_list (object *op)
631{
632 /* If not on the active list, nothing needs to be done */
633 if (!op->active_next && !op->active_prev && op != active_objects)
634 return;
635
636 if (op->active_prev == NULL)
637 {
638 active_objects = op->active_next;
639 if (op->active_next != NULL)
640 op->active_next->active_prev = NULL;
641 }
642 else
643 {
644 op->active_prev->active_next = op->active_next;
645 if (op->active_next)
646 op->active_next->active_prev = op->active_prev;
647 }
648 op->active_next = NULL;
649 op->active_prev = NULL;
650} 658}
651 659
652/* 660/*
653 * update_object() updates the the map. 661 * update_object() updates the the map.
654 * It takes into account invisible objects (and represent squares covered 662 * It takes into account invisible objects (and represent squares covered
667 * UP_OBJ_FACE: only the objects face has changed. 675 * UP_OBJ_FACE: only the objects face has changed.
668 */ 676 */
669void 677void
670update_object (object *op, int action) 678update_object (object *op, int action)
671{ 679{
672 MoveType move_on, move_off, move_block, move_slow;
673
674 if (op == NULL) 680 if (op == NULL)
675 { 681 {
676 /* this should never happen */ 682 /* this should never happen */
677 LOG (llevDebug, "update_object() called for NULL object.\n"); 683 LOG (llevDebug, "update_object() called for NULL object.\n");
678 return; 684 return;
691 */ 697 */
692 if (!op->map || op->map->in_memory == MAP_SAVING) 698 if (!op->map || op->map->in_memory == MAP_SAVING)
693 return; 699 return;
694 700
695 /* make sure the object is within map boundaries */ 701 /* make sure the object is within map boundaries */
696 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 702 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
697 { 703 {
698 LOG (llevError, "update_object() called for object out of map!\n"); 704 LOG (llevError, "update_object() called for object out of map!\n");
699#ifdef MANY_CORES 705#ifdef MANY_CORES
700 abort (); 706 abort ();
701#endif 707#endif
702 return; 708 return;
703 } 709 }
704 710
705 mapspace &m = op->ms (); 711 mapspace &m = op->ms ();
706 712
707 if (m.flags_ & P_NEED_UPDATE) 713 if (!(m.flags_ & P_UPTODATE))
708 /* nop */; 714 /* nop */;
709 else if (action == UP_OBJ_INSERT) 715 else if (action == UP_OBJ_INSERT)
710 { 716 {
711 // this is likely overkill, TODO: revisit (schmorp) 717 // this is likely overkill, TODO: revisit (schmorp)
712 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 718 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
721 /* This isn't perfect, but I don't expect a lot of objects to 727 /* This isn't perfect, but I don't expect a lot of objects to
722 * to have move_allow right now. 728 * to have move_allow right now.
723 */ 729 */
724 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 730 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
725 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 731 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
726 m.flags_ = P_NEED_UPDATE; 732 m.flags_ = 0;
727 } 733 }
728 /* if the object is being removed, we can't make intelligent 734 /* if the object is being removed, we can't make intelligent
729 * decisions, because remove_ob can't really pass the object 735 * decisions, because remove_ob can't really pass the object
730 * that is being removed. 736 * that is being removed.
731 */ 737 */
732 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 738 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
733 m.flags_ = P_NEED_UPDATE; 739 m.flags_ = 0;
734 else if (action == UP_OBJ_FACE) 740 else if (action == UP_OBJ_FACE)
735 /* Nothing to do for that case */ ; 741 /* Nothing to do for that case */ ;
736 else 742 else
737 LOG (llevError, "update_object called with invalid action: %d\n", action); 743 LOG (llevError, "update_object called with invalid action: %d\n", action);
738 744
739 if (op->more) 745 if (op->more)
740 update_object (op->more, action); 746 update_object (op->more, action);
741} 747}
742 748
743object::vector object::objects; // not yet used
744object *object::first;
745
746object::object () 749object::object ()
747{ 750{
748 SET_FLAG (this, FLAG_REMOVED); 751 SET_FLAG (this, FLAG_REMOVED);
749 752
750 expmul = 1.0; 753 expmul = 1.0;
751 face = blank_face; 754 face = blank_face;
752} 755}
753 756
754object::~object () 757object::~object ()
755{ 758{
759 unlink ();
760
756 free_key_values (this); 761 free_key_values (this);
757} 762}
758 763
764static int object_count;
765
759void object::link () 766void object::link ()
760{ 767{
761 count = ++ob_count; 768 assert (!index);//D
762 uuid = gen_uuid (); 769 uuid = gen_uuid ();
770 count = ++object_count;
763 771
764 prev = 0; 772 refcnt_inc ();
765 next = object::first; 773 objects.insert (this);
766
767 if (object::first)
768 object::first->prev = this;
769
770 object::first = this;
771} 774}
772 775
773void object::unlink () 776void object::unlink ()
774{ 777{
775 if (this == object::first) 778 if (!index)
776 object::first = next;
777
778 /* Remove this object from the list of used objects */
779 if (prev) prev->next = next;
780 if (next) next->prev = prev;
781
782 prev = 0;
783 next = 0;
784}
785
786object *object::create ()
787{
788 object *op = new object;
789 op->link ();
790 return op; 779 return;
791}
792 780
793/* 781 objects.erase (this);
794 * free_object() frees everything allocated by an object, removes 782 refcnt_dec ();
795 * it from the list of used objects, and puts it on the list of 783}
796 * free objects. The IS_FREED() flag is set in the object. 784
797 * The object must have been removed by remove_ob() first for
798 * this function to succeed.
799 *
800 * If destroy_inventory is set, free inventory as well. Else drop items in
801 * inventory to the ground.
802 */
803void 785void
804object::do_destroy () 786object::activate ()
805{ 787{
806 attachable::do_destroy (); 788 /* If already on active list, don't do anything */
807 789 if (active)
808 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this);
810
811 if (flag [FLAG_FRIENDLY])
812 remove_friendly_object (this);
813
814 if (!flag [FLAG_REMOVED])
815 remove ();
816
817 if (flag [FLAG_FREED])
818 return; 790 return;
819 791
820 flag [FLAG_FREED] = 1; 792 if (has_active_speed ())
793 actives.insert (this);
794}
821 795
822 // hack to ensure that freed objects still have a valid map 796void
823 { 797object::activate_recursive ()
824 static maptile *freed_map; // freed objects are moved here to avoid crashes 798{
799 activate ();
825 800
826 if (!freed_map) 801 for (object *op = inv; op; op = op->below)
802 op->activate_recursive ();
803}
804
805/* This function removes object 'op' from the list of active
806 * objects.
807 * This should only be used for style maps or other such
808 * reference maps where you don't want an object that isn't
809 * in play chewing up cpu time getting processed.
810 * The reverse of this is to call update_ob_speed, which
811 * will do the right thing based on the speed of the object.
812 */
813void
814object::deactivate ()
815{
816 /* If not on the active list, nothing needs to be done */
817 if (!active)
818 return;
819
820 actives.erase (this);
821}
822
823void
824object::deactivate_recursive ()
825{
826 for (object *op = inv; op; op = op->below)
827 op->deactivate_recursive ();
828
829 deactivate ();
830}
831
832void
833object::set_flag_inv (int flag, int value)
834{
835 for (object *op = inv; op; op = op->below)
827 { 836 {
828 freed_map = new maptile; 837 op->flag [flag] = value;
829 838 op->set_flag_inv (flag, value);
830 freed_map->name = "/internal/freed_objects_map";
831 freed_map->width = 3;
832 freed_map->height = 3;
833
834 freed_map->allocate ();
835 } 839 }
836
837 map = freed_map;
838 x = 1;
839 y = 1;
840 }
841
842 more = 0;
843 head = 0;
844 inv = 0;
845
846 // clear those pointers that likely might have circular references to us
847 owner = 0;
848 enemy = 0;
849 attacked_by = 0;
850
851 // only relevant for players(?), but make sure of it anyways
852 contr = 0;
853
854 /* Remove object from the active list */
855 speed = 0;
856 update_ob_speed (this);
857
858 unlink ();
859} 840}
860 841
861/* 842/*
862 * Remove and free all objects in the inventory of the given object. 843 * Remove and free all objects in the inventory of the given object.
863 * object.c ? 844 * object.c ?
864 */ 845 */
865void 846void
866object::destroy_inv (bool drop_to_ground) 847object::destroy_inv (bool drop_to_ground)
867{ 848{
849 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory,
853 // cf will crash below with off-map x and y
868 if (!inv) 854 if (!inv)
869 return; 855 return;
870 856
871 /* Only if the space blocks everything do we not process - 857 /* Only if the space blocks everything do we not process -
872 * if some form of movement is allowed, let objects 858 * if some form of movement is allowed, let objects
873 * drop on that space. 859 * drop on that space.
874 */ 860 */
875 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 861 if (!drop_to_ground
862 || !map
863 || map->in_memory != MAP_IN_MEMORY
864 || map->nodrop
865 || ms ().move_block == MOVE_ALL)
876 { 866 {
877 while (inv) 867 while (inv)
878 { 868 {
879 inv->destroy_inv (drop_to_ground); 869 inv->destroy_inv (drop_to_ground);
880 inv->destroy (); 870 inv->destroy ();
888 878
889 if (op->flag [FLAG_STARTEQUIP] 879 if (op->flag [FLAG_STARTEQUIP]
890 || op->flag [FLAG_NO_DROP] 880 || op->flag [FLAG_NO_DROP]
891 || op->type == RUNE 881 || op->type == RUNE
892 || op->type == TRAP 882 || op->type == TRAP
893 || op->flag [FLAG_IS_A_TEMPLATE]) 883 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH])
894 op->destroy (); 885 op->destroy ();
895 else 886 else
896 { 887 map->insert (op, x, y);
897 op->remove ();
898 op->x = x;
899 op->y = y;
900 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
901 }
902 } 888 }
903 } 889 }
890}
891
892object *object::create ()
893{
894 object *op = new object;
895 op->link ();
896 return op;
897}
898
899void
900object::do_destroy ()
901{
902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this);
906
907 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this);
909
910 if (!flag [FLAG_REMOVED])
911 remove ();
912
913 destroy_inv (true);
914
915 deactivate ();
916 unlink ();
917
918 flag [FLAG_FREED] = 1;
919
920 // hack to ensure that freed objects still have a valid map
921 {
922 static maptile *freed_map; // freed objects are moved here to avoid crashes
923
924 if (!freed_map)
925 {
926 freed_map = new maptile;
927
928 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3;
930 freed_map->height = 3;
931
932 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY;
934 }
935
936 map = freed_map;
937 x = 1;
938 y = 1;
939 }
940
941 head = 0;
942
943 if (more)
944 {
945 more->destroy ();
946 more = 0;
947 }
948
949 // clear those pointers that likely might have circular references to us
950 owner = 0;
951 enemy = 0;
952 attacked_by = 0;
904} 953}
905 954
906void 955void
907object::destroy (bool destroy_inventory) 956object::destroy (bool destroy_inventory)
908{ 957{
909 if (destroyed ()) 958 if (destroyed ())
910 return; 959 return;
911 960
912 if (more)
913 {
914 //TODO: non-head objects must not have inventory
915 more->destroy (destroy_inventory);
916 more = 0;
917 }
918
919 if (destroy_inventory) 961 if (destroy_inventory)
920 destroy_inv (true); 962 destroy_inv (false);
921 963
922 attachable::destroy (); 964 attachable::destroy ();
923} 965}
924 966
925/* 967/*
943 * This function removes the object op from the linked list of objects 985 * This function removes the object op from the linked list of objects
944 * which it is currently tied to. When this function is done, the 986 * which it is currently tied to. When this function is done, the
945 * object will have no environment. If the object previously had an 987 * object will have no environment. If the object previously had an
946 * environment, the x and y coordinates will be updated to 988 * environment, the x and y coordinates will be updated to
947 * the previous environment. 989 * the previous environment.
948 * Beware: This function is called from the editor as well!
949 */ 990 */
950void 991void
951object::remove () 992object::do_remove ()
952{ 993{
953 object *tmp, *last = 0; 994 object *tmp, *last = 0;
954 object *otmp; 995 object *otmp;
955 996
956 if (QUERY_FLAG (this, FLAG_REMOVED)) 997 if (QUERY_FLAG (this, FLAG_REMOVED))
978 * to save cpu time. 1019 * to save cpu time.
979 */ 1020 */
980 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1021 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981 otmp->update_stats (); 1022 otmp->update_stats ();
982 1023
983 if (above != NULL) 1024 if (above)
984 above->below = below; 1025 above->below = below;
985 else 1026 else
986 env->inv = below; 1027 env->inv = below;
987 1028
988 if (below != NULL) 1029 if (below)
989 below->above = above; 1030 below->above = above;
990 1031
991 /* we set up values so that it could be inserted into 1032 /* we set up values so that it could be inserted into
992 * the map, but we don't actually do that - it is up 1033 * the map, but we don't actually do that - it is up
993 * to the caller to decide what we want to do. 1034 * to the caller to decide what we want to do.
997 above = 0, below = 0; 1038 above = 0, below = 0;
998 env = 0; 1039 env = 0;
999 } 1040 }
1000 else if (map) 1041 else if (map)
1001 { 1042 {
1002 /* Re did the following section of code - it looks like it had 1043 if (type == PLAYER)
1003 * lots of logic for things we no longer care about
1004 */ 1044 {
1045 // leaving a spot always closes any open container on the ground
1046 if (container && !container->env)
1047 // this causes spurious floorbox updates, but it ensures
1048 // that the CLOSE event is being sent.
1049 close_container ();
1050
1051 --map->players;
1052 map->touch ();
1053 }
1054
1055 map->dirty = true;
1056 mapspace &ms = this->ms ();
1005 1057
1006 /* link the object above us */ 1058 /* link the object above us */
1007 if (above) 1059 if (above)
1008 above->below = below; 1060 above->below = below;
1009 else 1061 else
1010 map->at (x, y).top = below; /* we were top, set new top */ 1062 ms.top = below; /* we were top, set new top */
1011 1063
1012 /* Relink the object below us, if there is one */ 1064 /* Relink the object below us, if there is one */
1013 if (below) 1065 if (below)
1014 below->above = above; 1066 below->above = above;
1015 else 1067 else
1017 /* Nothing below, which means we need to relink map object for this space 1069 /* Nothing below, which means we need to relink map object for this space
1018 * use translated coordinates in case some oddness with map tiling is 1070 * use translated coordinates in case some oddness with map tiling is
1019 * evident 1071 * evident
1020 */ 1072 */
1021 if (GET_MAP_OB (map, x, y) != this) 1073 if (GET_MAP_OB (map, x, y) != this)
1022 {
1023 char *dump = dump_object (this);
1024 LOG (llevError,
1025 "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); 1074 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1026 free (dump);
1027 dump = dump_object (GET_MAP_OB (map, x, y));
1028 LOG (llevError, "%s\n", dump);
1029 free (dump);
1030 }
1031 1075
1032 map->at (x, y).bottom = above; /* goes on above it. */ 1076 ms.bot = above; /* goes on above it. */
1033 } 1077 }
1034 1078
1035 above = 0; 1079 above = 0;
1036 below = 0; 1080 below = 0;
1037 1081
1038 if (map->in_memory == MAP_SAVING) 1082 if (map->in_memory == MAP_SAVING)
1039 return; 1083 return;
1040 1084
1041 int check_walk_off = !flag [FLAG_NO_APPLY]; 1085 int check_walk_off = !flag [FLAG_NO_APPLY];
1042 1086
1043 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1087 for (tmp = ms.bot; tmp; tmp = tmp->above)
1044 { 1088 {
1045 /* No point updating the players look faces if he is the object 1089 /* No point updating the players look faces if he is the object
1046 * being removed. 1090 * being removed.
1047 */ 1091 */
1048 1092
1060 1104
1061 if (tmp->contr->ns) 1105 if (tmp->contr->ns)
1062 tmp->contr->ns->floorbox_update (); 1106 tmp->contr->ns->floorbox_update ();
1063 } 1107 }
1064 1108
1065 /* See if player moving off should effect something */ 1109 /* See if object moving off should effect something */
1066 if (check_walk_off 1110 if (check_walk_off
1067 && ((move_type & tmp->move_off) 1111 && ((move_type & tmp->move_off)
1068 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1112 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069 { 1113 {
1070 move_apply (tmp, this, 0); 1114 move_apply (tmp, this, 0);
1072 if (destroyed ()) 1116 if (destroyed ())
1073 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1117 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074 } 1118 }
1075 1119
1076 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1120 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077 1121 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1078 if (tmp->above == tmp) 1122 if (tmp->above == tmp)
1079 tmp->above = 0; 1123 tmp->above = 0;
1080 1124
1081 last = tmp; 1125 last = tmp;
1082 } 1126 }
1083 1127
1084 /* last == NULL of there are no objects on this space */ 1128 /* last == NULL if there are no objects on this space */
1129 //TODO: this makes little sense, why only update the topmost object?
1085 if (!last) 1130 if (!last)
1086 map->at (x, y).flags_ = P_NEED_UPDATE; 1131 map->at (x, y).flags_ = 0;
1087 else 1132 else
1088 update_object (last, UP_OBJ_REMOVE); 1133 update_object (last, UP_OBJ_REMOVE);
1089 1134
1090 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1135 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1091 update_all_los (map, x, y); 1136 update_all_los (map, x, y);
1127 } 1172 }
1128 1173
1129 return 0; 1174 return 0;
1130} 1175}
1131 1176
1177void
1178object::expand_tail ()
1179{
1180 if (more)
1181 return;
1182
1183 object *prev = this;
1184
1185 for (archetype *at = arch->more; at; at = at->more)
1186 {
1187 object *op = arch_to_object (at);
1188
1189 op->name = name;
1190 op->name_pl = name_pl;
1191 op->title = title;
1192
1193 op->head = this;
1194 prev->more = op;
1195
1196 prev = op;
1197 }
1198}
1199
1132/* 1200/*
1133 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1201 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1134 * job preparing multi-part monsters 1202 * job preparing multi-part monsters.
1135 */ 1203 */
1136object * 1204object *
1137insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1138{ 1206{
1139 object *tmp;
1140
1141 if (op->head)
1142 op = op->head;
1143
1144 for (tmp = op; tmp; tmp = tmp->more) 1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145 { 1208 {
1146 tmp->x = x + tmp->arch->clone.x; 1209 tmp->x = x + tmp->arch->clone.x;
1147 tmp->y = y + tmp->arch->clone.y; 1210 tmp->y = y + tmp->arch->clone.y;
1148 } 1211 }
1149 1212
1171 * just 'op' otherwise 1234 * just 'op' otherwise
1172 */ 1235 */
1173object * 1236object *
1174insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1237insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1175{ 1238{
1239 assert (!op->flag [FLAG_FREED]);
1240
1176 object *tmp, *top, *floor = NULL; 1241 object *tmp, *top, *floor = NULL;
1177 sint16 x, y;
1178 1242
1179 if (QUERY_FLAG (op, FLAG_FREED)) 1243 op->remove ();
1180 {
1181 LOG (llevError, "Trying to insert freed object!\n");
1182 return NULL;
1183 }
1184 1244
1185 if (m == NULL) 1245#if 0
1186 { 1246 if (!m->active != !op->active)
1187 char *dump = dump_object (op); 1247 if (m->active)
1188 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1248 op->activate_recursive ();
1189 free (dump); 1249 else
1190 return op; 1250 op->deactivate_recursive ();
1191 } 1251#endif
1192 1252
1193 if (out_of_map (m, op->x, op->y)) 1253 if (out_of_map (m, op->x, op->y))
1194 { 1254 {
1195 char *dump = dump_object (op);
1196 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1255 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1197#ifdef MANY_CORES 1256#ifdef MANY_CORES
1198 /* Better to catch this here, as otherwise the next use of this object 1257 /* Better to catch this here, as otherwise the next use of this object
1199 * is likely to cause a crash. Better to find out where it is getting 1258 * is likely to cause a crash. Better to find out where it is getting
1200 * improperly inserted. 1259 * improperly inserted.
1201 */ 1260 */
1202 abort (); 1261 abort ();
1203#endif 1262#endif
1204 free (dump);
1205 return op; 1263 return op;
1206 } 1264 }
1207 1265
1208 if (!QUERY_FLAG (op, FLAG_REMOVED))
1209 {
1210 char *dump = dump_object (op);
1211 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1212 free (dump);
1213 return op;
1214 }
1215
1216 if (op->more)
1217 {
1218 /* The part may be on a different map. */
1219
1220 object *more = op->more; 1266 if (object *more = op->more)
1221 1267 {
1222 /* We really need the caller to normalize coordinates - if
1223 * we set the map, that doesn't work if the location is within
1224 * a map and this is straddling an edge. So only if coordinate
1225 * is clear wrong do we normalize it.
1226 */
1227 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1228 more->map = get_map_from_coord (m, &more->x, &more->y);
1229 else if (!more->map)
1230 {
1231 /* For backwards compatibility - when not dealing with tiled maps,
1232 * more->map should always point to the parent.
1233 */
1234 more->map = m;
1235 }
1236
1237 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1268 if (!insert_ob_in_map (more, m, originator, flag))
1238 { 1269 {
1239 if (!op->head) 1270 if (!op->head)
1240 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1271 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1241 1272
1242 return 0; 1273 return 0;
1247 1278
1248 /* Ideally, the caller figures this out. However, it complicates a lot 1279 /* Ideally, the caller figures this out. However, it complicates a lot
1249 * of areas of callers (eg, anything that uses find_free_spot would now 1280 * of areas of callers (eg, anything that uses find_free_spot would now
1250 * need extra work 1281 * need extra work
1251 */ 1282 */
1252 op->map = get_map_from_coord (m, &op->x, &op->y); 1283 if (!xy_normalise (m, op->x, op->y))
1253 x = op->x; 1284 return 0;
1254 y = op->y; 1285
1286 op->map = m;
1287 mapspace &ms = op->ms ();
1255 1288
1256 /* this has to be done after we translate the coordinates. 1289 /* this has to be done after we translate the coordinates.
1257 */ 1290 */
1258 if (op->nrof && !(flag & INS_NO_MERGE)) 1291 if (op->nrof && !(flag & INS_NO_MERGE))
1259 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1292 for (tmp = ms.bot; tmp; tmp = tmp->above)
1260 if (object::can_merge (op, tmp)) 1293 if (object::can_merge (op, tmp))
1261 { 1294 {
1262 op->nrof += tmp->nrof; 1295 op->nrof += tmp->nrof;
1263 tmp->destroy (); 1296 tmp->destroy ();
1264 } 1297 }
1281 op->below = originator->below; 1314 op->below = originator->below;
1282 1315
1283 if (op->below) 1316 if (op->below)
1284 op->below->above = op; 1317 op->below->above = op;
1285 else 1318 else
1286 op->ms ().bottom = op; 1319 ms.bot = op;
1287 1320
1288 /* since *below* originator, no need to update top */ 1321 /* since *below* originator, no need to update top */
1289 originator->below = op; 1322 originator->below = op;
1290 } 1323 }
1291 else 1324 else
1292 { 1325 {
1326 top = ms.bot;
1327
1293 /* If there are other objects, then */ 1328 /* If there are other objects, then */
1294 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1329 if ((!(flag & INS_MAP_LOAD)) && top)
1295 { 1330 {
1296 object *last = NULL; 1331 object *last = 0;
1297 1332
1298 /* 1333 /*
1299 * If there are multiple objects on this space, we do some trickier handling. 1334 * If there are multiple objects on this space, we do some trickier handling.
1300 * We've already dealt with merging if appropriate. 1335 * We've already dealt with merging if appropriate.
1301 * Generally, we want to put the new object on top. But if 1336 * Generally, we want to put the new object on top. But if
1305 * once we get to them. This reduces the need to traverse over all of 1340 * once we get to them. This reduces the need to traverse over all of
1306 * them when adding another one - this saves quite a bit of cpu time 1341 * them when adding another one - this saves quite a bit of cpu time
1307 * when lots of spells are cast in one area. Currently, it is presumed 1342 * when lots of spells are cast in one area. Currently, it is presumed
1308 * that flying non pickable objects are spell objects. 1343 * that flying non pickable objects are spell objects.
1309 */ 1344 */
1310 1345 for (top = ms.bot; top; top = top->above)
1311 while (top != NULL)
1312 { 1346 {
1313 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1347 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314 floor = top; 1348 floor = top;
1315 1349
1316 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1350 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1319 top = top->below; 1353 top = top->below;
1320 break; 1354 break;
1321 } 1355 }
1322 1356
1323 last = top; 1357 last = top;
1324 top = top->above;
1325 } 1358 }
1326 1359
1327 /* Don't want top to be NULL, so set it to the last valid object */ 1360 /* Don't want top to be NULL, so set it to the last valid object */
1328 top = last; 1361 top = last;
1329 1362
1331 * looks like instead of lots of conditions here. 1364 * looks like instead of lots of conditions here.
1332 * makes things faster, and effectively the same result. 1365 * makes things faster, and effectively the same result.
1333 */ 1366 */
1334 1367
1335 /* Have object 'fall below' other objects that block view. 1368 /* Have object 'fall below' other objects that block view.
1336 * Unless those objects are exits, type 66 1369 * Unless those objects are exits.
1337 * If INS_ON_TOP is used, don't do this processing 1370 * If INS_ON_TOP is used, don't do this processing
1338 * Need to find the object that in fact blocks view, otherwise 1371 * Need to find the object that in fact blocks view, otherwise
1339 * stacking is a bit odd. 1372 * stacking is a bit odd.
1340 */ 1373 */
1341 if (!(flag & INS_ON_TOP) && 1374 if (!(flag & INS_ON_TOP)
1342 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1375 && ms.flags () & P_BLOCKSVIEW
1376 && (op->face && !faces [op->face].visibility))
1343 { 1377 {
1344 for (last = top; last != floor; last = last->below) 1378 for (last = top; last != floor; last = last->below)
1345 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1379 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1346 break; 1380 break;
1381
1347 /* Check to see if we found the object that blocks view, 1382 /* Check to see if we found the object that blocks view,
1348 * and make sure we have a below pointer for it so that 1383 * and make sure we have a below pointer for it so that
1349 * we can get inserted below this one, which requires we 1384 * we can get inserted below this one, which requires we
1350 * set top to the object below us. 1385 * set top to the object below us.
1351 */ 1386 */
1353 top = last->below; 1388 top = last->below;
1354 } 1389 }
1355 } /* If objects on this space */ 1390 } /* If objects on this space */
1356 1391
1357 if (flag & INS_MAP_LOAD) 1392 if (flag & INS_MAP_LOAD)
1358 top = GET_MAP_TOP (op->map, op->x, op->y); 1393 top = ms.top;
1359 1394
1360 if (flag & INS_ABOVE_FLOOR_ONLY) 1395 if (flag & INS_ABOVE_FLOOR_ONLY)
1361 top = floor; 1396 top = floor;
1362 1397
1363 /* Top is the object that our object (op) is going to get inserted above. 1398 /* Top is the object that our object (op) is going to get inserted above.
1364 */ 1399 */
1365 1400
1366 /* First object on this space */ 1401 /* First object on this space */
1367 if (!top) 1402 if (!top)
1368 { 1403 {
1369 op->above = GET_MAP_OB (op->map, op->x, op->y); 1404 op->above = ms.bot;
1370 1405
1371 if (op->above) 1406 if (op->above)
1372 op->above->below = op; 1407 op->above->below = op;
1373 1408
1374 op->below = NULL; 1409 op->below = 0;
1375 op->ms ().bottom = op; 1410 ms.bot = op;
1376 } 1411 }
1377 else 1412 else
1378 { /* get inserted into the stack above top */ 1413 { /* get inserted into the stack above top */
1379 op->above = top->above; 1414 op->above = top->above;
1380 1415
1383 1418
1384 op->below = top; 1419 op->below = top;
1385 top->above = op; 1420 top->above = op;
1386 } 1421 }
1387 1422
1388 if (op->above == NULL) 1423 if (!op->above)
1389 op->ms ().top = op; 1424 ms.top = op;
1390 } /* else not INS_BELOW_ORIGINATOR */ 1425 } /* else not INS_BELOW_ORIGINATOR */
1391 1426
1392 if (op->type == PLAYER) 1427 if (op->type == PLAYER)
1428 {
1393 op->contr->do_los = 1; 1429 op->contr->do_los = 1;
1430 ++op->map->players;
1431 op->map->touch ();
1432 }
1433
1434 op->map->dirty = true;
1394 1435
1395 /* If we have a floor, we know the player, if any, will be above 1436 /* If we have a floor, we know the player, if any, will be above
1396 * it, so save a few ticks and start from there. 1437 * it, so save a few ticks and start from there.
1397 */ 1438 */
1398 if (!(flag & INS_MAP_LOAD)) 1439 if (!(flag & INS_MAP_LOAD))
1399 if (object *pl = op->ms ().player ()) 1440 if (object *pl = ms.player ())
1400 if (pl->contr->ns) 1441 if (pl->contr->ns)
1401 pl->contr->ns->floorbox_update (); 1442 pl->contr->ns->floorbox_update ();
1402 1443
1403 /* If this object glows, it may affect lighting conditions that are 1444 /* If this object glows, it may affect lighting conditions that are
1404 * visible to others on this map. But update_all_los is really 1445 * visible to others on this map. But update_all_los is really
1405 * an inefficient way to do this, as it means los for all players 1446 * an inefficient way to do this, as it means los for all players
1406 * on the map will get recalculated. The players could very well 1447 * on the map will get recalculated. The players could very well
1407 * be far away from this change and not affected in any way - 1448 * be far away from this change and not affected in any way -
1408 * this should get redone to only look for players within range, 1449 * this should get redone to only look for players within range,
1409 * or just updating the P_NEED_UPDATE for spaces within this area 1450 * or just updating the P_UPTODATE for spaces within this area
1410 * of effect may be sufficient. 1451 * of effect may be sufficient.
1411 */ 1452 */
1412 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1453 if (op->map->darkness && (op->glow_radius != 0))
1413 update_all_los (op->map, op->x, op->y); 1454 update_all_los (op->map, op->x, op->y);
1414 1455
1415 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1456 /* updates flags (blocked, alive, no magic, etc) for this map space */
1416 update_object (op, UP_OBJ_INSERT); 1457 update_object (op, UP_OBJ_INSERT);
1417 1458
1452{ 1493{
1453 object *tmp, *tmp1; 1494 object *tmp, *tmp1;
1454 1495
1455 /* first search for itself and remove any old instances */ 1496 /* first search for itself and remove any old instances */
1456 1497
1457 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1498 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1458 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1499 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1459 tmp->destroy (); 1500 tmp->destroy ();
1460 1501
1461 tmp1 = arch_to_object (archetype::find (arch_string)); 1502 tmp1 = arch_to_object (archetype::find (arch_string));
1462 1503
1463 tmp1->x = op->x; 1504 tmp1->x = op->x;
1464 tmp1->y = op->y; 1505 tmp1->y = op->y;
1465 insert_ob_in_map (tmp1, op->map, op, 0); 1506 insert_ob_in_map (tmp1, op->map, op, 0);
1507}
1508
1509object *
1510object::insert_at (object *where, object *originator, int flags)
1511{
1512 return where->map->insert (this, where->x, where->y, originator, flags);
1466} 1513}
1467 1514
1468/* 1515/*
1469 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1516 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1470 * is returned contains nr objects, and the remaining parts contains 1517 * is returned contains nr objects, and the remaining parts contains
1471 * the rest (or is removed and freed if that number is 0). 1518 * the rest (or is removed and freed if that number is 0).
1472 * On failure, NULL is returned, and the reason put into the 1519 * On failure, NULL is returned, and the reason put into the
1473 * global static errmsg array. 1520 * global static errmsg array.
1474 */ 1521 */
1475
1476object * 1522object *
1477get_split_ob (object *orig_ob, uint32 nr) 1523get_split_ob (object *orig_ob, uint32 nr)
1478{ 1524{
1479 object *newob; 1525 object *newob;
1480 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1526 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1511 * the amount of an object. If the amount reaches 0, the object 1557 * the amount of an object. If the amount reaches 0, the object
1512 * is subsequently removed and freed. 1558 * is subsequently removed and freed.
1513 * 1559 *
1514 * Return value: 'op' if something is left, NULL if the amount reached 0 1560 * Return value: 'op' if something is left, NULL if the amount reached 0
1515 */ 1561 */
1516
1517object * 1562object *
1518decrease_ob_nr (object *op, uint32 i) 1563decrease_ob_nr (object *op, uint32 i)
1519{ 1564{
1520 object *tmp; 1565 object *tmp;
1521 1566
1596 1641
1597/* 1642/*
1598 * add_weight(object, weight) adds the specified weight to an object, 1643 * add_weight(object, weight) adds the specified weight to an object,
1599 * and also updates how much the environment(s) is/are carrying. 1644 * and also updates how much the environment(s) is/are carrying.
1600 */ 1645 */
1601
1602void 1646void
1603add_weight (object *op, signed long weight) 1647add_weight (object *op, signed long weight)
1604{ 1648{
1605 while (op != NULL) 1649 while (op != NULL)
1606 { 1650 {
1621 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1665 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1622 free (dump); 1666 free (dump);
1623 return op; 1667 return op;
1624 } 1668 }
1625 1669
1626 if (where->head) 1670 if (where->head_ () != where)
1627 { 1671 {
1628 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1672 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1629 where = where->head; 1673 where = where->head;
1630 } 1674 }
1631 1675
1632 return where->insert (op); 1676 return where->insert (op);
1633} 1677}
1638 * inside the object environment. 1682 * inside the object environment.
1639 * 1683 *
1640 * The function returns now pointer to inserted item, and return value can 1684 * The function returns now pointer to inserted item, and return value can
1641 * be != op, if items are merged. -Tero 1685 * be != op, if items are merged. -Tero
1642 */ 1686 */
1643
1644object * 1687object *
1645object::insert (object *op) 1688object::insert (object *op)
1646{ 1689{
1647 object *tmp, *otmp; 1690 object *tmp, *otmp;
1648 1691
1703 if ((op->glow_radius != 0) && map) 1746 if ((op->glow_radius != 0) && map)
1704 { 1747 {
1705#ifdef DEBUG_LIGHTS 1748#ifdef DEBUG_LIGHTS
1706 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1749 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1707#endif /* DEBUG_LIGHTS */ 1750#endif /* DEBUG_LIGHTS */
1708 if (MAP_DARKNESS (map)) 1751 if (map->darkness)
1709 update_all_los (map, x, y); 1752 update_all_los (map, x, y);
1710 } 1753 }
1711 1754
1712 /* Client has no idea of ordering so lets not bother ordering it here. 1755 /* Client has no idea of ordering so lets not bother ordering it here.
1713 * It sure simplifies this function... 1756 * It sure simplifies this function...
1744 * 1787 *
1745 * MSW 2001-07-08: Check all objects on space, not just those below 1788 * MSW 2001-07-08: Check all objects on space, not just those below
1746 * object being inserted. insert_ob_in_map may not put new objects 1789 * object being inserted. insert_ob_in_map may not put new objects
1747 * on top. 1790 * on top.
1748 */ 1791 */
1749
1750int 1792int
1751check_move_on (object *op, object *originator) 1793check_move_on (object *op, object *originator)
1752{ 1794{
1753 object *tmp; 1795 object *tmp;
1754 maptile *m = op->map; 1796 maptile *m = op->map;
1781 1823
1782 /* The objects have to be checked from top to bottom. 1824 /* The objects have to be checked from top to bottom.
1783 * Hence, we first go to the top: 1825 * Hence, we first go to the top:
1784 */ 1826 */
1785 1827
1786 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1828 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1787 { 1829 {
1788 /* Trim the search when we find the first other spell effect 1830 /* Trim the search when we find the first other spell effect
1789 * this helps performance so that if a space has 50 spell objects, 1831 * this helps performance so that if a space has 50 spell objects,
1790 * we don't need to check all of them. 1832 * we don't need to check all of them.
1791 */ 1833 */
1809 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1851 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1810 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1852 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1811 { 1853 {
1812 1854
1813 float 1855 float
1814 diff = tmp->move_slow_penalty * FABS (op->speed); 1856 diff = tmp->move_slow_penalty * fabs (op->speed);
1815 1857
1816 if (op->type == PLAYER) 1858 if (op->type == PLAYER)
1817 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1859 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1818 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1860 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1819 diff /= 4.0; 1861 diff /= 4.0;
1846/* 1888/*
1847 * present_arch(arch, map, x, y) searches for any objects with 1889 * present_arch(arch, map, x, y) searches for any objects with
1848 * a matching archetype at the given map and coordinates. 1890 * a matching archetype at the given map and coordinates.
1849 * The first matching object is returned, or NULL if none. 1891 * The first matching object is returned, or NULL if none.
1850 */ 1892 */
1851
1852object * 1893object *
1853present_arch (const archetype *at, maptile *m, int x, int y) 1894present_arch (const archetype *at, maptile *m, int x, int y)
1854{ 1895{
1855 object *
1856 tmp;
1857
1858 if (m == NULL || out_of_map (m, x, y)) 1896 if (!m || out_of_map (m, x, y))
1859 { 1897 {
1860 LOG (llevError, "Present_arch called outside map.\n"); 1898 LOG (llevError, "Present_arch called outside map.\n");
1861 return NULL; 1899 return NULL;
1862 } 1900 }
1863 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1901
1902 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1864 if (tmp->arch == at) 1903 if (tmp->arch == at)
1865 return tmp; 1904 return tmp;
1905
1866 return NULL; 1906 return NULL;
1867} 1907}
1868 1908
1869/* 1909/*
1870 * present(type, map, x, y) searches for any objects with 1910 * present(type, map, x, y) searches for any objects with
1871 * a matching type variable at the given map and coordinates. 1911 * a matching type variable at the given map and coordinates.
1872 * The first matching object is returned, or NULL if none. 1912 * The first matching object is returned, or NULL if none.
1873 */ 1913 */
1874
1875object * 1914object *
1876present (unsigned char type, maptile *m, int x, int y) 1915present (unsigned char type, maptile *m, int x, int y)
1877{ 1916{
1878 object *
1879 tmp;
1880
1881 if (out_of_map (m, x, y)) 1917 if (out_of_map (m, x, y))
1882 { 1918 {
1883 LOG (llevError, "Present called outside map.\n"); 1919 LOG (llevError, "Present called outside map.\n");
1884 return NULL; 1920 return NULL;
1885 } 1921 }
1886 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1922
1923 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1887 if (tmp->type == type) 1924 if (tmp->type == type)
1888 return tmp; 1925 return tmp;
1926
1889 return NULL; 1927 return NULL;
1890} 1928}
1891 1929
1892/* 1930/*
1893 * present_in_ob(type, object) searches for any objects with 1931 * present_in_ob(type, object) searches for any objects with
1894 * a matching type variable in the inventory of the given object. 1932 * a matching type variable in the inventory of the given object.
1895 * The first matching object is returned, or NULL if none. 1933 * The first matching object is returned, or NULL if none.
1896 */ 1934 */
1897
1898object * 1935object *
1899present_in_ob (unsigned char type, const object *op) 1936present_in_ob (unsigned char type, const object *op)
1900{ 1937{
1901 object *
1902 tmp;
1903
1904 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1938 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1905 if (tmp->type == type) 1939 if (tmp->type == type)
1906 return tmp; 1940 return tmp;
1941
1907 return NULL; 1942 return NULL;
1908} 1943}
1909 1944
1910/* 1945/*
1911 * present_in_ob (type, str, object) searches for any objects with 1946 * present_in_ob (type, str, object) searches for any objects with
1922 * to be unique. 1957 * to be unique.
1923 */ 1958 */
1924object * 1959object *
1925present_in_ob_by_name (int type, const char *str, const object *op) 1960present_in_ob_by_name (int type, const char *str, const object *op)
1926{ 1961{
1927 object *tmp;
1928
1929 for (tmp = op->inv; tmp; tmp = tmp->below) 1962 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1963 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1931 return tmp; 1964 return tmp;
1932 1965
1933 return 0; 1966 return 0;
1934} 1967}
1972 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 2005 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973 { 2006 {
1974 CLEAR_FLAG (tmp, flag); 2007 CLEAR_FLAG (tmp, flag);
1975 unflag_inv (tmp, flag); 2008 unflag_inv (tmp, flag);
1976 } 2009 }
1977}
1978
1979/*
1980 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981 * all it's inventory (recursively).
1982 * If checksums are used, a player will get set_cheat called for
1983 * him/her-self and all object carried by a call to this function.
1984 */
1985void
1986set_cheat (object *op)
1987{
1988 SET_FLAG (op, FLAG_WAS_WIZ);
1989 flag_inv (op, FLAG_WAS_WIZ);
1990} 2010}
1991 2011
1992/* 2012/*
1993 * find_free_spot(object, map, x, y, start, stop) will search for 2013 * find_free_spot(object, map, x, y, start, stop) will search for
1994 * a spot at the given map and coordinates which will be able to contain 2014 * a spot at the given map and coordinates which will be able to contain
2035 } 2055 }
2036 2056
2037 if (!index) 2057 if (!index)
2038 return -1; 2058 return -1;
2039 2059
2040 return altern[RANDOM () % index]; 2060 return altern [rndm (index)];
2041} 2061}
2042 2062
2043/* 2063/*
2044 * find_first_free_spot(archetype, maptile, x, y) works like 2064 * find_first_free_spot(archetype, maptile, x, y) works like
2045 * find_free_spot(), but it will search max number of squares. 2065 * find_free_spot(), but it will search max number of squares.
2066{ 2086{
2067 arr += begin; 2087 arr += begin;
2068 end -= begin; 2088 end -= begin;
2069 2089
2070 while (--end) 2090 while (--end)
2071 swap (arr [end], arr [RANDOM () % (end + 1)]); 2091 swap (arr [end], arr [rndm (end + 1)]);
2072} 2092}
2073 2093
2074/* new function to make monster searching more efficient, and effective! 2094/* new function to make monster searching more efficient, and effective!
2075 * This basically returns a randomized array (in the passed pointer) of 2095 * This basically returns a randomized array (in the passed pointer) of
2076 * the spaces to find monsters. In this way, it won't always look for 2096 * the spaces to find monsters. In this way, it won't always look for
2143 2163
2144 if ((move_type & blocked) == move_type) 2164 if ((move_type & blocked) == move_type)
2145 max = maxfree[i]; 2165 max = maxfree[i];
2146 else if (mflags & P_IS_ALIVE) 2166 else if (mflags & P_IS_ALIVE)
2147 { 2167 {
2148 for (tmp = ms.bottom; tmp; tmp = tmp->above) 2168 for (tmp = ms.bot; tmp; tmp = tmp->above)
2149 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2169 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2150 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2170 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2151 break; 2171 break;
2152 2172
2153 if (tmp) 2173 if (tmp)
2210 2230
2211 return 3; 2231 return 3;
2212} 2232}
2213 2233
2214/* 2234/*
2215 * absdir(int): Returns a number between 1 and 8, which represent
2216 * the "absolute" direction of a number (it actually takes care of
2217 * "overflow" in previous calculations of a direction).
2218 */
2219
2220int
2221absdir (int d)
2222{
2223 while (d < 1)
2224 d += 8;
2225
2226 while (d > 8)
2227 d -= 8;
2228
2229 return d;
2230}
2231
2232/*
2233 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2235 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2234 * between two directions (which are expected to be absolute (see absdir()) 2236 * between two directions (which are expected to be absolute (see absdir())
2235 */ 2237 */
2236
2237int 2238int
2238dirdiff (int dir1, int dir2) 2239dirdiff (int dir1, int dir2)
2239{ 2240{
2240 int d; 2241 int d;
2241 2242
2407 insert_ob_in_ob (object_create_clone (item), dst); 2408 insert_ob_in_ob (object_create_clone (item), dst);
2408 2409
2409 return dst; 2410 return dst;
2410} 2411}
2411 2412
2412/* GROS - Creates an object using a string representing its content. */
2413/* Basically, we save the content of the string to a temp file, then call */
2414/* load_object on it. I admit it is a highly inefficient way to make things, */
2415/* but it was simple to make and allows reusing the load_object function. */
2416/* Remember not to use load_object_str in a time-critical situation. */
2417/* Also remember that multiparts objects are not supported for now. */
2418object *
2419load_object_str (const char *obstr)
2420{
2421 object *op;
2422 char filename[MAX_BUF];
2423
2424 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2425
2426 FILE *tempfile = fopen (filename, "w");
2427
2428 if (tempfile == NULL)
2429 {
2430 LOG (llevError, "Error - Unable to access load object temp file\n");
2431 return NULL;
2432 }
2433
2434 fprintf (tempfile, obstr);
2435 fclose (tempfile);
2436
2437 op = object::create ();
2438
2439 object_thawer thawer (filename);
2440
2441 if (thawer)
2442 load_object (thawer, op, 0);
2443
2444 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2445 CLEAR_FLAG (op, FLAG_REMOVED);
2446
2447 return op;
2448}
2449
2450/* This returns the first object in who's inventory that 2413/* This returns the first object in who's inventory that
2451 * has the same type and subtype match. 2414 * has the same type and subtype match.
2452 * returns NULL if no match. 2415 * returns NULL if no match.
2453 */ 2416 */
2454object * 2417object *
2507 if (link->key == canonical_key) 2470 if (link->key == canonical_key)
2508 return link->value; 2471 return link->value;
2509 2472
2510 return 0; 2473 return 0;
2511} 2474}
2512
2513 2475
2514/* 2476/*
2515 * Updates the canonical_key in op to value. 2477 * Updates the canonical_key in op to value.
2516 * 2478 *
2517 * canonical_key is a shared string (value doesn't have to be). 2479 * canonical_key is a shared string (value doesn't have to be).
2620 } 2582 }
2621 else 2583 else
2622 item = item->env; 2584 item = item->env;
2623} 2585}
2624 2586
2587
2588const char *
2589object::flag_desc (char *desc, int len) const
2590{
2591 char *p = desc;
2592 bool first = true;
2593
2594 *p = 0;
2595
2596 for (int i = 0; i < NUM_FLAGS; i++)
2597 {
2598 if (len <= 10) // magic constant!
2599 {
2600 snprintf (p, len, ",...");
2601 break;
2602 }
2603
2604 if (flag [i])
2605 {
2606 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2607 len -= cnt;
2608 p += cnt;
2609 first = false;
2610 }
2611 }
2612
2613 return desc;
2614}
2615
2625// return a suitable string describing an objetc in enough detail to find it 2616// return a suitable string describing an object in enough detail to find it
2626const char * 2617const char *
2627object::debug_desc (char *info) const 2618object::debug_desc (char *info) const
2628{ 2619{
2620 char flagdesc[512];
2629 char info2[256 * 3]; 2621 char info2[256 * 4];
2630 char *p = info; 2622 char *p = info;
2631 2623
2632 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2624 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2633 count, 2625 count, uuid.seq,
2634 &name, 2626 &name,
2635 title ? " " : "", 2627 title ? "\",title:\"" : "",
2636 title ? (const char *)title : ""); 2628 title ? (const char *)title : "",
2629 flag_desc (flagdesc, 512), type);
2637 2630
2638 if (env) 2631 if (env)
2639 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2632 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2640 2633
2641 if (map) 2634 if (map)
2642 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2635 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2643 2636
2644 return info; 2637 return info;
2645} 2638}
2646 2639
2647const char * 2640const char *
2648object::debug_desc () const 2641object::debug_desc () const
2649{ 2642{
2650 static char info[256 * 3]; 2643 static char info[3][256 * 4];
2644 static int info_idx;
2645
2651 return debug_desc (info); 2646 return debug_desc (info [++info_idx % 3]);
2652} 2647}
2653 2648
2649struct region *
2650object::region () const
2651{
2652 return map ? map->region (x, y)
2653 : region::default_region ();
2654}
2655
2656const materialtype_t *
2657object::dominant_material () const
2658{
2659 if (materialtype_t *mat = name_to_material (materialname))
2660 return mat;
2661
2662 // omfg this is slow, this has to be temporary :)
2663 shstr unknown ("unknown");
2664
2665 return name_to_material (unknown);
2666}
2667
2668void
2669object::open_container (object *new_container)
2670{
2671 if (container == new_container)
2672 return;
2673
2674 if (object *old_container = container)
2675 {
2676 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2677 return;
2678
2679#if 0
2680 // remove the "Close old_container" object.
2681 if (object *closer = old_container->inv)
2682 if (closer->type == CLOSE_CON)
2683 closer->destroy ();
2684#endif
2685
2686 old_container->flag [FLAG_APPLIED] = 0;
2687 container = 0;
2688
2689 esrv_update_item (UPD_FLAGS, this, old_container);
2690 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2691 }
2692
2693 if (new_container)
2694 {
2695 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2696 return;
2697
2698 // TODO: this does not seem to serve any purpose anymore?
2699#if 0
2700 // insert the "Close Container" object.
2701 if (archetype *closer = new_container->other_arch)
2702 {
2703 object *closer = arch_to_object (new_container->other_arch);
2704 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2705 new_container->insert (closer);
2706 }
2707#endif
2708
2709 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2710
2711 new_container->flag [FLAG_APPLIED] = 1;
2712 container = new_container;
2713
2714 esrv_update_item (UPD_FLAGS, this, new_container);
2715 esrv_send_inventory (this, new_container);
2716 }
2717}
2718
2719

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines