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.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.142 by root, Mon Apr 30 04:25:29 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{
… …
564 } 583 }
565 584
566 this->speed = speed; 585 this->speed = speed;
567 586
568 if (has_active_speed ()) 587 if (has_active_speed ())
569 activate (false); 588 activate ();
570 else 589 else
571 deactivate (false); 590 deactivate ();
572} 591}
573 592
574/* 593/*
575 * update_object() updates the the map. 594 * update_object() updates the the map.
576 * It takes into account invisible objects (and represent squares covered 595 * It takes into account invisible objects (and represent squares covered
… …
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::vector object::objects; // not yet used
666object *object::first;
667
668object::object () 682object::object ()
669{ 683{
670 SET_FLAG (this, FLAG_REMOVED); 684 SET_FLAG (this, FLAG_REMOVED);
671 685
672 expmul = 1.0; 686 expmul = 1.0;
673 face = blank_face; 687 face = blank_face;
674} 688}
675 689
676object::~object () 690object::~object ()
677{ 691{
692 unlink ();
693
678 free_key_values (this); 694 free_key_values (this);
679} 695}
680 696
697static int object_count;
698
681void object::link () 699void object::link ()
682{ 700{
683 count = ++ob_count; 701 assert (!index);//D
684 uuid = gen_uuid (); 702 uuid = gen_uuid ();
703 count = ++object_count;
685 704
686 prev = 0; 705 refcnt_inc ();
687 next = object::first; 706 objects.insert (this);
688
689 if (object::first)
690 object::first->prev = this;
691
692 object::first = this;
693} 707}
694 708
695void object::unlink () 709void object::unlink ()
696{ 710{
697 if (this == object::first) 711 if (!index)
698 object::first = next; 712 return;
699 713
700 /* Remove this object from the list of used objects */ 714 objects.erase (this);
701 if (prev) prev->next = next; 715 refcnt_dec ();
702 if (next) next->prev = prev;
703
704 prev = 0;
705 next = 0;
706} 716}
707 717
708void 718void
709object::activate (bool recursive) 719object::activate ()
710{ 720{
721 /* If already on active list, don't do anything */
722 if (active)
723 return;
724
711 if (has_active_speed ()) 725 if (has_active_speed ())
712 { 726 actives.insert (this);
713 /* If already on active list, don't do anything */ 727}
714 if (active_next || active_prev || this == active_objects)
715 return;
716 728
717 /* process_events() expects us to insert the object at the beginning 729void
718 * of the list. */ 730object::activate_recursive ()
719 active_next = active_objects; 731{
732 activate ();
720 733
721 if (active_next)
722 active_next->active_prev = this;
723
724 active_objects = this;
725 }
726
727 if (recursive)
728 for (object *op = inv; op; op = op->above) 734 for (object *op = inv; op; op = op->below)
729 op->activate (1); 735 op->activate_recursive ();
730} 736}
731 737
732/* This function removes object 'op' from the list of active 738/* This function removes object 'op' from the list of active
733 * objects. 739 * objects.
734 * This should only be used for style maps or other such 740 * This should only be used for style maps or other such
… …
736 * in play chewing up cpu time getting processed. 742 * in play chewing up cpu time getting processed.
737 * The reverse of this is to call update_ob_speed, which 743 * The reverse of this is to call update_ob_speed, which
738 * will do the right thing based on the speed of the object. 744 * will do the right thing based on the speed of the object.
739 */ 745 */
740void 746void
741object::deactivate (bool recursive) 747object::deactivate ()
742{ 748{
743 /* If not on the active list, nothing needs to be done */ 749 /* If not on the active list, nothing needs to be done */
744 if (!active_next && !active_prev && this != active_objects) 750 if (!active)
745 return; 751 return;
746 752
747 if (active_prev == 0) 753 actives.erase (this);
748 { 754}
749 active_objects = active_next;
750 if (active_next)
751 active_next->active_prev = 0;
752 }
753 else
754 {
755 active_prev->active_next = active_next;
756 if (active_next)
757 active_next->active_prev = active_prev;
758 }
759 755
760 active_next = 0; 756void
761 active_prev = 0; 757object::deactivate_recursive ()
762 758{
763 if (recursive)
764 for (object *op = inv; op; op = op->above) 759 for (object *op = inv; op; op = op->below)
760 op->deactivate_recursive ();
761
765 op->deactivate (1); 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 }
766} 773}
767 774
768/* 775/*
769 * 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.
770 * object.c ? 777 * object.c ?
… …
785 * drop on that space. 792 * drop on that space.
786 */ 793 */
787 if (!drop_to_ground 794 if (!drop_to_ground
788 || !map 795 || !map
789 || map->in_memory != MAP_IN_MEMORY 796 || map->in_memory != MAP_IN_MEMORY
797 || map->nodrop
790 || ms ().move_block == MOVE_ALL) 798 || ms ().move_block == MOVE_ALL)
791 { 799 {
792 while (inv) 800 while (inv)
793 { 801 {
794 inv->destroy_inv (drop_to_ground); 802 inv->destroy_inv (drop_to_ground);
… …
803 811
804 if (op->flag [FLAG_STARTEQUIP] 812 if (op->flag [FLAG_STARTEQUIP]
805 || op->flag [FLAG_NO_DROP] 813 || op->flag [FLAG_NO_DROP]
806 || op->type == RUNE 814 || op->type == RUNE
807 || op->type == TRAP 815 || op->type == TRAP
808 || op->flag [FLAG_IS_A_TEMPLATE]) 816 || op->flag [FLAG_IS_A_TEMPLATE]
817 || op->flag [FLAG_DESTROY_ON_DEATH])
809 op->destroy (); 818 op->destroy ();
810 else 819 else
811 map->insert (op, x, y); 820 map->insert (op, x, y);
812 } 821 }
813 } 822 }
… …
821} 830}
822 831
823void 832void
824object::do_destroy () 833object::do_destroy ()
825{ 834{
835 attachable::do_destroy ();
836
826 if (flag [FLAG_IS_LINKED]) 837 if (flag [FLAG_IS_LINKED])
827 remove_button_link (this); 838 remove_button_link (this);
828 839
829 if (flag [FLAG_FRIENDLY]) 840 if (flag [FLAG_FRIENDLY])
830 remove_friendly_object (this); 841 remove_friendly_object (this);
831 842
832 if (!flag [FLAG_REMOVED]) 843 if (!flag [FLAG_REMOVED])
833 remove (); 844 remove ();
834 845
835 if (flag [FLAG_FREED]) 846 destroy_inv (true);
836 return;
837 847
838 set_speed (0); 848 deactivate ();
849 unlink ();
839 850
840 flag [FLAG_FREED] = 1; 851 flag [FLAG_FREED] = 1;
841
842 attachable::do_destroy ();
843
844 destroy_inv (true);
845 unlink ();
846 852
847 // hack to ensure that freed objects still have a valid map 853 // hack to ensure that freed objects still have a valid map
848 { 854 {
849 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
850 856
… …
855 freed_map->name = "/internal/freed_objects_map"; 861 freed_map->name = "/internal/freed_objects_map";
856 freed_map->width = 3; 862 freed_map->width = 3;
857 freed_map->height = 3; 863 freed_map->height = 3;
858 864
859 freed_map->alloc (); 865 freed_map->alloc ();
866 freed_map->in_memory = MAP_IN_MEMORY;
860 } 867 }
861 868
862 map = freed_map; 869 map = freed_map;
863 x = 1; 870 x = 1;
864 y = 1; 871 y = 1;
… …
874 881
875 // clear those pointers that likely might have circular references to us 882 // clear those pointers that likely might have circular references to us
876 owner = 0; 883 owner = 0;
877 enemy = 0; 884 enemy = 0;
878 attacked_by = 0; 885 attacked_by = 0;
879
880 // only relevant for players(?), but make sure of it anyways
881 contr = 0;
882} 886}
883 887
884void 888void
885object::destroy (bool destroy_inventory) 889object::destroy (bool destroy_inventory)
886{ 890{
… …
914 * 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
915 * 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
916 * object will have no environment. If the object previously had an 920 * object will have no environment. If the object previously had an
917 * environment, the x and y coordinates will be updated to 921 * environment, the x and y coordinates will be updated to
918 * the previous environment. 922 * the previous environment.
919 * Beware: This function is called from the editor as well!
920 */ 923 */
921void 924void
922object::remove () 925object::do_remove ()
923{ 926{
924 object *tmp, *last = 0; 927 object *tmp, *last = 0;
925 object *otmp; 928 object *otmp;
926 929
927 if (QUERY_FLAG (this, FLAG_REMOVED)) 930 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
970 } 973 }
971 else if (map) 974 else if (map)
972 { 975 {
973 if (type == PLAYER) 976 if (type == PLAYER)
974 { 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
975 --map->players; 984 --map->players;
976 map->last_access = runtime; 985 map->touch ();
977 } 986 }
978 987
988 map->dirty = true;
989 mapspace &ms = this->ms ();
979 990
980 /* link the object above us */ 991 /* link the object above us */
981 if (above) 992 if (above)
982 above->below = below; 993 above->below = below;
983 else 994 else
984 map->at (x, y).top = below; /* we were top, set new top */ 995 ms.top = below; /* we were top, set new top */
985 996
986 /* Relink the object below us, if there is one */ 997 /* Relink the object below us, if there is one */
987 if (below) 998 if (below)
988 below->above = above; 999 below->above = above;
989 else 1000 else
… …
991 /* 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
992 * use translated coordinates in case some oddness with map tiling is 1003 * use translated coordinates in case some oddness with map tiling is
993 * evident 1004 * evident
994 */ 1005 */
995 if (GET_MAP_OB (map, x, y) != this) 1006 if (GET_MAP_OB (map, x, y) != this)
996 {
997 char *dump = dump_object (this);
998 LOG (llevError,
999 "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 ());
1000 free (dump);
1001 dump = dump_object (GET_MAP_OB (map, x, y));
1002 LOG (llevError, "%s\n", dump);
1003 free (dump);
1004 }
1005 1008
1006 map->at (x, y).bot = above; /* goes on above it. */ 1009 ms.bot = above; /* goes on above it. */
1007 } 1010 }
1008 1011
1009 above = 0; 1012 above = 0;
1010 below = 0; 1013 below = 0;
1011 1014
1012 if (map->in_memory == MAP_SAVING) 1015 if (map->in_memory == MAP_SAVING)
1013 return; 1016 return;
1014 1017
1015 int check_walk_off = !flag [FLAG_NO_APPLY]; 1018 int check_walk_off = !flag [FLAG_NO_APPLY];
1016 1019
1017 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1020 for (tmp = ms.bot; tmp; tmp = tmp->above)
1018 { 1021 {
1019 /* 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
1020 * being removed. 1023 * being removed.
1021 */ 1024 */
1022 1025
… …
1056 } 1059 }
1057 1060
1058 /* last == NULL if there are no objects on this space */ 1061 /* last == NULL if there are no objects on this space */
1059 //TODO: this makes little sense, why only update the topmost object? 1062 //TODO: this makes little sense, why only update the topmost object?
1060 if (!last) 1063 if (!last)
1061 map->at (x, y).flags_ = P_NEED_UPDATE; 1064 map->at (x, y).flags_ = 0;
1062 else 1065 else
1063 update_object (last, UP_OBJ_REMOVE); 1066 update_object (last, UP_OBJ_REMOVE);
1064 1067
1065 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1068 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1066 update_all_los (map, x, y); 1069 update_all_los (map, x, y);
… …
1102 } 1105 }
1103 1106
1104 return 0; 1107 return 0;
1105} 1108}
1106 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
1107/* 1133/*
1108 * 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
1109 * job preparing multi-part monsters 1135 * job preparing multi-part monsters.
1110 */ 1136 */
1111object * 1137object *
1112insert_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)
1113{ 1139{
1114 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1140 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1141 * just 'op' otherwise 1167 * just 'op' otherwise
1142 */ 1168 */
1143object * 1169object *
1144insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1170insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1145{ 1171{
1172 assert (!op->flag [FLAG_FREED]);
1173
1146 object *tmp, *top, *floor = NULL; 1174 object *tmp, *top, *floor = NULL;
1147 sint16 x, y;
1148 1175
1149 if (QUERY_FLAG (op, FLAG_FREED)) 1176 op->remove ();
1150 {
1151 LOG (llevError, "Trying to insert freed object!\n");
1152 return NULL;
1153 }
1154 1177
1155 if (!m) 1178#if 0
1156 { 1179 if (!m->active != !op->active)
1157 char *dump = dump_object (op); 1180 if (m->active)
1158 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1181 op->activate_recursive ();
1159 free (dump); 1182 else
1160 return op; 1183 op->deactivate_recursive ();
1161 } 1184#endif
1162 1185
1163 if (out_of_map (m, op->x, op->y)) 1186 if (out_of_map (m, op->x, op->y))
1164 { 1187 {
1165 char *dump = dump_object (op);
1166 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 ());
1167#ifdef MANY_CORES 1189#ifdef MANY_CORES
1168 /* 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
1169 * 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
1170 * improperly inserted. 1192 * improperly inserted.
1171 */ 1193 */
1172 abort (); 1194 abort ();
1173#endif 1195#endif
1174 free (dump);
1175 return op; 1196 return op;
1176 } 1197 }
1177 1198
1178 if (!QUERY_FLAG (op, FLAG_REMOVED))
1179 {
1180 char *dump = dump_object (op);
1181 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1182 free (dump);
1183 return op;
1184 }
1185
1186 if (op->more)
1187 {
1188 /* The part may be on a different map. */
1189
1190 object *more = op->more; 1199 if (object *more = op->more)
1191 1200 {
1192 /* We really need the caller to normalize coordinates - if
1193 * we set the map, that doesn't work if the location is within
1194 * a map and this is straddling an edge. So only if coordinate
1195 * is clear wrong do we normalize it.
1196 */
1197 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1198 more->map = get_map_from_coord (m, &more->x, &more->y);
1199 else if (!more->map)
1200 {
1201 /* For backwards compatibility - when not dealing with tiled maps,
1202 * more->map should always point to the parent.
1203 */
1204 more->map = m;
1205 }
1206
1207 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1201 if (!insert_ob_in_map (more, m, originator, flag))
1208 { 1202 {
1209 if (!op->head) 1203 if (!op->head)
1210 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");
1211 1205
1212 return 0; 1206 return 0;
… …
1217 1211
1218 /* Ideally, the caller figures this out. However, it complicates a lot 1212 /* Ideally, the caller figures this out. However, it complicates a lot
1219 * 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
1220 * need extra work 1214 * need extra work
1221 */ 1215 */
1222 op->map = get_map_from_coord (m, &op->x, &op->y); 1216 if (!xy_normalise (m, op->x, op->y))
1223 x = op->x; 1217 return 0;
1224 y = op->y; 1218
1219 op->map = m;
1220 mapspace &ms = op->ms ();
1225 1221
1226 /* this has to be done after we translate the coordinates. 1222 /* this has to be done after we translate the coordinates.
1227 */ 1223 */
1228 if (op->nrof && !(flag & INS_NO_MERGE)) 1224 if (op->nrof && !(flag & INS_NO_MERGE))
1229 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1225 for (tmp = ms.bot; tmp; tmp = tmp->above)
1230 if (object::can_merge (op, tmp)) 1226 if (object::can_merge (op, tmp))
1231 { 1227 {
1232 op->nrof += tmp->nrof; 1228 op->nrof += tmp->nrof;
1233 tmp->destroy (); 1229 tmp->destroy ();
1234 } 1230 }
… …
1251 op->below = originator->below; 1247 op->below = originator->below;
1252 1248
1253 if (op->below) 1249 if (op->below)
1254 op->below->above = op; 1250 op->below->above = op;
1255 else 1251 else
1256 op->ms ().bot = op; 1252 ms.bot = op;
1257 1253
1258 /* since *below* originator, no need to update top */ 1254 /* since *below* originator, no need to update top */
1259 originator->below = op; 1255 originator->below = op;
1260 } 1256 }
1261 else 1257 else
1262 { 1258 {
1259 top = ms.bot;
1260
1263 /* If there are other objects, then */ 1261 /* If there are other objects, then */
1264 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1262 if ((!(flag & INS_MAP_LOAD)) && top)
1265 { 1263 {
1266 object *last = 0; 1264 object *last = 0;
1267 1265
1268 /* 1266 /*
1269 * 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.
… …
1275 * 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
1276 * 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
1277 * 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
1278 * that flying non pickable objects are spell objects. 1276 * that flying non pickable objects are spell objects.
1279 */ 1277 */
1280 while (top) 1278 for (top = ms.bot; top; top = top->above)
1281 { 1279 {
1282 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))
1283 floor = top; 1281 floor = top;
1284 1282
1285 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))
… …
1288 top = top->below; 1286 top = top->below;
1289 break; 1287 break;
1290 } 1288 }
1291 1289
1292 last = top; 1290 last = top;
1293 top = top->above;
1294 } 1291 }
1295 1292
1296 /* 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 */
1297 top = last; 1294 top = last;
1298 1295
… …
1300 * looks like instead of lots of conditions here. 1297 * looks like instead of lots of conditions here.
1301 * makes things faster, and effectively the same result. 1298 * makes things faster, and effectively the same result.
1302 */ 1299 */
1303 1300
1304 /* Have object 'fall below' other objects that block view. 1301 /* Have object 'fall below' other objects that block view.
1305 * Unless those objects are exits, type 66 1302 * Unless those objects are exits.
1306 * If INS_ON_TOP is used, don't do this processing 1303 * If INS_ON_TOP is used, don't do this processing
1307 * Need to find the object that in fact blocks view, otherwise 1304 * Need to find the object that in fact blocks view, otherwise
1308 * stacking is a bit odd. 1305 * stacking is a bit odd.
1309 */ 1306 */
1310 if (!(flag & INS_ON_TOP) && 1307 if (!(flag & INS_ON_TOP)
1311 (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))
1312 { 1310 {
1313 for (last = top; last != floor; last = last->below) 1311 for (last = top; last != floor; last = last->below)
1314 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1312 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315 break; 1313 break;
1314
1316 /* Check to see if we found the object that blocks view, 1315 /* Check to see if we found the object that blocks view,
1317 * 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
1318 * we can get inserted below this one, which requires we 1317 * we can get inserted below this one, which requires we
1319 * set top to the object below us. 1318 * set top to the object below us.
1320 */ 1319 */
… …
1322 top = last->below; 1321 top = last->below;
1323 } 1322 }
1324 } /* If objects on this space */ 1323 } /* If objects on this space */
1325 1324
1326 if (flag & INS_MAP_LOAD) 1325 if (flag & INS_MAP_LOAD)
1327 top = GET_MAP_TOP (op->map, op->x, op->y); 1326 top = ms.top;
1328 1327
1329 if (flag & INS_ABOVE_FLOOR_ONLY) 1328 if (flag & INS_ABOVE_FLOOR_ONLY)
1330 top = floor; 1329 top = floor;
1331 1330
1332 /* 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.
1333 */ 1332 */
1334 1333
1335 /* First object on this space */ 1334 /* First object on this space */
1336 if (!top) 1335 if (!top)
1337 { 1336 {
1338 op->above = GET_MAP_OB (op->map, op->x, op->y); 1337 op->above = ms.bot;
1339 1338
1340 if (op->above) 1339 if (op->above)
1341 op->above->below = op; 1340 op->above->below = op;
1342 1341
1343 op->below = 0; 1342 op->below = 0;
1344 op->ms ().bot = op; 1343 ms.bot = op;
1345 } 1344 }
1346 else 1345 else
1347 { /* get inserted into the stack above top */ 1346 { /* get inserted into the stack above top */
1348 op->above = top->above; 1347 op->above = top->above;
1349 1348
… …
1353 op->below = top; 1352 op->below = top;
1354 top->above = op; 1353 top->above = op;
1355 } 1354 }
1356 1355
1357 if (!op->above) 1356 if (!op->above)
1358 op->ms ().top = op; 1357 ms.top = op;
1359 } /* else not INS_BELOW_ORIGINATOR */ 1358 } /* else not INS_BELOW_ORIGINATOR */
1360 1359
1361 if (op->type == PLAYER) 1360 if (op->type == PLAYER)
1362 { 1361 {
1363 op->contr->do_los = 1; 1362 op->contr->do_los = 1;
1364 ++op->map->players; 1363 ++op->map->players;
1365 op->map->last_access = runtime; 1364 op->map->touch ();
1366 } 1365 }
1366
1367 op->map->dirty = true;
1367 1368
1368 /* 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
1369 * it, so save a few ticks and start from there. 1370 * it, so save a few ticks and start from there.
1370 */ 1371 */
1371 if (!(flag & INS_MAP_LOAD)) 1372 if (!(flag & INS_MAP_LOAD))
1372 if (object *pl = op->ms ().player ()) 1373 if (object *pl = ms.player ())
1373 if (pl->contr->ns) 1374 if (pl->contr->ns)
1374 pl->contr->ns->floorbox_update (); 1375 pl->contr->ns->floorbox_update ();
1375 1376
1376 /* If this object glows, it may affect lighting conditions that are 1377 /* If this object glows, it may affect lighting conditions that are
1377 * 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
1378 * 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
1379 * on the map will get recalculated. The players could very well 1380 * on the map will get recalculated. The players could very well
1380 * 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 -
1381 * this should get redone to only look for players within range, 1382 * this should get redone to only look for players within range,
1382 * or just updating the P_NEED_UPDATE for spaces within this area 1383 * or just updating the P_UPTODATE for spaces within this area
1383 * of effect may be sufficient. 1384 * of effect may be sufficient.
1384 */ 1385 */
1385 if (op->map->darkness && (op->glow_radius != 0)) 1386 if (op->map->darkness && (op->glow_radius != 0))
1386 update_all_los (op->map, op->x, op->y); 1387 update_all_los (op->map, op->x, op->y);
1387 1388
… …
1425{ 1426{
1426 object *tmp, *tmp1; 1427 object *tmp, *tmp1;
1427 1428
1428 /* first search for itself and remove any old instances */ 1429 /* first search for itself and remove any old instances */
1429 1430
1430 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)
1431 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1432 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1432 tmp->destroy (); 1433 tmp->destroy ();
1433 1434
1434 tmp1 = arch_to_object (archetype::find (arch_string)); 1435 tmp1 = arch_to_object (archetype::find (arch_string));
1435 1436
… …
1439} 1440}
1440 1441
1441object * 1442object *
1442object::insert_at (object *where, object *originator, int flags) 1443object::insert_at (object *where, object *originator, int flags)
1443{ 1444{
1444 where->map->insert (this, where->x, where->y, originator, flags); 1445 return where->map->insert (this, where->x, where->y, originator, flags);
1445} 1446}
1446 1447
1447/* 1448/*
1448 * 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
1449 * is returned contains nr objects, and the remaining parts contains 1450 * is returned contains nr objects, and the remaining parts contains
… …
1489 * 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
1490 * is subsequently removed and freed. 1491 * is subsequently removed and freed.
1491 * 1492 *
1492 * 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
1493 */ 1494 */
1494
1495object * 1495object *
1496decrease_ob_nr (object *op, uint32 i) 1496decrease_ob_nr (object *op, uint32 i)
1497{ 1497{
1498 object *tmp; 1498 object *tmp;
1499 1499
… …
1574 1574
1575/* 1575/*
1576 * add_weight(object, weight) adds the specified weight to an object, 1576 * add_weight(object, weight) adds the specified weight to an object,
1577 * and also updates how much the environment(s) is/are carrying. 1577 * and also updates how much the environment(s) is/are carrying.
1578 */ 1578 */
1579
1580void 1579void
1581add_weight (object *op, signed long weight) 1580add_weight (object *op, signed long weight)
1582{ 1581{
1583 while (op != NULL) 1582 while (op != NULL)
1584 { 1583 {
… …
1616 * inside the object environment. 1615 * inside the object environment.
1617 * 1616 *
1618 * 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
1619 * be != op, if items are merged. -Tero 1618 * be != op, if items are merged. -Tero
1620 */ 1619 */
1621
1622object * 1620object *
1623object::insert (object *op) 1621object::insert (object *op)
1624{ 1622{
1625 object *tmp, *otmp; 1623 object *tmp, *otmp;
1626 1624
… …
1758 1756
1759 /* The objects have to be checked from top to bottom. 1757 /* The objects have to be checked from top to bottom.
1760 * Hence, we first go to the top: 1758 * Hence, we first go to the top:
1761 */ 1759 */
1762 1760
1763 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)
1764 { 1762 {
1765 /* Trim the search when we find the first other spell effect 1763 /* Trim the search when we find the first other spell effect
1766 * 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,
1767 * we don't need to check all of them. 1765 * we don't need to check all of them.
1768 */ 1766 */
… …
1786 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1784 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787 ((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))
1788 { 1786 {
1789 1787
1790 float 1788 float
1791 diff = tmp->move_slow_penalty * FABS (op->speed); 1789 diff = tmp->move_slow_penalty * fabs (op->speed);
1792 1790
1793 if (op->type == PLAYER) 1791 if (op->type == PLAYER)
1794 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)) ||
1795 (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)))
1796 diff /= 4.0; 1794 diff /= 4.0;
… …
1826 * The first matching object is returned, or NULL if none. 1824 * The first matching object is returned, or NULL if none.
1827 */ 1825 */
1828object * 1826object *
1829present_arch (const archetype *at, maptile *m, int x, int y) 1827present_arch (const archetype *at, maptile *m, int x, int y)
1830{ 1828{
1831 if (m == NULL || out_of_map (m, x, y)) 1829 if (!m || out_of_map (m, x, y))
1832 { 1830 {
1833 LOG (llevError, "Present_arch called outside map.\n"); 1831 LOG (llevError, "Present_arch called outside map.\n");
1834 return NULL; 1832 return NULL;
1835 } 1833 }
1836 1834
1837 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)
1838 if (tmp->arch == at) 1836 if (tmp->arch == at)
1839 return tmp; 1837 return tmp;
1840 1838
1841 return NULL; 1839 return NULL;
1842} 1840}
… …
1853 { 1851 {
1854 LOG (llevError, "Present called outside map.\n"); 1852 LOG (llevError, "Present called outside map.\n");
1855 return NULL; 1853 return NULL;
1856 } 1854 }
1857 1855
1858 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)
1859 if (tmp->type == type) 1857 if (tmp->type == type)
1860 return tmp; 1858 return tmp;
1861 1859
1862 return NULL; 1860 return NULL;
1863} 1861}
… …
2003 } 2001 }
2004 2002
2005 if (!index) 2003 if (!index)
2006 return -1; 2004 return -1;
2007 2005
2008 return altern[RANDOM () % index]; 2006 return altern [rndm (index)];
2009} 2007}
2010 2008
2011/* 2009/*
2012 * find_first_free_spot(archetype, maptile, x, y) works like 2010 * find_first_free_spot(archetype, maptile, x, y) works like
2013 * find_free_spot(), but it will search max number of squares. 2011 * find_free_spot(), but it will search max number of squares.
… …
2034{ 2032{
2035 arr += begin; 2033 arr += begin;
2036 end -= begin; 2034 end -= begin;
2037 2035
2038 while (--end) 2036 while (--end)
2039 swap (arr [end], arr [RANDOM () % (end + 1)]); 2037 swap (arr [end], arr [rndm (end + 1)]);
2040} 2038}
2041 2039
2042/* new function to make monster searching more efficient, and effective! 2040/* new function to make monster searching more efficient, and effective!
2043 * This basically returns a randomized array (in the passed pointer) of 2041 * This basically returns a randomized array (in the passed pointer) of
2044 * 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
… …
2178 2176
2179 return 3; 2177 return 3;
2180} 2178}
2181 2179
2182/* 2180/*
2183 * absdir(int): Returns a number between 1 and 8, which represent
2184 * the "absolute" direction of a number (it actually takes care of
2185 * "overflow" in previous calculations of a direction).
2186 */
2187
2188int
2189absdir (int d)
2190{
2191 while (d < 1)
2192 d += 8;
2193
2194 while (d > 8)
2195 d -= 8;
2196
2197 return d;
2198}
2199
2200/*
2201 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2181 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202 * between two directions (which are expected to be absolute (see absdir()) 2182 * between two directions (which are expected to be absolute (see absdir())
2203 */ 2183 */
2204
2205int 2184int
2206dirdiff (int dir1, int dir2) 2185dirdiff (int dir1, int dir2)
2207{ 2186{
2208 int d; 2187 int d;
2209 2188
… …
2375 insert_ob_in_ob (object_create_clone (item), dst); 2354 insert_ob_in_ob (object_create_clone (item), dst);
2376 2355
2377 return dst; 2356 return dst;
2378} 2357}
2379 2358
2380/* GROS - Creates an object using a string representing its content. */
2381/* Basically, we save the content of the string to a temp file, then call */
2382/* load_object on it. I admit it is a highly inefficient way to make things, */
2383/* but it was simple to make and allows reusing the load_object function. */
2384/* Remember not to use load_object_str in a time-critical situation. */
2385/* Also remember that multiparts objects are not supported for now. */
2386object *
2387load_object_str (const char *obstr)
2388{
2389 object *op;
2390 char filename[MAX_BUF];
2391
2392 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394 FILE *tempfile = fopen (filename, "w");
2395
2396 if (tempfile == NULL)
2397 {
2398 LOG (llevError, "Error - Unable to access load object temp file\n");
2399 return NULL;
2400 }
2401
2402 fprintf (tempfile, obstr);
2403 fclose (tempfile);
2404
2405 op = object::create ();
2406
2407 object_thawer thawer (filename);
2408
2409 if (thawer)
2410 load_object (thawer, op, 0);
2411
2412 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413 CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415 return op;
2416}
2417
2418/* This returns the first object in who's inventory that 2359/* This returns the first object in who's inventory that
2419 * has the same type and subtype match. 2360 * has the same type and subtype match.
2420 * returns NULL if no match. 2361 * returns NULL if no match.
2421 */ 2362 */
2422object * 2363object *
… …
2475 if (link->key == canonical_key) 2416 if (link->key == canonical_key)
2476 return link->value; 2417 return link->value;
2477 2418
2478 return 0; 2419 return 0;
2479} 2420}
2480
2481 2421
2482/* 2422/*
2483 * Updates the canonical_key in op to value. 2423 * Updates the canonical_key in op to value.
2484 * 2424 *
2485 * 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).
… …
2595object::flag_desc (char *desc, int len) const 2535object::flag_desc (char *desc, int len) const
2596{ 2536{
2597 char *p = desc; 2537 char *p = desc;
2598 bool first = true; 2538 bool first = true;
2599 2539
2540 *p = 0;
2541
2600 for (int i = 0; i < NUM_FLAGS; i++) 2542 for (int i = 0; i < NUM_FLAGS; i++)
2601 { 2543 {
2602 if (len <= 10) // magic constant! 2544 if (len <= 10) // magic constant!
2603 { 2545 {
2604 snprintf (p, len, ",..."); 2546 snprintf (p, len, ",...");
2605 break; 2547 break;
2606 } 2548 }
2607 2549
2608 if (flag[i]) 2550 if (flag [i])
2609 { 2551 {
2610 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); 2552 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611 len -= cnt; 2553 len -= cnt;
2612 p += cnt; 2554 p += cnt;
2613 first = false; 2555 first = false;
… …
2615 } 2557 }
2616 2558
2617 return desc; 2559 return desc;
2618} 2560}
2619 2561
2620// 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
2621const char * 2563const char *
2622object::debug_desc (char *info) const 2564object::debug_desc (char *info) const
2623{ 2565{
2624 char flagdesc[512]; 2566 char flagdesc[512];
2625 char info2[256 * 4]; 2567 char info2[256 * 4];
2626 char *p = info; 2568 char *p = info;
2627 2569
2628 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}",
2629 count, uuid.seq, 2571 count, uuid.seq,
2630 &name, 2572 &name,
2631 title ? "\",title:" : "", 2573 title ? "\",title:\"" : "",
2632 title ? (const char *)title : "", 2574 title ? (const char *)title : "",
2633 flag_desc (flagdesc, 512), type); 2575 flag_desc (flagdesc, 512), type);
2634 2576
2635 if (env) 2577 if (env)
2636 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2578 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2642} 2584}
2643 2585
2644const char * 2586const char *
2645object::debug_desc () const 2587object::debug_desc () const
2646{ 2588{
2647 static char info[256 * 3]; 2589 static char info[256 * 4];
2648 return debug_desc (info); 2590 return debug_desc (info);
2649} 2591}
2650 2592
2593const char *
2594object::debug_desc2 () const
2595{
2596 static char info[256 * 4];
2597 return debug_desc (info);
2598}
2599
2600struct region *
2601object::region () const
2602{
2603 return map ? map->region (x, y)
2604 : region::default_region ();
2605}
2606
2607const materialtype_t *
2608object::dominant_material () const
2609{
2610 if (materialtype_t *mat = name_to_material (materialname))
2611 return mat;
2612
2613 // omfg this is slow, this has to be temporary :)
2614 shstr unknown ("unknown");
2615
2616 return name_to_material (unknown);
2617}
2618
2619void
2620object::open_container (object *new_container)
2621{
2622 if (container == new_container)
2623 return;
2624
2625 if (object *old_container = container)
2626 {
2627 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2628 return;
2629
2630#if 0
2631 // remove the "Close old_container" object.
2632 if (object *closer = old_container->inv)
2633 if (closer->type == CLOSE_CON)
2634 closer->destroy ();
2635#endif
2636
2637 old_container->flag [FLAG_APPLIED] = 0;
2638 container = 0;
2639
2640 esrv_update_item (UPD_FLAGS, this, old_container);
2641 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2642 }
2643
2644 if (new_container)
2645 {
2646 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2647 return;
2648
2649 // TODO: this does not seem to serve any purpose anymore?
2650#if 0
2651 // insert the "Close Container" object.
2652 if (archetype *closer = new_container->other_arch)
2653 {
2654 object *closer = arch_to_object (new_container->other_arch);
2655 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2656 new_container->insert (closer);
2657 }
2658#endif
2659
2660 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2661
2662 new_container->flag [FLAG_APPLIED] = 1;
2663 container = new_container;
2664
2665 esrv_update_item (UPD_FLAGS, this, new_container);
2666 esrv_send_inventory (this, new_container);
2667 }
2668}
2669
2670

Diff Legend

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