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.152 by root, Thu May 17 14:14:54 2007 UTC vs.
Revision 1.161 by root, Wed Jun 13 21:09:39 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 }
… …
1115 1116
1116 if (destroyed ()) 1117 if (destroyed ())
1117 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1118 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1118 } 1119 }
1119 1120
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; 1121 last = tmp;
1126 } 1122 }
1127 1123
1128 /* last == NULL if there are no objects on this space */ 1124 /* last == NULL if there are no objects on this space */
1129 //TODO: this makes little sense, why only update the topmost object? 1125 //TODO: this makes little sense, why only update the topmost object?
… …
1180 if (more) 1176 if (more)
1181 return; 1177 return;
1182 1178
1183 object *prev = this; 1179 object *prev = this;
1184 1180
1185 for (archetype *at = arch->more; at; at = at->more) 1181 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1186 { 1182 {
1187 object *op = arch_to_object (at); 1183 object *op = arch_to_object (at);
1188 1184
1189 op->name = name; 1185 op->name = name;
1190 op->name_pl = name_pl; 1186 op->name_pl = name_pl;
… …
1204object * 1200object *
1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1201insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1206{ 1202{
1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1203 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1208 { 1204 {
1209 tmp->x = x + tmp->arch->clone.x; 1205 tmp->x = x + tmp->arch->x;
1210 tmp->y = y + tmp->arch->clone.y; 1206 tmp->y = y + tmp->arch->y;
1211 } 1207 }
1212 1208
1213 return insert_ob_in_map (op, m, originator, flag); 1209 return insert_ob_in_map (op, m, originator, flag);
1214} 1210}
1215 1211
… …
1236object * 1232object *
1237insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1233insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1238{ 1234{
1239 assert (!op->flag [FLAG_FREED]); 1235 assert (!op->flag [FLAG_FREED]);
1240 1236
1241 object *tmp, *top, *floor = NULL; 1237 object *top, *floor = NULL;
1242 1238
1243 op->remove (); 1239 op->remove ();
1244 1240
1245#if 0 1241#if 0
1246 if (!m->active != !op->active) 1242 if (!m->active != !op->active)
… …
1262#endif 1258#endif
1263 return op; 1259 return op;
1264 } 1260 }
1265 1261
1266 if (object *more = op->more) 1262 if (object *more = op->more)
1267 {
1268 if (!insert_ob_in_map (more, m, originator, flag)) 1263 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; 1264 return 0;
1274 }
1275 }
1276 1265
1277 CLEAR_FLAG (op, FLAG_REMOVED); 1266 CLEAR_FLAG (op, FLAG_REMOVED);
1278 1267
1279 /* Ideally, the caller figures this out. However, it complicates a lot 1268 /* 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 1269 * of areas of callers (eg, anything that uses find_free_spot would now
… …
1287 mapspace &ms = op->ms (); 1276 mapspace &ms = op->ms ();
1288 1277
1289 /* this has to be done after we translate the coordinates. 1278 /* this has to be done after we translate the coordinates.
1290 */ 1279 */
1291 if (op->nrof && !(flag & INS_NO_MERGE)) 1280 if (op->nrof && !(flag & INS_NO_MERGE))
1292 for (tmp = ms.bot; tmp; tmp = tmp->above) 1281 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1293 if (object::can_merge (op, tmp)) 1282 if (object::can_merge (op, tmp))
1294 { 1283 {
1295 op->nrof += tmp->nrof; 1284 op->nrof += tmp->nrof;
1296 tmp->destroy (); 1285 tmp->destroy ();
1297 } 1286 }
… …
1466 * blocked() and wall() work properly), and these flags are updated by 1455 * blocked() and wall() work properly), and these flags are updated by
1467 * update_object(). 1456 * update_object().
1468 */ 1457 */
1469 1458
1470 /* if this is not the head or flag has been passed, don't check walk on status */ 1459 /* 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) 1460 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1472 { 1461 {
1473 if (check_move_on (op, originator)) 1462 if (check_move_on (op, originator))
1474 return 0; 1463 return 0;
1475 1464
1476 /* If we are a multi part object, lets work our way through the check 1465 /* If we are a multi part object, lets work our way through the check
1477 * walk on's. 1466 * walk on's.
1478 */ 1467 */
1479 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1468 for (object *tmp = op->more; tmp; tmp = tmp->more)
1480 if (check_move_on (tmp, originator)) 1469 if (check_move_on (tmp, originator))
1481 return 0; 1470 return 0;
1482 } 1471 }
1483 1472
1484 return op; 1473 return op;
… …
1494 object *tmp, *tmp1; 1483 object *tmp, *tmp1;
1495 1484
1496 /* first search for itself and remove any old instances */ 1485 /* first search for itself and remove any old instances */
1497 1486
1498 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1487 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1499 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1488 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1500 tmp->destroy (); 1489 tmp->destroy ();
1501 1490
1502 tmp1 = arch_to_object (archetype::find (arch_string)); 1491 tmp1 = arch_to_object (archetype::find (arch_string));
1503 1492
1504 tmp1->x = op->x; 1493 tmp1->x = op->x;
… …
1665 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1654 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1666 free (dump); 1655 free (dump);
1667 return op; 1656 return op;
1668 } 1657 }
1669 1658
1670 if (where->head) 1659 if (where->head_ () != where)
1671 { 1660 {
1672 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1661 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1673 where = where->head; 1662 where = where->head;
1674 } 1663 }
1675 1664
1676 return where->insert (op); 1665 return where->insert (op);
1677} 1666}
… …
2132 object *tmp; 2121 object *tmp;
2133 maptile *mp; 2122 maptile *mp;
2134 2123
2135 MoveType blocked, move_type; 2124 MoveType blocked, move_type;
2136 2125
2137 if (exclude && exclude->head) 2126 if (exclude && exclude->head_ () != exclude)
2138 { 2127 {
2139 exclude = exclude->head; 2128 exclude = exclude->head;
2140 move_type = exclude->move_type; 2129 move_type = exclude->move_type;
2141 } 2130 }
2142 else 2131 else
… …
2165 max = maxfree[i]; 2154 max = maxfree[i];
2166 else if (mflags & P_IS_ALIVE) 2155 else if (mflags & P_IS_ALIVE)
2167 { 2156 {
2168 for (tmp = ms.bot; tmp; tmp = tmp->above) 2157 for (tmp = ms.bot; tmp; tmp = tmp->above)
2169 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2158 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2170 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2159 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171 break; 2160 break;
2172 2161
2173 if (tmp) 2162 if (tmp)
2174 return freedir[i]; 2163 return freedir[i];
2175 } 2164 }
… …
2370 * create clone from object to another 2359 * create clone from object to another
2371 */ 2360 */
2372object * 2361object *
2373object_create_clone (object *asrc) 2362object_create_clone (object *asrc)
2374{ 2363{
2375 object *dst = 0, *tmp, *src, *part, *prev, *item; 2364 object *dst = 0, *tmp, *src, *prev, *item;
2376 2365
2377 if (!asrc) 2366 if (!asrc)
2378 return 0; 2367 return 0;
2379 2368
2380 src = asrc;
2381 if (src->head)
2382 src = src->head; 2369 src = asrc->head_ ();
2383 2370
2384 prev = 0; 2371 prev = 0;
2385 for (part = src; part; part = part->more) 2372 for (object *part = src; part; part = part->more)
2386 { 2373 {
2387 tmp = part->clone (); 2374 tmp = part->clone ();
2388 tmp->x -= src->x; 2375 tmp->x -= src->x;
2389 tmp->y -= src->y; 2376 tmp->y -= src->y;
2390 2377
… …
2503 /* Basically, if the archetype has this key set, 2490 /* Basically, if the archetype has this key set,
2504 * we need to store the null value so when we save 2491 * we need to store the null value so when we save
2505 * it, we save the empty value so that when we load, 2492 * it, we save the empty value so that when we load,
2506 * we get this value back again. 2493 * we get this value back again.
2507 */ 2494 */
2508 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2495 if (get_ob_key_link (op->arch, canonical_key))
2509 field->value = 0; 2496 field->value = 0;
2510 else 2497 else
2511 { 2498 {
2512 if (last) 2499 if (last)
2513 last->next = field->next; 2500 last->next = field->next;

Diff Legend

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