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.151 by root, Wed May 16 11:10: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. */
… …
495 { 495 {
496 current_weapon = chosen_skill = 0; 496 current_weapon = chosen_skill = 0;
497 update_stats (); 497 update_stats ();
498 498
499 new_draw_info_format (NDI_UNIQUE, 0, this, 499 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. " 500 "You try to balance all your items at once, "
501 "but the %s is just too much for your body. "
501 "You need to unapply some items first.", &ob->name); 502 "[You need to unapply some items first.]", &ob->name);
502 return false; 503 return false;
503 } 504 }
504 505
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 506 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 } 507 }
… …
936 map = freed_map; 937 map = freed_map;
937 x = 1; 938 x = 1;
938 y = 1; 939 y = 1;
939 } 940 }
940 941
941 head = 0;
942
943 if (more) 942 if (more)
944 { 943 {
945 more->destroy (); 944 more->destroy ();
946 more = 0; 945 more = 0;
947 } 946 }
948 947
948 head = 0;
949
949 // clear those pointers that likely might have circular references to us 950 // clear those pointers that likely might cause circular references
950 owner = 0; 951 owner = 0;
951 enemy = 0; 952 enemy = 0;
952 attacked_by = 0; 953 attacked_by = 0;
954 current_weapon = 0;
953} 955}
954 956
955void 957void
956object::destroy (bool destroy_inventory) 958object::destroy (bool destroy_inventory)
957{ 959{
… …
1115 1117
1116 if (destroyed ()) 1118 if (destroyed ())
1117 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 ());
1118 } 1120 }
1119 1121
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; 1122 last = tmp;
1126 } 1123 }
1127 1124
1128 /* last == NULL if there are no objects on this space */ 1125 /* last == NULL if there are no objects on this space */
1129 //TODO: this makes little sense, why only update the topmost object? 1126 //TODO: this makes little sense, why only update the topmost object?
… …
1180 if (more) 1177 if (more)
1181 return; 1178 return;
1182 1179
1183 object *prev = this; 1180 object *prev = this;
1184 1181
1185 for (archetype *at = arch->more; at; at = at->more) 1182 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1186 { 1183 {
1187 object *op = arch_to_object (at); 1184 object *op = arch_to_object (at);
1188 1185
1189 op->name = name; 1186 op->name = name;
1190 op->name_pl = name_pl; 1187 op->name_pl = name_pl;
… …
1204object * 1201object *
1205insert_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)
1206{ 1203{
1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1204 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1208 { 1205 {
1209 tmp->x = x + tmp->arch->clone.x; 1206 tmp->x = x + tmp->arch->x;
1210 tmp->y = y + tmp->arch->clone.y; 1207 tmp->y = y + tmp->arch->y;
1211 } 1208 }
1212 1209
1213 return insert_ob_in_map (op, m, originator, flag); 1210 return insert_ob_in_map (op, m, originator, flag);
1214} 1211}
1215 1212
… …
1236object * 1233object *
1237insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1234insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1238{ 1235{
1239 assert (!op->flag [FLAG_FREED]); 1236 assert (!op->flag [FLAG_FREED]);
1240 1237
1241 object *tmp, *top, *floor = NULL; 1238 object *top, *floor = NULL;
1242 1239
1243 op->remove (); 1240 op->remove ();
1244 1241
1245#if 0 1242#if 0
1246 if (!m->active != !op->active) 1243 if (!m->active != !op->active)
… …
1262#endif 1259#endif
1263 return op; 1260 return op;
1264 } 1261 }
1265 1262
1266 if (object *more = op->more) 1263 if (object *more = op->more)
1267 {
1268 if (!insert_ob_in_map (more, m, originator, flag)) 1264 if (!insert_ob_in_map (more, m, originator, flag))
1269 {
1270 if (!op->head)
1271 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1272
1273 return 0; 1265 return 0;
1274 }
1275 }
1276 1266
1277 CLEAR_FLAG (op, FLAG_REMOVED); 1267 CLEAR_FLAG (op, FLAG_REMOVED);
1278 1268
1279 /* Ideally, the caller figures this out. However, it complicates a lot 1269 /* Ideally, the caller figures this out. However, it complicates a lot
1280 * of areas of callers (eg, anything that uses find_free_spot would now 1270 * of areas of callers (eg, anything that uses find_free_spot would now
… …
1287 mapspace &ms = op->ms (); 1277 mapspace &ms = op->ms ();
1288 1278
1289 /* this has to be done after we translate the coordinates. 1279 /* this has to be done after we translate the coordinates.
1290 */ 1280 */
1291 if (op->nrof && !(flag & INS_NO_MERGE)) 1281 if (op->nrof && !(flag & INS_NO_MERGE))
1292 for (tmp = ms.bot; tmp; tmp = tmp->above) 1282 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1293 if (object::can_merge (op, tmp)) 1283 if (object::can_merge (op, tmp))
1294 { 1284 {
1295 op->nrof += tmp->nrof; 1285 op->nrof += tmp->nrof;
1296 tmp->destroy (); 1286 tmp->destroy ();
1297 } 1287 }
… …
1466 * blocked() and wall() work properly), and these flags are updated by 1456 * blocked() and wall() work properly), and these flags are updated by
1467 * update_object(). 1457 * update_object().
1468 */ 1458 */
1469 1459
1470 /* if this is not the head or flag has been passed, don't check walk on status */ 1460 /* if this is not the head or flag has been passed, don't check walk on status */
1471 if (!(flag & INS_NO_WALK_ON) && !op->head) 1461 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1472 { 1462 {
1473 if (check_move_on (op, originator)) 1463 if (check_move_on (op, originator))
1474 return 0; 1464 return 0;
1475 1465
1476 /* If we are a multi part object, lets work our way through the check 1466 /* If we are a multi part object, lets work our way through the check
1477 * walk on's. 1467 * walk on's.
1478 */ 1468 */
1479 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1469 for (object *tmp = op->more; tmp; tmp = tmp->more)
1480 if (check_move_on (tmp, originator)) 1470 if (check_move_on (tmp, originator))
1481 return 0; 1471 return 0;
1482 } 1472 }
1483 1473
1484 return op; 1474 return op;
… …
1494 object *tmp, *tmp1; 1484 object *tmp, *tmp1;
1495 1485
1496 /* first search for itself and remove any old instances */ 1486 /* first search for itself and remove any old instances */
1497 1487
1498 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1488 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1499 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1489 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1500 tmp->destroy (); 1490 tmp->destroy ();
1501 1491
1502 tmp1 = arch_to_object (archetype::find (arch_string)); 1492 tmp1 = arch_to_object (archetype::find (arch_string));
1503 1493
1504 tmp1->x = op->x; 1494 tmp1->x = op->x;
… …
1665 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1655 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1666 free (dump); 1656 free (dump);
1667 return op; 1657 return op;
1668 } 1658 }
1669 1659
1670 if (where->head) 1660 if (where->head_ () != where)
1671 { 1661 {
1672 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1662 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1673 where = where->head; 1663 where = where->head;
1674 } 1664 }
1675 1665
1676 return where->insert (op); 1666 return where->insert (op);
1677} 1667}
… …
2005 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1995 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2006 { 1996 {
2007 CLEAR_FLAG (tmp, flag); 1997 CLEAR_FLAG (tmp, flag);
2008 unflag_inv (tmp, flag); 1998 unflag_inv (tmp, flag);
2009 } 1999 }
2010}
2011
2012/*
2013 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2014 * all it's inventory (recursively).
2015 * If checksums are used, a player will get set_cheat called for
2016 * him/her-self and all object carried by a call to this function.
2017 */
2018void
2019set_cheat (object *op)
2020{
2021 SET_FLAG (op, FLAG_WAS_WIZ);
2022 flag_inv (op, FLAG_WAS_WIZ);
2023} 2000}
2024 2001
2025/* 2002/*
2026 * find_free_spot(object, map, x, y, start, stop) will search for 2003 * find_free_spot(object, map, x, y, start, stop) will search for
2027 * a spot at the given map and coordinates which will be able to contain 2004 * a spot at the given map and coordinates which will be able to contain
… …
2145 object *tmp; 2122 object *tmp;
2146 maptile *mp; 2123 maptile *mp;
2147 2124
2148 MoveType blocked, move_type; 2125 MoveType blocked, move_type;
2149 2126
2150 if (exclude && exclude->head) 2127 if (exclude && exclude->head_ () != exclude)
2151 { 2128 {
2152 exclude = exclude->head; 2129 exclude = exclude->head;
2153 move_type = exclude->move_type; 2130 move_type = exclude->move_type;
2154 } 2131 }
2155 else 2132 else
… …
2178 max = maxfree[i]; 2155 max = maxfree[i];
2179 else if (mflags & P_IS_ALIVE) 2156 else if (mflags & P_IS_ALIVE)
2180 { 2157 {
2181 for (tmp = ms.bot; tmp; tmp = tmp->above) 2158 for (tmp = ms.bot; tmp; tmp = tmp->above)
2182 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2159 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2183 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2160 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2184 break; 2161 break;
2185 2162
2186 if (tmp) 2163 if (tmp)
2187 return freedir[i]; 2164 return freedir[i];
2188 } 2165 }
… …
2383 * create clone from object to another 2360 * create clone from object to another
2384 */ 2361 */
2385object * 2362object *
2386object_create_clone (object *asrc) 2363object_create_clone (object *asrc)
2387{ 2364{
2388 object *dst = 0, *tmp, *src, *part, *prev, *item; 2365 object *dst = 0, *tmp, *src, *prev, *item;
2389 2366
2390 if (!asrc) 2367 if (!asrc)
2391 return 0; 2368 return 0;
2392 2369
2393 src = asrc;
2394 if (src->head)
2395 src = src->head; 2370 src = asrc->head_ ();
2396 2371
2397 prev = 0; 2372 prev = 0;
2398 for (part = src; part; part = part->more) 2373 for (object *part = src; part; part = part->more)
2399 { 2374 {
2400 tmp = part->clone (); 2375 tmp = part->clone ();
2401 tmp->x -= src->x; 2376 tmp->x -= src->x;
2402 tmp->y -= src->y; 2377 tmp->y -= src->y;
2403 2378
… …
2516 /* Basically, if the archetype has this key set, 2491 /* Basically, if the archetype has this key set,
2517 * we need to store the null value so when we save 2492 * we need to store the null value so when we save
2518 * it, we save the empty value so that when we load, 2493 * it, we save the empty value so that when we load,
2519 * we get this value back again. 2494 * we get this value back again.
2520 */ 2495 */
2521 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2496 if (get_ob_key_link (op->arch, canonical_key))
2522 field->value = 0; 2497 field->value = 0;
2523 else 2498 else
2524 { 2499 {
2525 if (last) 2500 if (last)
2526 last->next = field->next; 2501 last->next = field->next;
… …
2594 item = item->inv; 2569 item = item->inv;
2595 } 2570 }
2596 else 2571 else
2597 item = item->env; 2572 item = item->env;
2598} 2573}
2599
2600 2574
2601const char * 2575const char *
2602object::flag_desc (char *desc, int len) const 2576object::flag_desc (char *desc, int len) const
2603{ 2577{
2604 char *p = desc; 2578 char *p = desc;

Diff Legend

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