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.122 by root, Wed Jan 24 22:42:48 2007 UTC vs.
Revision 1.132 by root, Sat Feb 10 21:01:09 2007 UTC

819 819
820 if (flag [FLAG_IS_LINKED]) 820 if (flag [FLAG_IS_LINKED])
821 remove_button_link (this); 821 remove_button_link (this);
822 822
823 if (flag [FLAG_FRIENDLY]) 823 if (flag [FLAG_FRIENDLY])
824 {
824 remove_friendly_object (this); 825 remove_friendly_object (this);
826
827 if (type == GOLEM
828 && owner
829 && owner->type == PLAYER
830 && owner->contr->ranges[range_golem] == this)
831 owner->contr->ranges[range_golem] = 0;
832 }
825 833
826 if (!flag [FLAG_REMOVED]) 834 if (!flag [FLAG_REMOVED])
827 remove (); 835 remove ();
828 836
829 destroy_inv (true); 837 destroy_inv (true);
901 * This function removes the object op from the linked list of objects 909 * This function removes the object op from the linked list of objects
902 * which it is currently tied to. When this function is done, the 910 * which it is currently tied to. When this function is done, the
903 * object will have no environment. If the object previously had an 911 * object will have no environment. If the object previously had an
904 * environment, the x and y coordinates will be updated to 912 * environment, the x and y coordinates will be updated to
905 * the previous environment. 913 * the previous environment.
906 * Beware: This function is called from the editor as well!
907 */ 914 */
908void 915void
909object::remove_slow () 916object::do_remove ()
910{ 917{
911 object *tmp, *last = 0; 918 object *tmp, *last = 0;
912 object *otmp; 919 object *otmp;
913 920
914 if (QUERY_FLAG (this, FLAG_REMOVED)) 921 if (QUERY_FLAG (this, FLAG_REMOVED))
957 } 964 }
958 else if (map) 965 else if (map)
959 { 966 {
960 if (type == PLAYER) 967 if (type == PLAYER)
961 { 968 {
969 // leaving a spot always closes any open container on the ground
970 if (container && !container->env)
971 // this causes spurious floorbox updates, but it ensures
972 // that the CLOSE event is being sent.
973 close_container ();
974
962 --map->players; 975 --map->players;
963 map->touch (); 976 map->touch ();
964 } 977 }
965 978
966 map->dirty = true; 979 map->dirty = true;
1968 } 1981 }
1969 1982
1970 if (!index) 1983 if (!index)
1971 return -1; 1984 return -1;
1972 1985
1973 return altern[RANDOM () % index]; 1986 return altern [rndm (index)];
1974} 1987}
1975 1988
1976/* 1989/*
1977 * find_first_free_spot(archetype, maptile, x, y) works like 1990 * find_first_free_spot(archetype, maptile, x, y) works like
1978 * find_free_spot(), but it will search max number of squares. 1991 * find_free_spot(), but it will search max number of squares.
1999{ 2012{
2000 arr += begin; 2013 arr += begin;
2001 end -= begin; 2014 end -= begin;
2002 2015
2003 while (--end) 2016 while (--end)
2004 swap (arr [end], arr [RANDOM () % (end + 1)]); 2017 swap (arr [end], arr [rndm (end + 1)]);
2005} 2018}
2006 2019
2007/* new function to make monster searching more efficient, and effective! 2020/* new function to make monster searching more efficient, and effective!
2008 * This basically returns a randomized array (in the passed pointer) of 2021 * This basically returns a randomized array (in the passed pointer) of
2009 * the spaces to find monsters. In this way, it won't always look for 2022 * the spaces to find monsters. In this way, it won't always look for
2571{ 2584{
2572 char flagdesc[512]; 2585 char flagdesc[512];
2573 char info2[256 * 4]; 2586 char info2[256 * 4];
2574 char *p = info; 2587 char *p = info;
2575 2588
2576 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2589 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2577 count, uuid.seq, 2590 count, uuid.seq,
2578 &name, 2591 &name,
2579 title ? "\",title:\"" : "", 2592 title ? "\",title:\"" : "",
2580 title ? (const char *)title : "", 2593 title ? (const char *)title : "",
2581 flag_desc (flagdesc, 512), type); 2594 flag_desc (flagdesc, 512), type);
2601{ 2614{
2602 static char info[256 * 4]; 2615 static char info[256 * 4];
2603 return debug_desc (info); 2616 return debug_desc (info);
2604} 2617}
2605 2618
2619struct region *
2620object::region () const
2621{
2622 return map ? map->region (x, y)
2623 : region::default_region ();
2624}
2625
2626const materialtype_t *
2627object::dominant_material () const
2628{
2629 if (materialtype_t *mat = name_to_material (materialname))
2630 return mat;
2631
2632 // omfg this is slow, this has to be temporary :)
2633 shstr unknown ("unknown");
2634
2635 return name_to_material (unknown);
2636}
2637
2638void
2639object::open_container (object *new_container)
2640{
2641 if (container == new_container)
2642 return;
2643
2644 if (object *old_container = container)
2645 {
2646 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2647 return;
2648
2649#if 0
2650 // remove the "Close old_container" object.
2651 if (object *closer = old_container->inv)
2652 if (closer->type == CLOSE_CON)
2653 closer->destroy ();
2654#endif
2655
2656 old_container->flag [FLAG_APPLIED] = 0;
2657 container = 0;
2658
2659 esrv_update_item (UPD_FLAGS, this, old_container);
2660 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2661 }
2662
2663 if (new_container)
2664 {
2665 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2666 return;
2667
2668 // TODO: this does not seem to serve any purpose anymore?
2669#if 0
2670 // insert the "Close Container" object.
2671 if (archetype *closer = new_container->other_arch)
2672 {
2673 object *closer = arch_to_object (new_container->other_arch);
2674 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2675 new_container->insert (closer);
2676 }
2677#endif
2678
2679 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2680
2681 new_container->flag [FLAG_APPLIED] = 1;
2682 container = new_container;
2683
2684 esrv_update_item (UPD_FLAGS, this, new_container);
2685 esrv_send_inventory (this, new_container);
2686 }
2687}
2688
2689

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines