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.156 by root, Fri May 18 01:01:01 2007 UTC vs.
Revision 1.162 by root, Sat Jun 16 00:12:20 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
… …
937 map = freed_map; 937 map = freed_map;
938 x = 1; 938 x = 1;
939 y = 1; 939 y = 1;
940 } 940 }
941 941
942 head = 0;
943
944 if (more) 942 if (more)
945 { 943 {
946 more->destroy (); 944 more->destroy ();
947 more = 0; 945 more = 0;
948 } 946 }
949 947
948 head = 0;
949
950 // clear those pointers that likely might have circular references to us 950 // clear those pointers that likely might cause circular references
951 owner = 0; 951 owner = 0;
952 enemy = 0; 952 enemy = 0;
953 attacked_by = 0; 953 attacked_by = 0;
954 current_weapon = 0;
954} 955}
955 956
956void 957void
957object::destroy (bool destroy_inventory) 958object::destroy (bool destroy_inventory)
958{ 959{
… …
1116 1117
1117 if (destroyed ()) 1118 if (destroyed ())
1118 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1119 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1119 } 1120 }
1120 1121
1121 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1122 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1123 if (tmp->above == tmp)
1124 tmp->above = 0;
1125
1126 last = tmp; 1122 last = tmp;
1127 } 1123 }
1128 1124
1129 /* last == NULL if there are no objects on this space */ 1125 /* last == NULL if there are no objects on this space */
1130 //TODO: this makes little sense, why only update the topmost object? 1126 //TODO: this makes little sense, why only update the topmost object?
… …
1181 if (more) 1177 if (more)
1182 return; 1178 return;
1183 1179
1184 object *prev = this; 1180 object *prev = this;
1185 1181
1186 for (archetype *at = arch->more; at; at = at->more) 1182 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1187 { 1183 {
1188 object *op = arch_to_object (at); 1184 object *op = arch_to_object (at);
1189 1185
1190 op->name = name; 1186 op->name = name;
1191 op->name_pl = name_pl; 1187 op->name_pl = name_pl;
… …
1205object * 1201object *
1206insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1202insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1207{ 1203{
1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1204 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1209 { 1205 {
1210 tmp->x = x + tmp->arch->clone.x; 1206 tmp->x = x + tmp->arch->x;
1211 tmp->y = y + tmp->arch->clone.y; 1207 tmp->y = y + tmp->arch->y;
1212 } 1208 }
1213 1209
1214 return insert_ob_in_map (op, m, originator, flag); 1210 return insert_ob_in_map (op, m, originator, flag);
1215} 1211}
1216 1212
… …
1488 object *tmp, *tmp1; 1484 object *tmp, *tmp1;
1489 1485
1490 /* first search for itself and remove any old instances */ 1486 /* first search for itself and remove any old instances */
1491 1487
1492 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1488 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1493 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1489 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1494 tmp->destroy (); 1490 tmp->destroy ();
1495 1491
1496 tmp1 = arch_to_object (archetype::find (arch_string)); 1492 tmp1 = arch_to_object (archetype::find (arch_string));
1497 1493
1498 tmp1->x = op->x; 1494 tmp1->x = op->x;
… …
2495 /* Basically, if the archetype has this key set, 2491 /* Basically, if the archetype has this key set,
2496 * we need to store the null value so when we save 2492 * we need to store the null value so when we save
2497 * it, we save the empty value so that when we load, 2493 * it, we save the empty value so that when we load,
2498 * we get this value back again. 2494 * we get this value back again.
2499 */ 2495 */
2500 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2496 if (get_ob_key_link (op->arch, canonical_key))
2501 field->value = 0; 2497 field->value = 0;
2502 else 2498 else
2503 { 2499 {
2504 if (last) 2500 if (last)
2505 last->next = field->next; 2501 last->next = field->next;
… …
2573 item = item->inv; 2569 item = item->inv;
2574 } 2570 }
2575 else 2571 else
2576 item = item->env; 2572 item = item->env;
2577} 2573}
2578
2579 2574
2580const char * 2575const char *
2581object::flag_desc (char *desc, int len) const 2576object::flag_desc (char *desc, int len) const
2582{ 2577{
2583 char *p = desc; 2578 char *p = desc;

Diff Legend

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