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.348 by root, Sat May 7 20:03:27 2011 UTC vs.
Revision 1.351 by elmex, Fri Jun 3 08:36:45 2011 UTC

1004 li->count = count; 1004 li->count = count;
1005 1005
1006 freelist = li; 1006 freelist = li;
1007 ++free_count; 1007 ++free_count;
1008} 1008}
1009
1010static struct freed_map : maptile
1011{
1012 freed_map ()
1013 : maptile (3, 3)
1014 {
1015 path = "<freed objects map>";
1016 name = "/internal/freed_objects_map";
1017 no_drop = 1;
1018 no_reset = 1;
1019
1020 state = MAP_ACTIVE;
1021 }
1022
1023 ~freed_map ()
1024 {
1025 destroy ();
1026 }
1027} freed_map; // freed objects are moved here to avoid crashes
1028 1009
1029void 1010void
1030object::do_destroy () 1011object::do_destroy ()
1031{ 1012{
1032 if (flag [FLAG_IS_LINKED]) 1013 if (flag [FLAG_IS_LINKED])
2410 return /*who->flag [FLAG_WIZ]|| */ 2391 return /*who->flag [FLAG_WIZ]|| */
2411 (item->weight > 0 && !item->flag [FLAG_NO_PICK] && 2392 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2412 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2393 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2413} 2394}
2414 2395
2396//-GPL
2397
2415/* 2398/*
2416 * create clone from object to another 2399 * create clone from object to another
2417 */ 2400 */
2418object * 2401object *
2419object::deep_clone () 2402object::deep_clone ()
2631object::region () const 2614object::region () const
2632{ 2615{
2633 return map ? map->region (x, y) 2616 return map ? map->region (x, y)
2634 : region::default_region (); 2617 : region::default_region ();
2635} 2618}
2619
2620//+GPL
2636 2621
2637void 2622void
2638object::open_container (object *new_container) 2623object::open_container (object *new_container)
2639{ 2624{
2640 if (container == new_container) 2625 if (container == new_container)
2698 } 2683 }
2699// else if (!old_container->env && contr && contr->ns) 2684// else if (!old_container->env && contr && contr->ns)
2700// contr->ns->floorbox_reset (); 2685// contr->ns->floorbox_reset ();
2701} 2686}
2702 2687
2688//-GPL
2689
2690// prefetch some flat area around the player
2691static void
2692prefetch_surrounding_area (object *op, maptile *map, int range)
2693{
2694 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
2695 op->x - range , op->y - range ,
2696 op->x + range + 1, op->y + range + 1);
2697 rect->m;
2698 ++rect)
2699 {
2700 rect->m->touch ();
2701 rect->m->activate ();
2702 }
2703}
2704
2705// prefetch a generous area around the player, also up and down
2706void
2707object::prefetch_surrounding_maps ()
2708{
2709 prefetch_surrounding_area (this, map, 40);
2710
2711 if (maptile *m = map->tile_available (TILE_DOWN))
2712 prefetch_surrounding_area (this, m, 20);
2713
2714 if (maptile *m = map->tile_available (TILE_UP))
2715 prefetch_surrounding_area (this, m, 20);
2716}
2717
2718//+GPL
2719
2703object * 2720object *
2704object::force_find (shstr_tmp name) 2721object::force_find (shstr_tmp name)
2705{ 2722{
2706 /* cycle through his inventory to look for the MARK we want to 2723 /* cycle through his inventory to look for the MARK we want to
2707 * place 2724 * place
2711 return splay (tmp); 2728 return splay (tmp);
2712 2729
2713 return 0; 2730 return 0;
2714} 2731}
2715 2732
2716//-GPL
2717
2718void 2733void
2719object::force_set_timer (int duration) 2734object::force_set_timer (int duration)
2720{ 2735{
2721 this->duration = 1; 2736 this->duration = 1;
2722 this->speed_left = -1.f; 2737 this->speed_left = -1.f;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines