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.347 by root, Wed May 4 07:41:13 2011 UTC vs.
Revision 1.353 by root, Fri Jan 27 22:00:39 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
737 } 737 }
738 738
739 mapspace &m = op->ms (); 739 mapspace &m = op->ms ();
740 740
741 if (!(m.flags_ & P_UPTODATE)) 741 if (!(m.flags_ & P_UPTODATE))
742 /* nop */; 742 m.update_up (); // nothing to do except copy up
743 else if (action == UP_OBJ_INSERT) 743 else if (action == UP_OBJ_INSERT)
744 { 744 {
745#if 0 745#if 0
746 // this is likely overkill, TODO: revisit (schmorp) 746 // this is likely overkill, TODO: revisit (schmorp)
747 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) 747 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
… …
768 * that is being removed. 768 * that is being removed.
769 */ 769 */
770 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 770 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
771 m.invalidate (); 771 m.invalidate ();
772 else if (action == UP_OBJ_FACE) 772 else if (action == UP_OBJ_FACE)
773 /* Nothing to do for that case */ ; 773 m.update_up (); // nothing to do for that case, except copy up
774 else 774 else
775 LOG (llevError, "update_object called with invalid action: %d\n", action); 775 LOG (llevError, "update_object called with invalid action: %d\n", action);
776 776
777 if (op->more) 777 if (op->more)
778 update_object (op->more, action); 778 update_object (op->more, action);
… …
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])
… …
2027 */ 2008 */
2028int 2009int
2029find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2010find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2030{ 2011{
2031 int altern[SIZEOFFREE]; 2012 int altern[SIZEOFFREE];
2032 int index = 0, flag; 2013 int index = 0;
2033 2014
2034 for (int i = start; i < stop; i++) 2015 for (int i = start; i < stop; i++)
2035 { 2016 {
2036 mapxy pos (m, x, y); pos.move (i); 2017 mapxy pos (m, x, y); pos.move (i);
2037 2018
… …
2149 * there is capable of. 2130 * there is capable of.
2150 */ 2131 */
2151int 2132int
2152find_dir (maptile *m, int x, int y, object *exclude) 2133find_dir (maptile *m, int x, int y, object *exclude)
2153{ 2134{
2154 int max = SIZEOFFREE, mflags; 2135 int max = SIZEOFFREE;
2155 MoveType move_type; 2136 MoveType move_type;
2156 2137
2157 if (exclude && exclude->head_ () != exclude) 2138 if (exclude && exclude->head_ () != exclude)
2158 { 2139 {
2159 exclude = exclude->head; 2140 exclude = exclude->head;
… …
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