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.155 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.169 by root, Wed Aug 1 01:07:42 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <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.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
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}
… …
495 { 494 {
496 current_weapon = chosen_skill = 0; 495 current_weapon = chosen_skill = 0;
497 update_stats (); 496 update_stats ();
498 497
499 new_draw_info_format (NDI_UNIQUE, 0, this, 498 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance your applied items all at once, but the %s is too much. " 499 "You try to balance all your items at once, "
500 "but the %s is just too much for your body. "
501 "You need to unapply some items first.", &ob->name); 501 "[You need to unapply some items first.]", &ob->name);
502 return false; 502 return false;
503 } 503 }
504 504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 } 506 }
… …
936 map = freed_map; 936 map = freed_map;
937 x = 1; 937 x = 1;
938 y = 1; 938 y = 1;
939 } 939 }
940 940
941 head = 0;
942
943 if (more) 941 if (more)
944 { 942 {
945 more->destroy (); 943 more->destroy ();
946 more = 0; 944 more = 0;
947 } 945 }
948 946
947 head = 0;
948
949 // clear those pointers that likely might have circular references to us 949 // clear those pointers that likely might cause circular references
950 owner = 0; 950 owner = 0;
951 enemy = 0; 951 enemy = 0;
952 attacked_by = 0; 952 attacked_by = 0;
953 current_weapon = 0;
953} 954}
954 955
955void 956void
956object::destroy (bool destroy_inventory) 957object::destroy (bool destroy_inventory)
957{ 958{
958 if (destroyed ()) 959 if (destroyed ())
959 return; 960 return;
960 961
961 if (destroy_inventory) 962 if (destroy_inventory)
962 destroy_inv (false); 963 destroy_inv (false);
964
965 play_sound (sound_die);
963 966
964 attachable::destroy (); 967 attachable::destroy ();
965} 968}
966 969
967/* 970/*
… …
1115 1118
1116 if (destroyed ()) 1119 if (destroyed ())
1117 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1120 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1118 } 1121 }
1119 1122
1120 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1121 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1122 if (tmp->above == tmp)
1123 tmp->above = 0;
1124
1125 last = tmp; 1123 last = tmp;
1126 } 1124 }
1127 1125
1128 /* last == NULL if there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1129 //TODO: this makes little sense, why only update the topmost object? 1127 //TODO: this makes little sense, why only update the topmost object?
… …
1180 if (more) 1178 if (more)
1181 return; 1179 return;
1182 1180
1183 object *prev = this; 1181 object *prev = this;
1184 1182
1185 for (archetype *at = arch->more; at; at = at->more) 1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1186 { 1184 {
1187 object *op = arch_to_object (at); 1185 object *op = arch_to_object (at);
1188 1186
1189 op->name = name; 1187 op->name = name;
1190 op->name_pl = name_pl; 1188 op->name_pl = name_pl;
… …
1204object * 1202object *
1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1206{ 1204{
1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1208 { 1206 {
1209 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1210 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1211 } 1209 }
1212 1210
1213 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1214} 1212}
1215 1213
… …
1379 */ 1377 */
1380 if (last && last->below && last != floor) 1378 if (last && last->below && last != floor)
1381 top = last->below; 1379 top = last->below;
1382 } 1380 }
1383 } /* If objects on this space */ 1381 } /* If objects on this space */
1384
1385 if (flag & INS_MAP_LOAD) 1382 if (flag & INS_MAP_LOAD)
1386 top = ms.top; 1383 top = ms.top;
1387 1384
1388 if (flag & INS_ABOVE_FLOOR_ONLY) 1385 if (flag & INS_ABOVE_FLOOR_ONLY)
1389 top = floor; 1386 top = floor;
… …
1487 object *tmp, *tmp1; 1484 object *tmp, *tmp1;
1488 1485
1489 /* first search for itself and remove any old instances */ 1486 /* first search for itself and remove any old instances */
1490 1487
1491 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1488 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1492 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1489 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1493 tmp->destroy (); 1490 tmp->destroy ();
1494 1491
1495 tmp1 = arch_to_object (archetype::find (arch_string)); 1492 tmp1 = arch_to_object (archetype::find (arch_string));
1496 1493
1497 tmp1->x = op->x; 1494 tmp1->x = op->x;
… …
2494 /* Basically, if the archetype has this key set, 2491 /* Basically, if the archetype has this key set,
2495 * we need to store the null value so when we save 2492 * we need to store the null value so when we save
2496 * it, we save the empty value so that when we load, 2493 * it, we save the empty value so that when we load,
2497 * we get this value back again. 2494 * we get this value back again.
2498 */ 2495 */
2499 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2496 if (get_ob_key_link (op->arch, canonical_key))
2500 field->value = 0; 2497 field->value = 0;
2501 else 2498 else
2502 { 2499 {
2503 if (last) 2500 if (last)
2504 last->next = field->next; 2501 last->next = field->next;
… …
2573 } 2570 }
2574 else 2571 else
2575 item = item->env; 2572 item = item->env;
2576} 2573}
2577 2574
2578
2579const char * 2575const char *
2580object::flag_desc (char *desc, int len) const 2576object::flag_desc (char *desc, int len) const
2581{ 2577{
2582 char *p = desc; 2578 char *p = desc;
2583 bool first = true; 2579 bool first = true;
… …
2645} 2641}
2646 2642
2647const materialtype_t * 2643const materialtype_t *
2648object::dominant_material () const 2644object::dominant_material () const
2649{ 2645{
2650 if (materialtype_t *mat = name_to_material (materialname)) 2646 if (materialtype_t *mt = name_to_material (materialname))
2651 return mat; 2647 return mt;
2652 2648
2653 // omfg this is slow, this has to be temporary :)
2654 shstr unknown ("unknown");
2655
2656 return name_to_material (unknown); 2649 return name_to_material (shstr_unknown);
2657} 2650}
2658 2651
2659void 2652void
2660object::open_container (object *new_container) 2653object::open_container (object *new_container)
2661{ 2654{
… …
2705 esrv_update_item (UPD_FLAGS, this, new_container); 2698 esrv_update_item (UPD_FLAGS, this, new_container);
2706 esrv_send_inventory (this, new_container); 2699 esrv_send_inventory (this, new_container);
2707 } 2700 }
2708} 2701}
2709 2702
2703object *
2704object::force_find (const shstr name)
2705{
2706 /* cycle through his inventory to look for the MARK we want to
2707 * place
2708 */
2709 for (object *tmp = inv; tmp; tmp = tmp->below)
2710 if (tmp->type == FORCE && tmp->slaying == name)
2711 return splay (tmp);
2710 2712
2713 return 0;
2714}
2715
2716void
2717object::force_add (const shstr name, int duration)
2718{
2719 if (object *force = force_find (name))
2720 force->destroy ();
2721
2722 object *force = get_archetype (FORCE_NAME);
2723
2724 force->slaying = name;
2725 force->stats.food = 1;
2726 force->speed_left = -1.f;
2727
2728 force->set_speed (duration ? 1.f / duration : 0.f);
2729 force->flag [FLAG_IS_USED_UP] = true;
2730 force->flag [FLAG_APPLIED] = true;
2731
2732 insert (force);
2733}
2734
2735void
2736object::play_sound (faceidx sound) const
2737{
2738 if (map)
2739 map->play_sound (sound, x, y);
2740}

Diff Legend

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