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.179 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.191 by root, Sun Sep 30 20:22:15 2007 UTC

… …
374/* 374/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 377 * If it's not a multi-object, it is returned.
378 */ 378 */
379
380object * 379object *
381get_nearest_part (object *op, const object *pl) 380get_nearest_part (object *op, const object *pl)
382{ 381{
383 object *tmp, *closest; 382 object *tmp, *closest;
384 int last_dist, i; 383 int last_dist, i;
… …
429} 428}
430 429
431/* 430/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 431 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 432 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO
434 */ 434 */
435void 435void
436object::set_owner (object *owner) 436object::set_owner (object *owner)
437{ 437{
438 // allow objects which own objects
438 if (!owner) 439 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 440 while (owner->owner)
449 owner = owner->owner; 441 owner = owner->owner;
450 442
451 this->owner = owner; 443 this->owner = owner;
452} 444}
453 445
454int 446int
… …
586object::copy_to (object *dst) 578object::copy_to (object *dst)
587{ 579{
588 *dst = *this; 580 *dst = *this;
589 581
590 if (speed < 0) 582 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 583 dst->speed_left -= rndm ();
592 584
593 dst->set_speed (dst->speed); 585 dst->set_speed (dst->speed);
594} 586}
595 587
596void 588void
… …
923 915
924 if (!freed_map) 916 if (!freed_map)
925 { 917 {
926 freed_map = new maptile; 918 freed_map = new maptile;
927 919
920 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 921 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 922 freed_map->width = 3;
930 freed_map->height = 3; 923 freed_map->height = 3;
931 924
932 freed_map->alloc (); 925 freed_map->alloc ();
… …
1238 1231
1239 object *top, *floor = NULL; 1232 object *top, *floor = NULL;
1240 1233
1241 op->remove (); 1234 op->remove ();
1242 1235
1243 if (out_of_map (m, op->x, op->y))
1244 {
1245 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1246#ifdef MANY_CORES
1247 /* Better to catch this here, as otherwise the next use of this object
1248 * is likely to cause a crash. Better to find out where it is getting
1249 * improperly inserted.
1250 */
1251 abort ();
1252#endif
1253 return op;
1254 }
1255
1256 if (object *more = op->more)
1257 if (!insert_ob_in_map (more, m, originator, flag))
1258 return 0;
1259
1260 CLEAR_FLAG (op, FLAG_REMOVED);
1261
1262 /* Ideally, the caller figures this out. However, it complicates a lot 1236 /* Ideally, the caller figures this out. However, it complicates a lot
1263 * of areas of callers (eg, anything that uses find_free_spot would now 1237 * of areas of callers (eg, anything that uses find_free_spot would now
1264 * need extra work 1238 * need extra work
1265 */ 1239 */
1266 if (!xy_normalise (m, op->x, op->y)) 1240 if (!xy_normalise (m, op->x, op->y))
1241 {
1242 op->destroy ();
1267 return 0; 1243 return 0;
1244 }
1245
1246 if (object *more = op->more)
1247 if (!insert_ob_in_map (more, m, originator, flag))
1248 return 0;
1249
1250 CLEAR_FLAG (op, FLAG_REMOVED);
1268 1251
1269 op->map = m; 1252 op->map = m;
1270 mapspace &ms = op->ms (); 1253 mapspace &ms = op->ms ();
1271 1254
1272 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
… …
1307 else 1290 else
1308 { 1291 {
1309 top = ms.bot; 1292 top = ms.bot;
1310 1293
1311 /* If there are other objects, then */ 1294 /* If there are other objects, then */
1312 if ((!(flag & INS_MAP_LOAD)) && top) 1295 if (top)
1313 { 1296 {
1314 object *last = 0; 1297 object *last = 0;
1315 1298
1316 /* 1299 /*
1317 * If there are multiple objects on this space, we do some trickier handling. 1300 * If there are multiple objects on this space, we do some trickier handling.
… …
1369 */ 1352 */
1370 if (last && last->below && last != floor) 1353 if (last && last->below && last != floor)
1371 top = last->below; 1354 top = last->below;
1372 } 1355 }
1373 } /* If objects on this space */ 1356 } /* If objects on this space */
1374 if (flag & INS_MAP_LOAD)
1375 top = ms.top;
1376 1357
1377 if (flag & INS_ABOVE_FLOOR_ONLY) 1358 if (flag & INS_ABOVE_FLOOR_ONLY)
1378 top = floor; 1359 top = floor;
1379 1360
1380 /* Top is the object that our object (op) is going to get inserted above. 1361 /* Top is the object that our object (op) is going to get inserted above.
… …
1413 op->map->touch (); 1394 op->map->touch ();
1414 } 1395 }
1415 1396
1416 op->map->dirty = true; 1397 op->map->dirty = true;
1417 1398
1418 /* If we have a floor, we know the player, if any, will be above
1419 * it, so save a few ticks and start from there.
1420 */
1421 if (!(flag & INS_MAP_LOAD))
1422 if (object *pl = ms.player ()) 1399 if (object *pl = ms.player ())
1423 pl->contr->ns->floorbox_update (); 1400 pl->contr->ns->floorbox_update ();
1424 1401
1425 /* If this object glows, it may affect lighting conditions that are 1402 /* If this object glows, it may affect lighting conditions that are
1426 * visible to others on this map. But update_all_los is really 1403 * visible to others on this map. But update_all_los is really
1427 * an inefficient way to do this, as it means los for all players 1404 * an inefficient way to do this, as it means los for all players
1428 * on the map will get recalculated. The players could very well 1405 * on the map will get recalculated. The players could very well
… …
1666 * be != op, if items are merged. -Tero 1643 * be != op, if items are merged. -Tero
1667 */ 1644 */
1668object * 1645object *
1669object::insert (object *op) 1646object::insert (object *op)
1670{ 1647{
1671 object *tmp, *otmp;
1672
1673 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1648 if (!QUERY_FLAG (op, FLAG_REMOVED))
1674 op->remove (); 1649 op->remove ();
1675 1650
1676 if (op->more) 1651 if (op->more)
1677 { 1652 {
… …
1679 return op; 1654 return op;
1680 } 1655 }
1681 1656
1682 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1657 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1683 CLEAR_FLAG (op, FLAG_REMOVED); 1658 CLEAR_FLAG (op, FLAG_REMOVED);
1659
1684 if (op->nrof) 1660 if (op->nrof)
1685 { 1661 {
1686 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1662 for (object *tmp = inv; tmp; tmp = tmp->below)
1687 if (object::can_merge (tmp, op)) 1663 if (object::can_merge (tmp, op))
1688 { 1664 {
1689 /* return the original object and remove inserted object 1665 /* return the original object and remove inserted object
1690 (client needs the original object) */ 1666 (client needs the original object) */
1691 tmp->nrof += op->nrof; 1667 tmp->nrof += op->nrof;
… …
1710 add_weight (this, op->weight * op->nrof); 1686 add_weight (this, op->weight * op->nrof);
1711 } 1687 }
1712 else 1688 else
1713 add_weight (this, (op->weight + op->carrying)); 1689 add_weight (this, (op->weight + op->carrying));
1714 1690
1715 otmp = this->in_player (); 1691 if (object *otmp = this->in_player ())
1716 if (otmp && otmp->contr)
1717 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1692 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1718 otmp->update_stats (); 1693 otmp->update_stats ();
1719 1694
1695 op->owner = 0; // its his/hers now. period.
1720 op->map = 0; 1696 op->map = 0;
1721 op->env = this; 1697 op->env = this;
1722 op->above = 0; 1698 op->above = 0;
1723 op->below = 0; 1699 op->below = 0;
1724 op->x = 0, op->y = 0; 1700 op->x = op->y = 0;
1725 1701
1726 /* reset the light list and los of the players on the map */ 1702 /* reset the light list and los of the players on the map */
1727 if ((op->glow_radius != 0) && map) 1703 if (op->glow_radius && map)
1728 { 1704 {
1729#ifdef DEBUG_LIGHTS 1705#ifdef DEBUG_LIGHTS
1730 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1706 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1731#endif /* DEBUG_LIGHTS */ 1707#endif /* DEBUG_LIGHTS */
1732 if (map->darkness) 1708 if (map->darkness)
… …
2012 * customized, changed states, etc. 1988 * customized, changed states, etc.
2013 */ 1989 */
2014int 1990int
2015find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1991find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2016{ 1992{
1993 int altern[SIZEOFFREE];
2017 int index = 0, flag; 1994 int index = 0, flag;
2018 int altern[SIZEOFFREE];
2019 1995
2020 for (int i = start; i < stop; i++) 1996 for (int i = start; i < stop; i++)
2021 { 1997 {
2022 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1998 mapxy pos (m, x, y); pos.move (i);
2023 if (!flag) 1999
2000 if (!pos.normalise ())
2001 continue;
2002
2003 mapspace &ms = *pos;
2004
2005 if (ms.flags () & P_IS_ALIVE)
2006 continue;
2007
2008 /* However, often
2009 * ob doesn't have any move type (when used to place exits)
2010 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2011 */
2012 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2013 {
2024 altern [index++] = i; 2014 altern [index++] = i;
2015 continue;
2016 }
2025 2017
2026 /* Basically, if we find a wall on a space, we cut down the search size. 2018 /* Basically, if we find a wall on a space, we cut down the search size.
2027 * In this way, we won't return spaces that are on another side of a wall. 2019 * In this way, we won't return spaces that are on another side of a wall.
2028 * This mostly work, but it cuts down the search size in all directions - 2020 * This mostly work, but it cuts down the search size in all directions -
2029 * if the space being examined only has a wall to the north and empty 2021 * if the space being examined only has a wall to the north and empty
2030 * spaces in all the other directions, this will reduce the search space 2022 * spaces in all the other directions, this will reduce the search space
2031 * to only the spaces immediately surrounding the target area, and 2023 * to only the spaces immediately surrounding the target area, and
2032 * won't look 2 spaces south of the target space. 2024 * won't look 2 spaces south of the target space.
2033 */ 2025 */
2034 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2026 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2027 {
2035 stop = maxfree[i]; 2028 stop = maxfree[i];
2029 continue;
2030 }
2031
2032 /* Note it is intentional that we check ob - the movement type of the
2033 * head of the object should correspond for the entire object.
2034 */
2035 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2036 continue;
2037
2038 altern [index++] = i;
2036 } 2039 }
2037 2040
2038 if (!index) 2041 if (!index)
2039 return -1; 2042 return -1;
2040 2043
… …
2049 */ 2052 */
2050int 2053int
2051find_first_free_spot (const object *ob, maptile *m, int x, int y) 2054find_first_free_spot (const object *ob, maptile *m, int x, int y)
2052{ 2055{
2053 for (int i = 0; i < SIZEOFFREE; i++) 2056 for (int i = 0; i < SIZEOFFREE; i++)
2054 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2057 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2055 return i; 2058 return i;
2056 2059
2057 return -1; 2060 return -1;
2058} 2061}
2059 2062
… …
2603 &name, 2606 &name,
2604 title ? "\",title:\"" : "", 2607 title ? "\",title:\"" : "",
2605 title ? (const char *)title : "", 2608 title ? (const char *)title : "",
2606 flag_desc (flagdesc, 512), type); 2609 flag_desc (flagdesc, 512), type);
2607 2610
2608 if (env) 2611 if (!this->flag[FLAG_REMOVED] && env)
2609 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2612 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2610 2613
2611 if (map) 2614 if (map)
2612 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2615 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2613 2616

Diff Legend

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