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.98 by root, Sun Dec 31 17:17:22 2006 UTC vs.
Revision 1.143 by root, Tue May 1 05:48:20 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>
… …
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
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, 45short 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 46 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}; 47};
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, 48short 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) 324sum_weight (object *op)
323{ 325{
324 long sum; 326 long sum;
325 object *inv; 327 object *inv;
326 328
327 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
328 { 330 {
329 if (inv->inv) 331 if (inv->inv)
330 sum_weight (inv); 332 sum_weight (inv);
333
331 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332 } 335 }
333 336
334 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
335 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
… …
355/* 358/*
356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357 * Some error messages. 360 * Some error messages.
358 * The result of the dump is stored in the static global errmsg array. 361 * The result of the dump is stored in the static global errmsg array.
359 */ 362 */
360
361char * 363char *
362dump_object (object *op) 364dump_object (object *op)
363{ 365{
364 if (!op) 366 if (!op)
365 return strdup ("[NULLOBJ]"); 367 return strdup ("[NULLOBJ]");
366 368
367 object_freezer freezer; 369 object_freezer freezer;
368 save_object (freezer, op, 1); 370 op->write (freezer);
369 return freezer.as_string (); 371 return freezer.as_string ();
370} 372}
371 373
372/* 374/*
373 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
… …
390} 392}
391 393
392/* 394/*
393 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
394 */ 396 */
395
396object * 397object *
397find_object (tag_t i) 398find_object (tag_t i)
398{ 399{
399 for (object *op = object::first; op; op = op->next) 400 for_all_objects (op)
400 if (op->count == i) 401 if (op->count == i)
401 return op; 402 return op;
402 403
403 return 0; 404 return 0;
404} 405}
405 406
406/* 407/*
407 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
410 */ 411 */
411
412object * 412object *
413find_object_name (const char *str) 413find_object_name (const char *str)
414{ 414{
415 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
416 object *op; 416 object *op;
417 417
418 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
419 if (op->name == str_) 419 if (op->name == str_)
420 break; 420 break;
421 421
422 return op; 422 return op;
423} 423}
… …
455 * refcounts and freeing the links. 455 * refcounts and freeing the links.
456 */ 456 */
457static void 457static void
458free_key_values (object *op) 458free_key_values (object *op)
459{ 459{
460 for (key_value *i = op->key_values; i != 0;) 460 for (key_value *i = op->key_values; i; )
461 { 461 {
462 key_value *next = i->next; 462 key_value *next = i->next;
463 delete i; 463 delete i;
464 464
465 i = next; 465 i = next;
466 } 466 }
467 467
468 op->key_values = 0; 468 op->key_values = 0;
469} 469}
470 470
471/* 471object &
472 * copy_to first frees everything allocated by the dst object, 472object::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{ 473{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 474 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 475 bool is_removed = flag [FLAG_REMOVED];
484 476
485 *(object_copy *)dst = *this; 477 *(object_copy *)this = src;
486 478
487 if (is_freed) 479 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 480 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 481
496 /* Copy over key_values, if any. */ 482 /* Copy over key_values, if any. */
497 if (key_values) 483 if (src.key_values)
498 { 484 {
499 key_value *tail = 0; 485 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 486 key_values = 0;
503 487
504 for (i = key_values; i; i = i->next) 488 for (key_value *i = src.key_values; i; i = i->next)
505 { 489 {
506 key_value *new_link = new key_value; 490 key_value *new_link = new key_value;
507 491
508 new_link->next = 0; 492 new_link->next = 0;
509 new_link->key = i->key; 493 new_link->key = i->key;
510 new_link->value = i->value; 494 new_link->value = i->value;
511 495
512 /* Try and be clever here, too. */ 496 /* Try and be clever here, too. */
513 if (!dst->key_values) 497 if (!key_values)
514 { 498 {
515 dst->key_values = new_link; 499 key_values = new_link;
516 tail = new_link; 500 tail = new_link;
517 } 501 }
518 else 502 else
519 { 503 {
520 tail->next = new_link; 504 tail->next = new_link;
521 tail = new_link; 505 tail = new_link;
522 } 506 }
523 } 507 }
524 } 508 }
509}
510
511/*
512 * copy_to first frees everything allocated by the dst object,
513 * and then copies the contents of itself into the second
514 * object, allocating what needs to be allocated. Basically, any
515 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
516 * if the first object is freed, the pointers in the new object
517 * will point at garbage.
518 */
519void
520object::copy_to (object *dst)
521{
522 *dst = *this;
523
524 if (speed < 0)
525 dst->speed_left = speed_left - rndm ();
525 526
526 dst->set_speed (dst->speed); 527 dst->set_speed (dst->speed);
528}
529
530void
531object::instantiate ()
532{
533 if (!uuid.seq) // HACK
534 uuid = gen_uuid ();
535
536 speed_left = -0.1f;
537 /* copy the body_info to the body_used - this is only really
538 * need for monsters, but doesn't hurt to do it for everything.
539 * by doing so, when a monster is created, it has good starting
540 * values for the body_used info, so when items are created
541 * for it, they can be properly equipped.
542 */
543 memcpy (body_used, body_info, sizeof (body_used));
544
545 attachable::instantiate ();
527} 546}
528 547
529object * 548object *
530object::clone () 549object::clone ()
531{ 550{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 608 * UP_OBJ_FACE: only the objects face has changed.
590 */ 609 */
591void 610void
592update_object (object *op, int action) 611update_object (object *op, int action)
593{ 612{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 613 if (op == NULL)
597 { 614 {
598 /* this should never happen */ 615 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 616 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 617 return;
… …
624 return; 641 return;
625 } 642 }
626 643
627 mapspace &m = op->ms (); 644 mapspace &m = op->ms ();
628 645
629 if (m.flags_ & P_NEED_UPDATE) 646 if (!(m.flags_ & P_UPTODATE))
630 /* nop */; 647 /* nop */;
631 else if (action == UP_OBJ_INSERT) 648 else if (action == UP_OBJ_INSERT)
632 { 649 {
633 // this is likely overkill, TODO: revisit (schmorp) 650 // this is likely overkill, TODO: revisit (schmorp)
634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 651 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
… …
643 /* This isn't perfect, but I don't expect a lot of objects to 660 /* This isn't perfect, but I don't expect a lot of objects to
644 * to have move_allow right now. 661 * to have move_allow right now.
645 */ 662 */
646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 663 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 664 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648 m.flags_ = P_NEED_UPDATE; 665 m.flags_ = 0;
649 } 666 }
650 /* if the object is being removed, we can't make intelligent 667 /* if the object is being removed, we can't make intelligent
651 * decisions, because remove_ob can't really pass the object 668 * decisions, because remove_ob can't really pass the object
652 * that is being removed. 669 * that is being removed.
653 */ 670 */
654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 671 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655 m.flags_ = P_NEED_UPDATE; 672 m.flags_ = 0;
656 else if (action == UP_OBJ_FACE) 673 else if (action == UP_OBJ_FACE)
657 /* Nothing to do for that case */ ; 674 /* Nothing to do for that case */ ;
658 else 675 else
659 LOG (llevError, "update_object called with invalid action: %d\n", action); 676 LOG (llevError, "update_object called with invalid action: %d\n", action);
660 677
661 if (op->more) 678 if (op->more)
662 update_object (op->more, action); 679 update_object (op->more, action);
663} 680}
664 681
665object *object::first;
666
667object::object () 682object::object ()
668{ 683{
669 SET_FLAG (this, FLAG_REMOVED); 684 SET_FLAG (this, FLAG_REMOVED);
670 685
671 expmul = 1.0; 686 expmul = 1.0;
672 face = blank_face; 687 face = blank_face;
673} 688}
674 689
675object::~object () 690object::~object ()
676{ 691{
692 unlink ();
693
677 free_key_values (this); 694 free_key_values (this);
678} 695}
679 696
697static int object_count;
698
680void object::link () 699void object::link ()
681{ 700{
682 count = ++ob_count; 701 assert (!index);//D
683 uuid = gen_uuid (); 702 uuid = gen_uuid ();
703 count = ++object_count;
684 704
685 prev = 0; 705 refcnt_inc ();
686 next = object::first; 706 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 707}
693 708
694void object::unlink () 709void object::unlink ()
695{ 710{
696 if (this == object::first) 711 if (!index)
697 object::first = next; 712 return;
698 713
699 /* Remove this object from the list of used objects */ 714 objects.erase (this);
700 if (prev) prev->next = next; 715 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} 716}
712 717
713void 718void
714object::activate () 719object::activate ()
715{ 720{
716 /* If already on active list, don't do anything */ 721 /* If already on active list, don't do anything */
717 if (active ()) 722 if (active)
718 return; 723 return;
719 724
720 if (has_active_speed ()) 725 if (has_active_speed ())
721 { 726 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} 727}
732 728
733void 729void
734object::activate_recursive () 730object::activate_recursive ()
735{ 731{
736 activate (); 732 activate ();
737 733
738 for (object *op = inv; op; op = op->above) 734 for (object *op = inv; op; op = op->below)
739 op->activate_recursive (); 735 op->activate_recursive ();
740} 736}
741 737
742/* This function removes object 'op' from the list of active 738/* This function removes object 'op' from the list of active
743 * objects. 739 * objects.
… …
749 */ 745 */
750void 746void
751object::deactivate () 747object::deactivate ()
752{ 748{
753 /* If not on the active list, nothing needs to be done */ 749 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 750 if (!active)
755 return; 751 return;
756 752
757 if (active_prev == 0) 753 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} 754}
773 755
774void 756void
775object::deactivate_recursive () 757object::deactivate_recursive ()
776{ 758{
777 for (object *op = inv; op; op = op->above) 759 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 760 op->deactivate_recursive ();
779 761
780 deactivate (); 762 deactivate ();
763}
764
765void
766object::set_flag_inv (int flag, int value)
767{
768 for (object *op = inv; op; op = op->below)
769 {
770 op->flag [flag] = value;
771 op->set_flag_inv (flag, value);
772 }
781} 773}
782 774
783/* 775/*
784 * Remove and free all objects in the inventory of the given object. 776 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 777 * object.c ?
… …
800 * drop on that space. 792 * drop on that space.
801 */ 793 */
802 if (!drop_to_ground 794 if (!drop_to_ground
803 || !map 795 || !map
804 || map->in_memory != MAP_IN_MEMORY 796 || map->in_memory != MAP_IN_MEMORY
797 || map->nodrop
805 || ms ().move_block == MOVE_ALL) 798 || ms ().move_block == MOVE_ALL)
806 { 799 {
807 while (inv) 800 while (inv)
808 { 801 {
809 inv->destroy_inv (drop_to_ground); 802 inv->destroy_inv (drop_to_ground);
… …
818 811
819 if (op->flag [FLAG_STARTEQUIP] 812 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 813 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 814 || op->type == RUNE
822 || op->type == TRAP 815 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 816 || op->flag [FLAG_IS_A_TEMPLATE]
817 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 818 op->destroy ();
825 else 819 else
826 map->insert (op, x, y); 820 map->insert (op, x, y);
827 } 821 }
828 } 822 }
… …
836} 830}
837 831
838void 832void
839object::do_destroy () 833object::do_destroy ()
840{ 834{
835 attachable::do_destroy ();
836
841 if (flag [FLAG_IS_LINKED]) 837 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this); 838 remove_button_link (this);
843 839
844 if (flag [FLAG_FRIENDLY]) 840 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this); 841 remove_friendly_object (this);
846 842
847 if (!flag [FLAG_REMOVED]) 843 if (!flag [FLAG_REMOVED])
848 remove (); 844 remove ();
849 845
850 if (flag [FLAG_FREED]) 846 destroy_inv (true);
851 return;
852 847
853 set_speed (0); 848 deactivate ();
849 unlink ();
854 850
855 flag [FLAG_FREED] = 1; 851 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861 852
862 // hack to ensure that freed objects still have a valid map 853 // hack to ensure that freed objects still have a valid map
863 { 854 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes 855 static maptile *freed_map; // freed objects are moved here to avoid crashes
865 856
… …
870 freed_map->name = "/internal/freed_objects_map"; 861 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 862 freed_map->width = 3;
872 freed_map->height = 3; 863 freed_map->height = 3;
873 864
874 freed_map->alloc (); 865 freed_map->alloc ();
866 freed_map->in_memory = MAP_IN_MEMORY;
875 } 867 }
876 868
877 map = freed_map; 869 map = freed_map;
878 x = 1; 870 x = 1;
879 y = 1; 871 y = 1;
… …
889 881
890 // clear those pointers that likely might have circular references to us 882 // clear those pointers that likely might have circular references to us
891 owner = 0; 883 owner = 0;
892 enemy = 0; 884 enemy = 0;
893 attacked_by = 0; 885 attacked_by = 0;
894
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
897} 886}
898 887
899void 888void
900object::destroy (bool destroy_inventory) 889object::destroy (bool destroy_inventory)
901{ 890{
… …
929 * This function removes the object op from the linked list of objects 918 * 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 919 * which it is currently tied to. When this function is done, the
931 * object will have no environment. If the object previously had an 920 * object will have no environment. If the object previously had an
932 * environment, the x and y coordinates will be updated to 921 * environment, the x and y coordinates will be updated to
933 * the previous environment. 922 * the previous environment.
934 * Beware: This function is called from the editor as well!
935 */ 923 */
936void 924void
937object::remove () 925object::do_remove ()
938{ 926{
939 object *tmp, *last = 0; 927 object *tmp, *last = 0;
940 object *otmp; 928 object *otmp;
941 929
942 if (QUERY_FLAG (this, FLAG_REMOVED)) 930 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
985 } 973 }
986 else if (map) 974 else if (map)
987 { 975 {
988 if (type == PLAYER) 976 if (type == PLAYER)
989 { 977 {
978 // leaving a spot always closes any open container on the ground
979 if (container && !container->env)
980 // this causes spurious floorbox updates, but it ensures
981 // that the CLOSE event is being sent.
982 close_container ();
983
990 --map->players; 984 --map->players;
991 map->last_access = runtime; 985 map->touch ();
992 } 986 }
993 987
994 map->dirty = true; 988 map->dirty = true;
989 mapspace &ms = this->ms ();
995 990
996 /* link the object above us */ 991 /* link the object above us */
997 if (above) 992 if (above)
998 above->below = below; 993 above->below = below;
999 else 994 else
1000 map->at (x, y).top = below; /* we were top, set new top */ 995 ms.top = below; /* we were top, set new top */
1001 996
1002 /* Relink the object below us, if there is one */ 997 /* Relink the object below us, if there is one */
1003 if (below) 998 if (below)
1004 below->above = above; 999 below->above = above;
1005 else 1000 else
… …
1007 /* Nothing below, which means we need to relink map object for this space 1002 /* 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 1003 * use translated coordinates in case some oddness with map tiling is
1009 * evident 1004 * evident
1010 */ 1005 */
1011 if (GET_MAP_OB (map, x, y) != this) 1006 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); 1007 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 1008
1022 map->at (x, y).bot = above; /* goes on above it. */ 1009 ms.bot = above; /* goes on above it. */
1023 } 1010 }
1024 1011
1025 above = 0; 1012 above = 0;
1026 below = 0; 1013 below = 0;
1027 1014
1028 if (map->in_memory == MAP_SAVING) 1015 if (map->in_memory == MAP_SAVING)
1029 return; 1016 return;
1030 1017
1031 int check_walk_off = !flag [FLAG_NO_APPLY]; 1018 int check_walk_off = !flag [FLAG_NO_APPLY];
1032 1019
1033 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1020 for (tmp = ms.bot; tmp; tmp = tmp->above)
1034 { 1021 {
1035 /* No point updating the players look faces if he is the object 1022 /* No point updating the players look faces if he is the object
1036 * being removed. 1023 * being removed.
1037 */ 1024 */
1038 1025
… …
1072 } 1059 }
1073 1060
1074 /* last == NULL if there are no objects on this space */ 1061 /* last == NULL if there are no objects on this space */
1075 //TODO: this makes little sense, why only update the topmost object? 1062 //TODO: this makes little sense, why only update the topmost object?
1076 if (!last) 1063 if (!last)
1077 map->at (x, y).flags_ = P_NEED_UPDATE; 1064 map->at (x, y).flags_ = 0;
1078 else 1065 else
1079 update_object (last, UP_OBJ_REMOVE); 1066 update_object (last, UP_OBJ_REMOVE);
1080 1067
1081 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1068 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1082 update_all_los (map, x, y); 1069 update_all_los (map, x, y);
… …
1118 } 1105 }
1119 1106
1120 return 0; 1107 return 0;
1121} 1108}
1122 1109
1110void
1111object::expand_tail ()
1112{
1113 if (more)
1114 return;
1115
1116 object *prev = this;
1117
1118 for (archetype *at = arch->more; at; at = at->more)
1119 {
1120 object *op = arch_to_object (at);
1121
1122 op->name = name;
1123 op->name_pl = name_pl;
1124 op->title = title;
1125
1126 op->head = this;
1127 prev->more = op;
1128
1129 prev = op;
1130 }
1131}
1132
1123/* 1133/*
1124 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1134 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1125 * job preparing multi-part monsters 1135 * job preparing multi-part monsters.
1126 */ 1136 */
1127object * 1137object *
1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1138insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129{ 1139{
1130 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1140 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1157 * just 'op' otherwise 1167 * just 'op' otherwise
1158 */ 1168 */
1159object * 1169object *
1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1170insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161{ 1171{
1172 assert (!op->flag [FLAG_FREED]);
1173
1162 object *tmp, *top, *floor = NULL; 1174 object *tmp, *top, *floor = NULL;
1163 sint16 x, y;
1164 1175
1165 if (QUERY_FLAG (op, FLAG_FREED)) 1176 op->remove ();
1166 {
1167 LOG (llevError, "Trying to insert freed object!\n");
1168 return NULL;
1169 }
1170 1177
1171 if (!m) 1178#if 0
1172 { 1179 if (!m->active != !op->active)
1173 char *dump = dump_object (op); 1180 if (m->active)
1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1181 op->activate_recursive ();
1175 free (dump); 1182 else
1176 return op; 1183 op->deactivate_recursive ();
1177 } 1184#endif
1178 1185
1179 if (out_of_map (m, op->x, op->y)) 1186 if (out_of_map (m, op->x, op->y))
1180 { 1187 {
1181 char *dump = dump_object (op);
1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1188 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1183#ifdef MANY_CORES 1189#ifdef MANY_CORES
1184 /* Better to catch this here, as otherwise the next use of this object 1190 /* 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 1191 * is likely to cause a crash. Better to find out where it is getting
1186 * improperly inserted. 1192 * improperly inserted.
1187 */ 1193 */
1188 abort (); 1194 abort ();
1189#endif 1195#endif
1190 free (dump);
1191 return op; 1196 return op;
1192 } 1197 }
1193 1198
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; 1199 if (object *more = op->more)
1207 1200 {
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) 1201 if (!insert_ob_in_map (more, m, originator, flag))
1224 { 1202 {
1225 if (!op->head) 1203 if (!op->head)
1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1204 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227 1205
1228 return 0; 1206 return 0;
… …
1233 1211
1234 /* Ideally, the caller figures this out. However, it complicates a lot 1212 /* 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 1213 * of areas of callers (eg, anything that uses find_free_spot would now
1236 * need extra work 1214 * need extra work
1237 */ 1215 */
1238 op->map = get_map_from_coord (m, &op->x, &op->y); 1216 if (!xy_normalise (m, op->x, op->y))
1239 x = op->x; 1217 return 0;
1240 y = op->y; 1218
1219 op->map = m;
1220 mapspace &ms = op->ms ();
1241 1221
1242 /* this has to be done after we translate the coordinates. 1222 /* this has to be done after we translate the coordinates.
1243 */ 1223 */
1244 if (op->nrof && !(flag & INS_NO_MERGE)) 1224 if (op->nrof && !(flag & INS_NO_MERGE))
1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1225 for (tmp = ms.bot; tmp; tmp = tmp->above)
1246 if (object::can_merge (op, tmp)) 1226 if (object::can_merge (op, tmp))
1247 { 1227 {
1248 op->nrof += tmp->nrof; 1228 op->nrof += tmp->nrof;
1249 tmp->destroy (); 1229 tmp->destroy ();
1250 } 1230 }
… …
1267 op->below = originator->below; 1247 op->below = originator->below;
1268 1248
1269 if (op->below) 1249 if (op->below)
1270 op->below->above = op; 1250 op->below->above = op;
1271 else 1251 else
1272 op->ms ().bot = op; 1252 ms.bot = op;
1273 1253
1274 /* since *below* originator, no need to update top */ 1254 /* since *below* originator, no need to update top */
1275 originator->below = op; 1255 originator->below = op;
1276 } 1256 }
1277 else 1257 else
1278 { 1258 {
1259 top = ms.bot;
1260
1279 /* If there are other objects, then */ 1261 /* If there are other objects, then */
1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1262 if ((!(flag & INS_MAP_LOAD)) && top)
1281 { 1263 {
1282 object *last = 0; 1264 object *last = 0;
1283 1265
1284 /* 1266 /*
1285 * If there are multiple objects on this space, we do some trickier handling. 1267 * 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 1273 * 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 1274 * 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 1275 * when lots of spells are cast in one area. Currently, it is presumed
1294 * that flying non pickable objects are spell objects. 1276 * that flying non pickable objects are spell objects.
1295 */ 1277 */
1296 while (top) 1278 for (top = ms.bot; top; top = top->above)
1297 { 1279 {
1298 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1280 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1299 floor = top; 1281 floor = top;
1300 1282
1301 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1283 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; 1286 top = top->below;
1305 break; 1287 break;
1306 } 1288 }
1307 1289
1308 last = top; 1290 last = top;
1309 top = top->above;
1310 } 1291 }
1311 1292
1312 /* Don't want top to be NULL, so set it to the last valid object */ 1293 /* Don't want top to be NULL, so set it to the last valid object */
1313 top = last; 1294 top = last;
1314 1295
… …
1316 * looks like instead of lots of conditions here. 1297 * looks like instead of lots of conditions here.
1317 * makes things faster, and effectively the same result. 1298 * makes things faster, and effectively the same result.
1318 */ 1299 */
1319 1300
1320 /* Have object 'fall below' other objects that block view. 1301 /* Have object 'fall below' other objects that block view.
1321 * Unless those objects are exits, type 66 1302 * Unless those objects are exits.
1322 * If INS_ON_TOP is used, don't do this processing 1303 * If INS_ON_TOP is used, don't do this processing
1323 * Need to find the object that in fact blocks view, otherwise 1304 * Need to find the object that in fact blocks view, otherwise
1324 * stacking is a bit odd. 1305 * stacking is a bit odd.
1325 */ 1306 */
1326 if (!(flag & INS_ON_TOP) && 1307 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)) 1308 && ms.flags () & P_BLOCKSVIEW
1309 && (op->face && !faces [op->face].visibility))
1328 { 1310 {
1329 for (last = top; last != floor; last = last->below) 1311 for (last = top; last != floor; last = last->below)
1330 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1312 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1331 break; 1313 break;
1314
1332 /* Check to see if we found the object that blocks view, 1315 /* Check to see if we found the object that blocks view,
1333 * and make sure we have a below pointer for it so that 1316 * and make sure we have a below pointer for it so that
1334 * we can get inserted below this one, which requires we 1317 * we can get inserted below this one, which requires we
1335 * set top to the object below us. 1318 * set top to the object below us.
1336 */ 1319 */
… …
1338 top = last->below; 1321 top = last->below;
1339 } 1322 }
1340 } /* If objects on this space */ 1323 } /* If objects on this space */
1341 1324
1342 if (flag & INS_MAP_LOAD) 1325 if (flag & INS_MAP_LOAD)
1343 top = GET_MAP_TOP (op->map, op->x, op->y); 1326 top = ms.top;
1344 1327
1345 if (flag & INS_ABOVE_FLOOR_ONLY) 1328 if (flag & INS_ABOVE_FLOOR_ONLY)
1346 top = floor; 1329 top = floor;
1347 1330
1348 /* Top is the object that our object (op) is going to get inserted above. 1331 /* Top is the object that our object (op) is going to get inserted above.
1349 */ 1332 */
1350 1333
1351 /* First object on this space */ 1334 /* First object on this space */
1352 if (!top) 1335 if (!top)
1353 { 1336 {
1354 op->above = GET_MAP_OB (op->map, op->x, op->y); 1337 op->above = ms.bot;
1355 1338
1356 if (op->above) 1339 if (op->above)
1357 op->above->below = op; 1340 op->above->below = op;
1358 1341
1359 op->below = 0; 1342 op->below = 0;
1360 op->ms ().bot = op; 1343 ms.bot = op;
1361 } 1344 }
1362 else 1345 else
1363 { /* get inserted into the stack above top */ 1346 { /* get inserted into the stack above top */
1364 op->above = top->above; 1347 op->above = top->above;
1365 1348
… …
1369 op->below = top; 1352 op->below = top;
1370 top->above = op; 1353 top->above = op;
1371 } 1354 }
1372 1355
1373 if (!op->above) 1356 if (!op->above)
1374 op->ms ().top = op; 1357 ms.top = op;
1375 } /* else not INS_BELOW_ORIGINATOR */ 1358 } /* else not INS_BELOW_ORIGINATOR */
1376 1359
1377 if (op->type == PLAYER) 1360 if (op->type == PLAYER)
1378 { 1361 {
1379 op->contr->do_los = 1; 1362 op->contr->do_los = 1;
1380 ++op->map->players; 1363 ++op->map->players;
1381 op->map->last_access = runtime; 1364 op->map->touch ();
1382 } 1365 }
1383 1366
1384 op->map->dirty = true; 1367 op->map->dirty = true;
1385 1368
1386 /* If we have a floor, we know the player, if any, will be above 1369 /* 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. 1370 * it, so save a few ticks and start from there.
1388 */ 1371 */
1389 if (!(flag & INS_MAP_LOAD)) 1372 if (!(flag & INS_MAP_LOAD))
1390 if (object *pl = op->ms ().player ()) 1373 if (object *pl = ms.player ())
1391 if (pl->contr->ns) 1374 if (pl->contr->ns)
1392 pl->contr->ns->floorbox_update (); 1375 pl->contr->ns->floorbox_update ();
1393 1376
1394 /* If this object glows, it may affect lighting conditions that are 1377 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1378 * visible to others on this map. But update_all_los is really
1396 * an inefficient way to do this, as it means los for all players 1379 * an inefficient way to do this, as it means los for all players
1397 * on the map will get recalculated. The players could very well 1380 * on the map will get recalculated. The players could very well
1398 * be far away from this change and not affected in any way - 1381 * be far away from this change and not affected in any way -
1399 * this should get redone to only look for players within range, 1382 * this should get redone to only look for players within range,
1400 * or just updating the P_NEED_UPDATE for spaces within this area 1383 * or just updating the P_UPTODATE for spaces within this area
1401 * of effect may be sufficient. 1384 * of effect may be sufficient.
1402 */ 1385 */
1403 if (op->map->darkness && (op->glow_radius != 0)) 1386 if (op->map->darkness && (op->glow_radius != 0))
1404 update_all_los (op->map, op->x, op->y); 1387 update_all_los (op->map, op->x, op->y);
1405 1388
… …
1443{ 1426{
1444 object *tmp, *tmp1; 1427 object *tmp, *tmp1;
1445 1428
1446 /* first search for itself and remove any old instances */ 1429 /* first search for itself and remove any old instances */
1447 1430
1448 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1431 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1432 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1450 tmp->destroy (); 1433 tmp->destroy ();
1451 1434
1452 tmp1 = arch_to_object (archetype::find (arch_string)); 1435 tmp1 = arch_to_object (archetype::find (arch_string));
1453 1436
… …
1457} 1440}
1458 1441
1459object * 1442object *
1460object::insert_at (object *where, object *originator, int flags) 1443object::insert_at (object *where, object *originator, int flags)
1461{ 1444{
1462 where->map->insert (this, where->x, where->y, originator, flags); 1445 return where->map->insert (this, where->x, where->y, originator, flags);
1463} 1446}
1464 1447
1465/* 1448/*
1466 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1449 * 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 1450 * is returned contains nr objects, and the remaining parts contains
… …
1507 * the amount of an object. If the amount reaches 0, the object 1490 * the amount of an object. If the amount reaches 0, the object
1508 * is subsequently removed and freed. 1491 * is subsequently removed and freed.
1509 * 1492 *
1510 * Return value: 'op' if something is left, NULL if the amount reached 0 1493 * Return value: 'op' if something is left, NULL if the amount reached 0
1511 */ 1494 */
1512
1513object * 1495object *
1514decrease_ob_nr (object *op, uint32 i) 1496decrease_ob_nr (object *op, uint32 i)
1515{ 1497{
1516 object *tmp; 1498 object *tmp;
1517 1499
… …
1592 1574
1593/* 1575/*
1594 * add_weight(object, weight) adds the specified weight to an object, 1576 * add_weight(object, weight) adds the specified weight to an object,
1595 * and also updates how much the environment(s) is/are carrying. 1577 * and also updates how much the environment(s) is/are carrying.
1596 */ 1578 */
1597
1598void 1579void
1599add_weight (object *op, signed long weight) 1580add_weight (object *op, signed long weight)
1600{ 1581{
1601 while (op != NULL) 1582 while (op != NULL)
1602 { 1583 {
… …
1634 * inside the object environment. 1615 * inside the object environment.
1635 * 1616 *
1636 * The function returns now pointer to inserted item, and return value can 1617 * The function returns now pointer to inserted item, and return value can
1637 * be != op, if items are merged. -Tero 1618 * be != op, if items are merged. -Tero
1638 */ 1619 */
1639
1640object * 1620object *
1641object::insert (object *op) 1621object::insert (object *op)
1642{ 1622{
1643 object *tmp, *otmp; 1623 object *tmp, *otmp;
1644 1624
… …
1776 1756
1777 /* The objects have to be checked from top to bottom. 1757 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1758 * Hence, we first go to the top:
1779 */ 1759 */
1780 1760
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1761 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1762 {
1783 /* Trim the search when we find the first other spell effect 1763 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1764 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1765 * we don't need to check all of them.
1786 */ 1766 */
… …
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1784 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)) 1785 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1786 {
1807 1787
1808 float 1788 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1789 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1790
1811 if (op->type == PLAYER) 1791 if (op->type == PLAYER)
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1792 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))) 1793 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1794 diff /= 4.0;
… …
1844 * The first matching object is returned, or NULL if none. 1824 * The first matching object is returned, or NULL if none.
1845 */ 1825 */
1846object * 1826object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1827present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1828{
1849 if (m == NULL || out_of_map (m, x, y)) 1829 if (!m || out_of_map (m, x, y))
1850 { 1830 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1831 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1832 return NULL;
1853 } 1833 }
1854 1834
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1835 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1836 if (tmp->arch == at)
1857 return tmp; 1837 return tmp;
1858 1838
1859 return NULL; 1839 return NULL;
1860} 1840}
… …
1871 { 1851 {
1872 LOG (llevError, "Present called outside map.\n"); 1852 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1853 return NULL;
1874 } 1854 }
1875 1855
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1856 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1857 if (tmp->type == type)
1878 return tmp; 1858 return tmp;
1879 1859
1880 return NULL; 1860 return NULL;
1881} 1861}
… …
2021 } 2001 }
2022 2002
2023 if (!index) 2003 if (!index)
2024 return -1; 2004 return -1;
2025 2005
2026 return altern[RANDOM () % index]; 2006 return altern [rndm (index)];
2027} 2007}
2028 2008
2029/* 2009/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2010 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2011 * find_free_spot(), but it will search max number of squares.
… …
2052{ 2032{
2053 arr += begin; 2033 arr += begin;
2054 end -= begin; 2034 end -= begin;
2055 2035
2056 while (--end) 2036 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2037 swap (arr [end], arr [rndm (end + 1)]);
2058} 2038}
2059 2039
2060/* new function to make monster searching more efficient, and effective! 2040/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2041 * 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 2042 * the spaces to find monsters. In this way, it won't always look for
… …
2196 2176
2197 return 3; 2177 return 3;
2198} 2178}
2199 2179
2200/* 2180/*
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 2181 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2182 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2183 */
2222
2223int 2184int
2224dirdiff (int dir1, int dir2) 2185dirdiff (int dir1, int dir2)
2225{ 2186{
2226 int d; 2187 int d;
2227 2188
… …
2393 insert_ob_in_ob (object_create_clone (item), dst); 2354 insert_ob_in_ob (object_create_clone (item), dst);
2394 2355
2395 return dst; 2356 return dst;
2396} 2357}
2397 2358
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 2359/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2360 * has the same type and subtype match.
2438 * returns NULL if no match. 2361 * returns NULL if no match.
2439 */ 2362 */
2440object * 2363object *
… …
2493 if (link->key == canonical_key) 2416 if (link->key == canonical_key)
2494 return link->value; 2417 return link->value;
2495 2418
2496 return 0; 2419 return 0;
2497} 2420}
2498
2499 2421
2500/* 2422/*
2501 * Updates the canonical_key in op to value. 2423 * Updates the canonical_key in op to value.
2502 * 2424 *
2503 * canonical_key is a shared string (value doesn't have to be). 2425 * canonical_key is a shared string (value doesn't have to be).
… …
2613object::flag_desc (char *desc, int len) const 2535object::flag_desc (char *desc, int len) const
2614{ 2536{
2615 char *p = desc; 2537 char *p = desc;
2616 bool first = true; 2538 bool first = true;
2617 2539
2540 *p = 0;
2541
2618 for (int i = 0; i < NUM_FLAGS; i++) 2542 for (int i = 0; i < NUM_FLAGS; i++)
2619 { 2543 {
2620 if (len <= 10) // magic constant! 2544 if (len <= 10) // magic constant!
2621 { 2545 {
2622 snprintf (p, len, ",..."); 2546 snprintf (p, len, ",...");
2623 break; 2547 break;
2624 } 2548 }
2625 2549
2626 if (flag[i]) 2550 if (flag [i])
2627 { 2551 {
2628 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); 2552 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2629 len -= cnt; 2553 len -= cnt;
2630 p += cnt; 2554 p += cnt;
2631 first = false; 2555 first = false;
… …
2633 } 2557 }
2634 2558
2635 return desc; 2559 return desc;
2636} 2560}
2637 2561
2638// return a suitable string describing an objetc in enough detail to find it 2562// return a suitable string describing an object in enough detail to find it
2639const char * 2563const char *
2640object::debug_desc (char *info) const 2564object::debug_desc (char *info) const
2641{ 2565{
2642 char flagdesc[512]; 2566 char flagdesc[512];
2643 char info2[256 * 4]; 2567 char info2[256 * 4];
2644 char *p = info; 2568 char *p = info;
2645 2569
2646 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2570 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2647 count, uuid.seq, 2571 count, uuid.seq,
2648 &name, 2572 &name,
2649 title ? "\",title:" : "", 2573 title ? "\",title:\"" : "",
2650 title ? (const char *)title : "", 2574 title ? (const char *)title : "",
2651 flag_desc (flagdesc, 512), type); 2575 flag_desc (flagdesc, 512), type);
2652 2576
2653 if (env) 2577 if (env)
2654 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2578 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2660} 2584}
2661 2585
2662const char * 2586const char *
2663object::debug_desc () const 2587object::debug_desc () const
2664{ 2588{
2665 static char info[256 * 3]; 2589 static char info[3][256 * 4];
2590 static int info_idx;
2591
2666 return debug_desc (info); 2592 return debug_desc (info [++info_idx % 3]);
2667} 2593}
2668 2594
2595struct region *
2596object::region () const
2597{
2598 return map ? map->region (x, y)
2599 : region::default_region ();
2600}
2601
2602const materialtype_t *
2603object::dominant_material () const
2604{
2605 if (materialtype_t *mat = name_to_material (materialname))
2606 return mat;
2607
2608 // omfg this is slow, this has to be temporary :)
2609 shstr unknown ("unknown");
2610
2611 return name_to_material (unknown);
2612}
2613
2614void
2615object::open_container (object *new_container)
2616{
2617 if (container == new_container)
2618 return;
2619
2620 if (object *old_container = container)
2621 {
2622 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2623 return;
2624
2625#if 0
2626 // remove the "Close old_container" object.
2627 if (object *closer = old_container->inv)
2628 if (closer->type == CLOSE_CON)
2629 closer->destroy ();
2630#endif
2631
2632 old_container->flag [FLAG_APPLIED] = 0;
2633 container = 0;
2634
2635 esrv_update_item (UPD_FLAGS, this, old_container);
2636 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2637 }
2638
2639 if (new_container)
2640 {
2641 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2642 return;
2643
2644 // TODO: this does not seem to serve any purpose anymore?
2645#if 0
2646 // insert the "Close Container" object.
2647 if (archetype *closer = new_container->other_arch)
2648 {
2649 object *closer = arch_to_object (new_container->other_arch);
2650 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2651 new_container->insert (closer);
2652 }
2653#endif
2654
2655 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2656
2657 new_container->flag [FLAG_APPLIED] = 1;
2658 container = new_container;
2659
2660 esrv_update_item (UPD_FLAGS, this, new_container);
2661 esrv_send_inventory (this, new_container);
2662 }
2663}
2664
2665

Diff Legend

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