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.162 by root, Sat Jun 16 00:12:20 2007 UTC vs.
Revision 1.173 by root, Sat Aug 4 22:23:47 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
… …
300 return 0; 299 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 301 return 0;
303 } 302 }
304 303
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
307 { 305 {
308 ob1->optimise (); 306 ob1->optimise ();
309 ob2->optimise (); 307 ob2->optimise ();
310 308
311 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
312 return 0; 311 return 0;
313 } 312 }
314 313
315 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
316 return 1; 315 return 1;
317} 316}
… …
960 if (destroyed ()) 959 if (destroyed ())
961 return; 960 return;
962 961
963 if (destroy_inventory) 962 if (destroy_inventory)
964 destroy_inv (false); 963 destroy_inv (false);
964
965 if (is_head ())
966 if (sound_destroy)
967 play_sound (sound_destroy);
968 else if (flag [FLAG_MONSTER])
969 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
965 970
966 attachable::destroy (); 971 attachable::destroy ();
967} 972}
968 973
969/* 974/*
… …
1376 */ 1381 */
1377 if (last && last->below && last != floor) 1382 if (last && last->below && last != floor)
1378 top = last->below; 1383 top = last->below;
1379 } 1384 }
1380 } /* If objects on this space */ 1385 } /* If objects on this space */
1381
1382 if (flag & INS_MAP_LOAD) 1386 if (flag & INS_MAP_LOAD)
1383 top = ms.top; 1387 top = ms.top;
1384 1388
1385 if (flag & INS_ABOVE_FLOOR_ONLY) 1389 if (flag & INS_ABOVE_FLOOR_ONLY)
1386 top = floor; 1390 top = floor;
… …
2641} 2645}
2642 2646
2643const materialtype_t * 2647const materialtype_t *
2644object::dominant_material () const 2648object::dominant_material () const
2645{ 2649{
2646 if (materialtype_t *mat = name_to_material (materialname)) 2650 if (materialtype_t *mt = name_to_material (materialname))
2647 return mat; 2651 return mt;
2648 2652
2649 // omfg this is slow, this has to be temporary :)
2650 shstr unknown ("unknown");
2651
2652 return name_to_material (unknown); 2653 return name_to_material (shstr_unknown);
2653} 2654}
2654 2655
2655void 2656void
2656object::open_container (object *new_container) 2657object::open_container (object *new_container)
2657{ 2658{
… …
2701 esrv_update_item (UPD_FLAGS, this, new_container); 2702 esrv_update_item (UPD_FLAGS, this, new_container);
2702 esrv_send_inventory (this, new_container); 2703 esrv_send_inventory (this, new_container);
2703 } 2704 }
2704} 2705}
2705 2706
2707object *
2708object::force_find (const shstr name)
2709{
2710 /* cycle through his inventory to look for the MARK we want to
2711 * place
2712 */
2713 for (object *tmp = inv; tmp; tmp = tmp->below)
2714 if (tmp->type == FORCE && tmp->slaying == name)
2715 return splay (tmp);
2706 2716
2717 return 0;
2718}
2719
2720void
2721object::force_add (const shstr name, int duration)
2722{
2723 if (object *force = force_find (name))
2724 force->destroy ();
2725
2726 object *force = get_archetype (FORCE_NAME);
2727
2728 force->slaying = name;
2729 force->stats.food = 1;
2730 force->speed_left = -1.f;
2731
2732 force->set_speed (duration ? 1.f / duration : 0.f);
2733 force->flag [FLAG_IS_USED_UP] = true;
2734 force->flag [FLAG_APPLIED] = true;
2735
2736 insert (force);
2737}
2738

Diff Legend

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