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.101 by root, Mon Jan 1 17:30:33 2007 UTC vs.
Revision 1.148 by root, Mon May 14 19:08:25 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,
322sum_weight (object *op) 325sum_weight (object *op)
323{ 326{
324 long sum; 327 long sum;
325 object *inv; 328 object *inv;
326 329
327 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
328 { 331 {
329 if (inv->inv) 332 if (inv->inv)
330 sum_weight (inv); 333 sum_weight (inv);
334
331 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332 } 336 }
333 337
334 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
335 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
355/* 359/*
356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357 * Some error messages. 361 * Some error messages.
358 * 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.
359 */ 363 */
360
361char * 364char *
362dump_object (object *op) 365dump_object (object *op)
363{ 366{
364 if (!op) 367 if (!op)
365 return strdup ("[NULLOBJ]"); 368 return strdup ("[NULLOBJ]");
366 369
367 object_freezer freezer; 370 object_freezer freezer;
368 save_object (freezer, op, 1); 371 op->write (freezer);
369 return freezer.as_string (); 372 return freezer.as_string ();
370} 373}
371 374
372/* 375/*
373 * 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
390} 393}
391 394
392/* 395/*
393 * 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.
394 */ 397 */
395
396object * 398object *
397find_object (tag_t i) 399find_object (tag_t i)
398{ 400{
399 for (object *op = object::first; op; op = op->next) 401 for_all_objects (op)
400 if (op->count == i) 402 if (op->count == i)
401 return op; 403 return op;
402 404
403 return 0; 405 return 0;
404} 406}
405 407
406/* 408/*
407 * 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.
408 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 411 * Enables features like "patch <name-of-other-player> food 999"
410 */ 412 */
411
412object * 413object *
413find_object_name (const char *str) 414find_object_name (const char *str)
414{ 415{
415 shstr_cmp str_ (str); 416 shstr_cmp str_ (str);
416 object *op; 417 object *op;
417 418
418 for (op = object::first; op != NULL; op = op->next) 419 for_all_objects (op)
419 if (op->name == str_) 420 if (op->name == str_)
420 break; 421 break;
421 422
422 return op; 423 return op;
423} 424}
449 owner = owner->owner; 450 owner = owner->owner;
450 451
451 this->owner = owner; 452 this->owner = owner;
452} 453}
453 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 return true;
511}
512
454/* Zero the key_values on op, decrementing the shared-string 513/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 514 * refcounts and freeing the links.
456 */ 515 */
457static void 516static void
458free_key_values (object *op) 517free_key_values (object *op)
459{ 518{
460 for (key_value *i = op->key_values; i != 0;) 519 for (key_value *i = op->key_values; i; )
461 { 520 {
462 key_value *next = i->next; 521 key_value *next = i->next;
463 delete i; 522 delete i;
464 523
465 i = next; 524 i = next;
466 } 525 }
467 526
468 op->key_values = 0; 527 op->key_values = 0;
469} 528}
470 529
471/* 530object &
472 * copy_to first frees everything allocated by the dst object, 531object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 532{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 533 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 534 bool is_removed = flag [FLAG_REMOVED];
484 535
485 *(object_copy *)dst = *this; 536 *(object_copy *)this = src;
486 537
487 if (is_freed) 538 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 539 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495 540
496 /* Copy over key_values, if any. */ 541 /* Copy over key_values, if any. */
497 if (key_values) 542 if (src.key_values)
498 { 543 {
499 key_value *tail = 0; 544 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 545 key_values = 0;
503 546
504 for (i = key_values; i; i = i->next) 547 for (key_value *i = src.key_values; i; i = i->next)
505 { 548 {
506 key_value *new_link = new key_value; 549 key_value *new_link = new key_value;
507 550
508 new_link->next = 0; 551 new_link->next = 0;
509 new_link->key = i->key; 552 new_link->key = i->key;
510 new_link->value = i->value; 553 new_link->value = i->value;
511 554
512 /* Try and be clever here, too. */ 555 /* Try and be clever here, too. */
513 if (!dst->key_values) 556 if (!key_values)
514 { 557 {
515 dst->key_values = new_link; 558 key_values = new_link;
516 tail = new_link; 559 tail = new_link;
517 } 560 }
518 else 561 else
519 { 562 {
520 tail->next = new_link; 563 tail->next = new_link;
521 tail = new_link; 564 tail = new_link;
522 } 565 }
523 } 566 }
524 } 567 }
568}
569
570/*
571 * copy_to first frees everything allocated by the dst object,
572 * and then copies the contents of itself into the second
573 * object, allocating what needs to be allocated. Basically, any
574 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
575 * if the first object is freed, the pointers in the new object
576 * will point at garbage.
577 */
578void
579object::copy_to (object *dst)
580{
581 *dst = *this;
582
583 if (speed < 0)
584 dst->speed_left = speed_left - rndm ();
525 585
526 dst->set_speed (dst->speed); 586 dst->set_speed (dst->speed);
587}
588
589void
590object::instantiate ()
591{
592 if (!uuid.seq) // HACK
593 uuid = gen_uuid ();
594
595 speed_left = -0.1f;
596 /* copy the body_info to the body_used - this is only really
597 * need for monsters, but doesn't hurt to do it for everything.
598 * by doing so, when a monster is created, it has good starting
599 * values for the body_used info, so when items are created
600 * for it, they can be properly equipped.
601 */
602 for (int i = NUM_BODY_LOCATIONS; i--; )
603 slot[i].used = slot[i].info;
604
605 attachable::instantiate ();
527} 606}
528 607
529object * 608object *
530object::clone () 609object::clone ()
531{ 610{
589 * UP_OBJ_FACE: only the objects face has changed. 668 * UP_OBJ_FACE: only the objects face has changed.
590 */ 669 */
591void 670void
592update_object (object *op, int action) 671update_object (object *op, int action)
593{ 672{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 673 if (op == NULL)
597 { 674 {
598 /* this should never happen */ 675 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 676 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 677 return;
660 737
661 if (op->more) 738 if (op->more)
662 update_object (op->more, action); 739 update_object (op->more, action);
663} 740}
664 741
665object *object::first;
666
667object::object () 742object::object ()
668{ 743{
669 SET_FLAG (this, FLAG_REMOVED); 744 SET_FLAG (this, FLAG_REMOVED);
670 745
671 expmul = 1.0; 746 expmul = 1.0;
672 face = blank_face; 747 face = blank_face;
673} 748}
674 749
675object::~object () 750object::~object ()
676{ 751{
752 unlink ();
753
677 free_key_values (this); 754 free_key_values (this);
678} 755}
679 756
757static int object_count;
758
680void object::link () 759void object::link ()
681{ 760{
682 count = ++ob_count; 761 assert (!index);//D
683 uuid = gen_uuid (); 762 uuid = gen_uuid ();
763 count = ++object_count;
684 764
685 prev = 0; 765 refcnt_inc ();
686 next = object::first; 766 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 767}
693 768
694void object::unlink () 769void object::unlink ()
695{ 770{
696 if (this == object::first) 771 if (!index)
697 object::first = next; 772 return;
698 773
699 /* Remove this object from the list of used objects */ 774 objects.erase (this);
700 if (prev) prev->next = next; 775 refcnt_dec ();
701 if (next) next->prev = prev;
702
703 prev = 0;
704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711} 776}
712 777
713void 778void
714object::activate () 779object::activate ()
715{ 780{
716 /* If already on active list, don't do anything */ 781 /* If already on active list, don't do anything */
717 if (active ()) 782 if (active)
718 return; 783 return;
719 784
720 if (has_active_speed ()) 785 if (has_active_speed ())
721 { 786 actives.insert (this);
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731} 787}
732 788
733void 789void
734object::activate_recursive () 790object::activate_recursive ()
735{ 791{
736 activate (); 792 activate ();
737 793
738 for (object *op = inv; op; op = op->above) 794 for (object *op = inv; op; op = op->below)
739 op->activate_recursive (); 795 op->activate_recursive ();
740} 796}
741 797
742/* This function removes object 'op' from the list of active 798/* This function removes object 'op' from the list of active
743 * objects. 799 * objects.
749 */ 805 */
750void 806void
751object::deactivate () 807object::deactivate ()
752{ 808{
753 /* If not on the active list, nothing needs to be done */ 809 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 810 if (!active)
755 return; 811 return;
756 812
757 if (active_prev == 0) 813 actives.erase (this);
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772} 814}
773 815
774void 816void
775object::deactivate_recursive () 817object::deactivate_recursive ()
776{ 818{
777 for (object *op = inv; op; op = op->above) 819 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 820 op->deactivate_recursive ();
779 821
780 deactivate (); 822 deactivate ();
823}
824
825void
826object::set_flag_inv (int flag, int value)
827{
828 for (object *op = inv; op; op = op->below)
829 {
830 op->flag [flag] = value;
831 op->set_flag_inv (flag, value);
832 }
781} 833}
782 834
783/* 835/*
784 * Remove and free all objects in the inventory of the given object. 836 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 837 * object.c ?
800 * drop on that space. 852 * drop on that space.
801 */ 853 */
802 if (!drop_to_ground 854 if (!drop_to_ground
803 || !map 855 || !map
804 || map->in_memory != MAP_IN_MEMORY 856 || map->in_memory != MAP_IN_MEMORY
857 || map->nodrop
805 || ms ().move_block == MOVE_ALL) 858 || ms ().move_block == MOVE_ALL)
806 { 859 {
807 while (inv) 860 while (inv)
808 { 861 {
809 inv->destroy_inv (drop_to_ground); 862 inv->destroy_inv (drop_to_ground);
818 871
819 if (op->flag [FLAG_STARTEQUIP] 872 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 873 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 874 || op->type == RUNE
822 || op->type == TRAP 875 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 876 || op->flag [FLAG_IS_A_TEMPLATE]
877 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 878 op->destroy ();
825 else 879 else
826 map->insert (op, x, y); 880 map->insert (op, x, y);
827 } 881 }
828 } 882 }
836} 890}
837 891
838void 892void
839object::do_destroy () 893object::do_destroy ()
840{ 894{
895 attachable::do_destroy ();
896
841 if (flag [FLAG_IS_LINKED]) 897 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this); 898 remove_button_link (this);
843 899
844 if (flag [FLAG_FRIENDLY]) 900 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this); 901 remove_friendly_object (this);
846 902
847 if (!flag [FLAG_REMOVED]) 903 if (!flag [FLAG_REMOVED])
848 remove (); 904 remove ();
849 905
850 if (flag [FLAG_FREED]) 906 destroy_inv (true);
851 return;
852 907
853 set_speed (0); 908 deactivate ();
909 unlink ();
854 910
855 flag [FLAG_FREED] = 1; 911 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861 912
862 // hack to ensure that freed objects still have a valid map 913 // hack to ensure that freed objects still have a valid map
863 { 914 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes 915 static maptile *freed_map; // freed objects are moved here to avoid crashes
865 916
870 freed_map->name = "/internal/freed_objects_map"; 921 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 922 freed_map->width = 3;
872 freed_map->height = 3; 923 freed_map->height = 3;
873 924
874 freed_map->alloc (); 925 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY;
875 } 927 }
876 928
877 map = freed_map; 929 map = freed_map;
878 x = 1; 930 x = 1;
879 y = 1; 931 y = 1;
889 941
890 // clear those pointers that likely might have circular references to us 942 // clear those pointers that likely might have circular references to us
891 owner = 0; 943 owner = 0;
892 enemy = 0; 944 enemy = 0;
893 attacked_by = 0; 945 attacked_by = 0;
894
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
897} 946}
898 947
899void 948void
900object::destroy (bool destroy_inventory) 949object::destroy (bool destroy_inventory)
901{ 950{
929 * This function removes the object op from the linked list of objects 978 * This function removes the object op from the linked list of objects
930 * which it is currently tied to. When this function is done, the 979 * which it is currently tied to. When this function is done, the
931 * object will have no environment. If the object previously had an 980 * object will have no environment. If the object previously had an
932 * environment, the x and y coordinates will be updated to 981 * environment, the x and y coordinates will be updated to
933 * the previous environment. 982 * the previous environment.
934 * Beware: This function is called from the editor as well!
935 */ 983 */
936void 984void
937object::remove () 985object::do_remove ()
938{ 986{
939 object *tmp, *last = 0; 987 object *tmp, *last = 0;
940 object *otmp; 988 object *otmp;
941 989
942 if (QUERY_FLAG (this, FLAG_REMOVED)) 990 if (QUERY_FLAG (this, FLAG_REMOVED))
985 } 1033 }
986 else if (map) 1034 else if (map)
987 { 1035 {
988 if (type == PLAYER) 1036 if (type == PLAYER)
989 { 1037 {
1038 // leaving a spot always closes any open container on the ground
1039 if (container && !container->env)
1040 // this causes spurious floorbox updates, but it ensures
1041 // that the CLOSE event is being sent.
1042 close_container ();
1043
990 --map->players; 1044 --map->players;
991 map->touch (); 1045 map->touch ();
992 } 1046 }
993 1047
994 map->dirty = true; 1048 map->dirty = true;
1049 mapspace &ms = this->ms ();
995 1050
996 /* link the object above us */ 1051 /* link the object above us */
997 if (above) 1052 if (above)
998 above->below = below; 1053 above->below = below;
999 else 1054 else
1000 map->at (x, y).top = below; /* we were top, set new top */ 1055 ms.top = below; /* we were top, set new top */
1001 1056
1002 /* Relink the object below us, if there is one */ 1057 /* Relink the object below us, if there is one */
1003 if (below) 1058 if (below)
1004 below->above = above; 1059 below->above = above;
1005 else 1060 else
1007 /* Nothing below, which means we need to relink map object for this space 1062 /* Nothing below, which means we need to relink map object for this space
1008 * use translated coordinates in case some oddness with map tiling is 1063 * use translated coordinates in case some oddness with map tiling is
1009 * evident 1064 * evident
1010 */ 1065 */
1011 if (GET_MAP_OB (map, x, y) != this) 1066 if (GET_MAP_OB (map, x, y) != this)
1012 {
1013 char *dump = dump_object (this);
1014 LOG (llevError,
1015 "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); 1067 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 ());
1016 free (dump);
1017 dump = dump_object (GET_MAP_OB (map, x, y));
1018 LOG (llevError, "%s\n", dump);
1019 free (dump);
1020 }
1021 1068
1022 map->at (x, y).bot = above; /* goes on above it. */ 1069 ms.bot = above; /* goes on above it. */
1023 } 1070 }
1024 1071
1025 above = 0; 1072 above = 0;
1026 below = 0; 1073 below = 0;
1027 1074
1028 if (map->in_memory == MAP_SAVING) 1075 if (map->in_memory == MAP_SAVING)
1029 return; 1076 return;
1030 1077
1031 int check_walk_off = !flag [FLAG_NO_APPLY]; 1078 int check_walk_off = !flag [FLAG_NO_APPLY];
1032 1079
1033 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1080 for (tmp = ms.bot; tmp; tmp = tmp->above)
1034 { 1081 {
1035 /* No point updating the players look faces if he is the object 1082 /* No point updating the players look faces if he is the object
1036 * being removed. 1083 * being removed.
1037 */ 1084 */
1038 1085
1118 } 1165 }
1119 1166
1120 return 0; 1167 return 0;
1121} 1168}
1122 1169
1170void
1171object::expand_tail ()
1172{
1173 if (more)
1174 return;
1175
1176 object *prev = this;
1177
1178 for (archetype *at = arch->more; at; at = at->more)
1179 {
1180 object *op = arch_to_object (at);
1181
1182 op->name = name;
1183 op->name_pl = name_pl;
1184 op->title = title;
1185
1186 op->head = this;
1187 prev->more = op;
1188
1189 prev = op;
1190 }
1191}
1192
1123/* 1193/*
1124 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1194 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1125 * job preparing multi-part monsters 1195 * job preparing multi-part monsters.
1126 */ 1196 */
1127object * 1197object *
1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1198insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129{ 1199{
1130 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1200 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1157 * just 'op' otherwise 1227 * just 'op' otherwise
1158 */ 1228 */
1159object * 1229object *
1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1230insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161{ 1231{
1232 assert (!op->flag [FLAG_FREED]);
1233
1162 object *tmp, *top, *floor = NULL; 1234 object *tmp, *top, *floor = NULL;
1163 sint16 x, y;
1164 1235
1165 if (QUERY_FLAG (op, FLAG_FREED)) 1236 op->remove ();
1166 {
1167 LOG (llevError, "Trying to insert freed object!\n");
1168 return NULL;
1169 }
1170 1237
1171 if (!m) 1238#if 0
1172 { 1239 if (!m->active != !op->active)
1173 char *dump = dump_object (op); 1240 if (m->active)
1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1241 op->activate_recursive ();
1175 free (dump); 1242 else
1176 return op; 1243 op->deactivate_recursive ();
1177 } 1244#endif
1178 1245
1179 if (out_of_map (m, op->x, op->y)) 1246 if (out_of_map (m, op->x, op->y))
1180 { 1247 {
1181 char *dump = dump_object (op);
1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1248 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1183#ifdef MANY_CORES 1249#ifdef MANY_CORES
1184 /* Better to catch this here, as otherwise the next use of this object 1250 /* Better to catch this here, as otherwise the next use of this object
1185 * is likely to cause a crash. Better to find out where it is getting 1251 * is likely to cause a crash. Better to find out where it is getting
1186 * improperly inserted. 1252 * improperly inserted.
1187 */ 1253 */
1188 abort (); 1254 abort ();
1189#endif 1255#endif
1190 free (dump);
1191 return op; 1256 return op;
1192 } 1257 }
1193 1258
1194 if (!QUERY_FLAG (op, FLAG_REMOVED))
1195 {
1196 char *dump = dump_object (op);
1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198 free (dump);
1199 return op;
1200 }
1201
1202 if (op->more)
1203 {
1204 /* The part may be on a different map. */
1205
1206 object *more = op->more; 1259 if (object *more = op->more)
1207 1260 {
1208 /* We really need the caller to normalize coordinates - if
1209 * we set the map, that doesn't work if the location is within
1210 * a map and this is straddling an edge. So only if coordinate
1211 * is clear wrong do we normalize it.
1212 */
1213 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214 more->map = get_map_from_coord (m, &more->x, &more->y);
1215 else if (!more->map)
1216 {
1217 /* For backwards compatibility - when not dealing with tiled maps,
1218 * more->map should always point to the parent.
1219 */
1220 more->map = m;
1221 }
1222
1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1261 if (!insert_ob_in_map (more, m, originator, flag))
1224 { 1262 {
1225 if (!op->head) 1263 if (!op->head)
1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1264 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227 1265
1228 return 0; 1266 return 0;
1233 1271
1234 /* Ideally, the caller figures this out. However, it complicates a lot 1272 /* Ideally, the caller figures this out. However, it complicates a lot
1235 * of areas of callers (eg, anything that uses find_free_spot would now 1273 * of areas of callers (eg, anything that uses find_free_spot would now
1236 * need extra work 1274 * need extra work
1237 */ 1275 */
1238 op->map = get_map_from_coord (m, &op->x, &op->y); 1276 if (!xy_normalise (m, op->x, op->y))
1239 x = op->x; 1277 return 0;
1240 y = op->y; 1278
1279 op->map = m;
1280 mapspace &ms = op->ms ();
1241 1281
1242 /* this has to be done after we translate the coordinates. 1282 /* this has to be done after we translate the coordinates.
1243 */ 1283 */
1244 if (op->nrof && !(flag & INS_NO_MERGE)) 1284 if (op->nrof && !(flag & INS_NO_MERGE))
1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1285 for (tmp = ms.bot; tmp; tmp = tmp->above)
1246 if (object::can_merge (op, tmp)) 1286 if (object::can_merge (op, tmp))
1247 { 1287 {
1248 op->nrof += tmp->nrof; 1288 op->nrof += tmp->nrof;
1249 tmp->destroy (); 1289 tmp->destroy ();
1250 } 1290 }
1267 op->below = originator->below; 1307 op->below = originator->below;
1268 1308
1269 if (op->below) 1309 if (op->below)
1270 op->below->above = op; 1310 op->below->above = op;
1271 else 1311 else
1272 op->ms ().bot = op; 1312 ms.bot = op;
1273 1313
1274 /* since *below* originator, no need to update top */ 1314 /* since *below* originator, no need to update top */
1275 originator->below = op; 1315 originator->below = op;
1276 } 1316 }
1277 else 1317 else
1278 { 1318 {
1319 top = ms.bot;
1320
1279 /* If there are other objects, then */ 1321 /* If there are other objects, then */
1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1322 if ((!(flag & INS_MAP_LOAD)) && top)
1281 { 1323 {
1282 object *last = 0; 1324 object *last = 0;
1283 1325
1284 /* 1326 /*
1285 * If there are multiple objects on this space, we do some trickier handling. 1327 * If there are multiple objects on this space, we do some trickier handling.
1291 * once we get to them. This reduces the need to traverse over all of 1333 * once we get to them. This reduces the need to traverse over all of
1292 * them when adding another one - this saves quite a bit of cpu time 1334 * them when adding another one - this saves quite a bit of cpu time
1293 * when lots of spells are cast in one area. Currently, it is presumed 1335 * when lots of spells are cast in one area. Currently, it is presumed
1294 * that flying non pickable objects are spell objects. 1336 * that flying non pickable objects are spell objects.
1295 */ 1337 */
1296 while (top) 1338 for (top = ms.bot; top; top = top->above)
1297 { 1339 {
1298 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1340 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1299 floor = top; 1341 floor = top;
1300 1342
1301 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1343 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1304 top = top->below; 1346 top = top->below;
1305 break; 1347 break;
1306 } 1348 }
1307 1349
1308 last = top; 1350 last = top;
1309 top = top->above;
1310 } 1351 }
1311 1352
1312 /* Don't want top to be NULL, so set it to the last valid object */ 1353 /* Don't want top to be NULL, so set it to the last valid object */
1313 top = last; 1354 top = last;
1314 1355
1316 * looks like instead of lots of conditions here. 1357 * looks like instead of lots of conditions here.
1317 * makes things faster, and effectively the same result. 1358 * makes things faster, and effectively the same result.
1318 */ 1359 */
1319 1360
1320 /* Have object 'fall below' other objects that block view. 1361 /* Have object 'fall below' other objects that block view.
1321 * Unless those objects are exits, type 66 1362 * Unless those objects are exits.
1322 * If INS_ON_TOP is used, don't do this processing 1363 * If INS_ON_TOP is used, don't do this processing
1323 * Need to find the object that in fact blocks view, otherwise 1364 * Need to find the object that in fact blocks view, otherwise
1324 * stacking is a bit odd. 1365 * stacking is a bit odd.
1325 */ 1366 */
1326 if (!(flag & INS_ON_TOP) && 1367 if (!(flag & INS_ON_TOP)
1327 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1368 && ms.flags () & P_BLOCKSVIEW
1369 && (op->face && !faces [op->face].visibility))
1328 { 1370 {
1329 for (last = top; last != floor; last = last->below) 1371 for (last = top; last != floor; last = last->below)
1330 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1372 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1331 break; 1373 break;
1374
1332 /* Check to see if we found the object that blocks view, 1375 /* Check to see if we found the object that blocks view,
1333 * and make sure we have a below pointer for it so that 1376 * and make sure we have a below pointer for it so that
1334 * we can get inserted below this one, which requires we 1377 * we can get inserted below this one, which requires we
1335 * set top to the object below us. 1378 * set top to the object below us.
1336 */ 1379 */
1338 top = last->below; 1381 top = last->below;
1339 } 1382 }
1340 } /* If objects on this space */ 1383 } /* If objects on this space */
1341 1384
1342 if (flag & INS_MAP_LOAD) 1385 if (flag & INS_MAP_LOAD)
1343 top = GET_MAP_TOP (op->map, op->x, op->y); 1386 top = ms.top;
1344 1387
1345 if (flag & INS_ABOVE_FLOOR_ONLY) 1388 if (flag & INS_ABOVE_FLOOR_ONLY)
1346 top = floor; 1389 top = floor;
1347 1390
1348 /* Top is the object that our object (op) is going to get inserted above. 1391 /* Top is the object that our object (op) is going to get inserted above.
1349 */ 1392 */
1350 1393
1351 /* First object on this space */ 1394 /* First object on this space */
1352 if (!top) 1395 if (!top)
1353 { 1396 {
1354 op->above = GET_MAP_OB (op->map, op->x, op->y); 1397 op->above = ms.bot;
1355 1398
1356 if (op->above) 1399 if (op->above)
1357 op->above->below = op; 1400 op->above->below = op;
1358 1401
1359 op->below = 0; 1402 op->below = 0;
1360 op->ms ().bot = op; 1403 ms.bot = op;
1361 } 1404 }
1362 else 1405 else
1363 { /* get inserted into the stack above top */ 1406 { /* get inserted into the stack above top */
1364 op->above = top->above; 1407 op->above = top->above;
1365 1408
1369 op->below = top; 1412 op->below = top;
1370 top->above = op; 1413 top->above = op;
1371 } 1414 }
1372 1415
1373 if (!op->above) 1416 if (!op->above)
1374 op->ms ().top = op; 1417 ms.top = op;
1375 } /* else not INS_BELOW_ORIGINATOR */ 1418 } /* else not INS_BELOW_ORIGINATOR */
1376 1419
1377 if (op->type == PLAYER) 1420 if (op->type == PLAYER)
1378 { 1421 {
1379 op->contr->do_los = 1; 1422 op->contr->do_los = 1;
1385 1428
1386 /* If we have a floor, we know the player, if any, will be above 1429 /* If we have a floor, we know the player, if any, will be above
1387 * it, so save a few ticks and start from there. 1430 * it, so save a few ticks and start from there.
1388 */ 1431 */
1389 if (!(flag & INS_MAP_LOAD)) 1432 if (!(flag & INS_MAP_LOAD))
1390 if (object *pl = op->ms ().player ()) 1433 if (object *pl = ms.player ())
1391 if (pl->contr->ns) 1434 if (pl->contr->ns)
1392 pl->contr->ns->floorbox_update (); 1435 pl->contr->ns->floorbox_update ();
1393 1436
1394 /* If this object glows, it may affect lighting conditions that are 1437 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1438 * visible to others on this map. But update_all_los is really
1443{ 1486{
1444 object *tmp, *tmp1; 1487 object *tmp, *tmp1;
1445 1488
1446 /* first search for itself and remove any old instances */ 1489 /* first search for itself and remove any old instances */
1447 1490
1448 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1491 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1492 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1450 tmp->destroy (); 1493 tmp->destroy ();
1451 1494
1452 tmp1 = arch_to_object (archetype::find (arch_string)); 1495 tmp1 = arch_to_object (archetype::find (arch_string));
1453 1496
1457} 1500}
1458 1501
1459object * 1502object *
1460object::insert_at (object *where, object *originator, int flags) 1503object::insert_at (object *where, object *originator, int flags)
1461{ 1504{
1462 where->map->insert (this, where->x, where->y, originator, flags); 1505 return where->map->insert (this, where->x, where->y, originator, flags);
1463} 1506}
1464 1507
1465/* 1508/*
1466 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1509 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1467 * is returned contains nr objects, and the remaining parts contains 1510 * is returned contains nr objects, and the remaining parts contains
1507 * the amount of an object. If the amount reaches 0, the object 1550 * the amount of an object. If the amount reaches 0, the object
1508 * is subsequently removed and freed. 1551 * is subsequently removed and freed.
1509 * 1552 *
1510 * Return value: 'op' if something is left, NULL if the amount reached 0 1553 * Return value: 'op' if something is left, NULL if the amount reached 0
1511 */ 1554 */
1512
1513object * 1555object *
1514decrease_ob_nr (object *op, uint32 i) 1556decrease_ob_nr (object *op, uint32 i)
1515{ 1557{
1516 object *tmp; 1558 object *tmp;
1517 1559
1592 1634
1593/* 1635/*
1594 * add_weight(object, weight) adds the specified weight to an object, 1636 * add_weight(object, weight) adds the specified weight to an object,
1595 * and also updates how much the environment(s) is/are carrying. 1637 * and also updates how much the environment(s) is/are carrying.
1596 */ 1638 */
1597
1598void 1639void
1599add_weight (object *op, signed long weight) 1640add_weight (object *op, signed long weight)
1600{ 1641{
1601 while (op != NULL) 1642 while (op != NULL)
1602 { 1643 {
1634 * inside the object environment. 1675 * inside the object environment.
1635 * 1676 *
1636 * The function returns now pointer to inserted item, and return value can 1677 * The function returns now pointer to inserted item, and return value can
1637 * be != op, if items are merged. -Tero 1678 * be != op, if items are merged. -Tero
1638 */ 1679 */
1639
1640object * 1680object *
1641object::insert (object *op) 1681object::insert (object *op)
1642{ 1682{
1643 object *tmp, *otmp; 1683 object *tmp, *otmp;
1644 1684
1776 1816
1777 /* The objects have to be checked from top to bottom. 1817 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1818 * Hence, we first go to the top:
1779 */ 1819 */
1780 1820
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1821 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1822 {
1783 /* Trim the search when we find the first other spell effect 1823 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1824 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1825 * we don't need to check all of them.
1786 */ 1826 */
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1844 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1845 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1846 {
1807 1847
1808 float 1848 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1849 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1850
1811 if (op->type == PLAYER) 1851 if (op->type == PLAYER)
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1852 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1813 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1853 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1854 diff /= 4.0;
1844 * The first matching object is returned, or NULL if none. 1884 * The first matching object is returned, or NULL if none.
1845 */ 1885 */
1846object * 1886object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1887present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1888{
1849 if (m == NULL || out_of_map (m, x, y)) 1889 if (!m || out_of_map (m, x, y))
1850 { 1890 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1891 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1892 return NULL;
1853 } 1893 }
1854 1894
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1895 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1896 if (tmp->arch == at)
1857 return tmp; 1897 return tmp;
1858 1898
1859 return NULL; 1899 return NULL;
1860} 1900}
1871 { 1911 {
1872 LOG (llevError, "Present called outside map.\n"); 1912 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1913 return NULL;
1874 } 1914 }
1875 1915
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1916 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1917 if (tmp->type == type)
1878 return tmp; 1918 return tmp;
1879 1919
1880 return NULL; 1920 return NULL;
1881} 1921}
2021 } 2061 }
2022 2062
2023 if (!index) 2063 if (!index)
2024 return -1; 2064 return -1;
2025 2065
2026 return altern[RANDOM () % index]; 2066 return altern [rndm (index)];
2027} 2067}
2028 2068
2029/* 2069/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2070 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2071 * find_free_spot(), but it will search max number of squares.
2052{ 2092{
2053 arr += begin; 2093 arr += begin;
2054 end -= begin; 2094 end -= begin;
2055 2095
2056 while (--end) 2096 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2097 swap (arr [end], arr [rndm (end + 1)]);
2058} 2098}
2059 2099
2060/* new function to make monster searching more efficient, and effective! 2100/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2101 * This basically returns a randomized array (in the passed pointer) of
2062 * the spaces to find monsters. In this way, it won't always look for 2102 * the spaces to find monsters. In this way, it won't always look for
2196 2236
2197 return 3; 2237 return 3;
2198} 2238}
2199 2239
2200/* 2240/*
2201 * absdir(int): Returns a number between 1 and 8, which represent
2202 * the "absolute" direction of a number (it actually takes care of
2203 * "overflow" in previous calculations of a direction).
2204 */
2205
2206int
2207absdir (int d)
2208{
2209 while (d < 1)
2210 d += 8;
2211
2212 while (d > 8)
2213 d -= 8;
2214
2215 return d;
2216}
2217
2218/*
2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2241 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2242 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2243 */
2222
2223int 2244int
2224dirdiff (int dir1, int dir2) 2245dirdiff (int dir1, int dir2)
2225{ 2246{
2226 int d; 2247 int d;
2227 2248
2393 insert_ob_in_ob (object_create_clone (item), dst); 2414 insert_ob_in_ob (object_create_clone (item), dst);
2394 2415
2395 return dst; 2416 return dst;
2396} 2417}
2397 2418
2398/* GROS - Creates an object using a string representing its content. */
2399/* Basically, we save the content of the string to a temp file, then call */
2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2401/* but it was simple to make and allows reusing the load_object function. */
2402/* Remember not to use load_object_str in a time-critical situation. */
2403/* Also remember that multiparts objects are not supported for now. */
2404object *
2405load_object_str (const char *obstr)
2406{
2407 object *op;
2408 char filename[MAX_BUF];
2409
2410 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412 FILE *tempfile = fopen (filename, "w");
2413
2414 if (tempfile == NULL)
2415 {
2416 LOG (llevError, "Error - Unable to access load object temp file\n");
2417 return NULL;
2418 }
2419
2420 fprintf (tempfile, obstr);
2421 fclose (tempfile);
2422
2423 op = object::create ();
2424
2425 object_thawer thawer (filename);
2426
2427 if (thawer)
2428 load_object (thawer, op, 0);
2429
2430 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431 CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433 return op;
2434}
2435
2436/* This returns the first object in who's inventory that 2419/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2420 * has the same type and subtype match.
2438 * returns NULL if no match. 2421 * returns NULL if no match.
2439 */ 2422 */
2440object * 2423object *
2493 if (link->key == canonical_key) 2476 if (link->key == canonical_key)
2494 return link->value; 2477 return link->value;
2495 2478
2496 return 0; 2479 return 0;
2497} 2480}
2498
2499 2481
2500/* 2482/*
2501 * Updates the canonical_key in op to value. 2483 * Updates the canonical_key in op to value.
2502 * 2484 *
2503 * canonical_key is a shared string (value doesn't have to be). 2485 * canonical_key is a shared string (value doesn't have to be).
2643{ 2625{
2644 char flagdesc[512]; 2626 char flagdesc[512];
2645 char info2[256 * 4]; 2627 char info2[256 * 4];
2646 char *p = info; 2628 char *p = info;
2647 2629
2648 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2630 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2649 count, uuid.seq, 2631 count, uuid.seq,
2650 &name, 2632 &name,
2651 title ? "\",title:" : "", 2633 title ? "\",title:\"" : "",
2652 title ? (const char *)title : "", 2634 title ? (const char *)title : "",
2653 flag_desc (flagdesc, 512), type); 2635 flag_desc (flagdesc, 512), type);
2654 2636
2655 if (env) 2637 if (env)
2656 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2638 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2662} 2644}
2663 2645
2664const char * 2646const char *
2665object::debug_desc () const 2647object::debug_desc () const
2666{ 2648{
2667 static char info[256 * 3]; 2649 static char info[3][256 * 4];
2650 static int info_idx;
2651
2668 return debug_desc (info); 2652 return debug_desc (info [++info_idx % 3]);
2669} 2653}
2670 2654
2655struct region *
2656object::region () const
2657{
2658 return map ? map->region (x, y)
2659 : region::default_region ();
2660}
2661
2662const materialtype_t *
2663object::dominant_material () const
2664{
2665 if (materialtype_t *mat = name_to_material (materialname))
2666 return mat;
2667
2668 // omfg this is slow, this has to be temporary :)
2669 shstr unknown ("unknown");
2670
2671 return name_to_material (unknown);
2672}
2673
2674void
2675object::open_container (object *new_container)
2676{
2677 if (container == new_container)
2678 return;
2679
2680 if (object *old_container = container)
2681 {
2682 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2683 return;
2684
2685#if 0
2686 // remove the "Close old_container" object.
2687 if (object *closer = old_container->inv)
2688 if (closer->type == CLOSE_CON)
2689 closer->destroy ();
2690#endif
2691
2692 old_container->flag [FLAG_APPLIED] = 0;
2693 container = 0;
2694
2695 esrv_update_item (UPD_FLAGS, this, old_container);
2696 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2697 }
2698
2699 if (new_container)
2700 {
2701 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2702 return;
2703
2704 // TODO: this does not seem to serve any purpose anymore?
2705#if 0
2706 // insert the "Close Container" object.
2707 if (archetype *closer = new_container->other_arch)
2708 {
2709 object *closer = arch_to_object (new_container->other_arch);
2710 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2711 new_container->insert (closer);
2712 }
2713#endif
2714
2715 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2716
2717 new_container->flag [FLAG_APPLIED] = 1;
2718 container = new_container;
2719
2720 esrv_update_item (UPD_FLAGS, this, new_container);
2721 esrv_send_inventory (this, new_container);
2722 }
2723}
2724
2725

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines