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.168 by root, Thu Jul 26 00:27:07 2007 UTC vs.
Revision 1.189 by root, Thu Sep 13 16:23:01 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 ();
… …
959 if (destroyed ()) 952 if (destroyed ())
960 return; 953 return;
961 954
962 if (destroy_inventory) 955 if (destroy_inventory)
963 destroy_inv (false); 956 destroy_inv (false);
957
958 if (is_head ())
959 if (sound_destroy)
960 play_sound (sound_destroy);
961 else if (flag [FLAG_MONSTER])
962 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964 963
965 attachable::destroy (); 964 attachable::destroy ();
966} 965}
967 966
968/* 967/*
… …
1083 if (map->in_memory == MAP_SAVING) 1082 if (map->in_memory == MAP_SAVING)
1084 return; 1083 return;
1085 1084
1086 int check_walk_off = !flag [FLAG_NO_APPLY]; 1085 int check_walk_off = !flag [FLAG_NO_APPLY];
1087 1086
1087 if (object *pl = ms.player ())
1088 {
1089 if (pl->container == this)
1090 /* If a container that the player is currently using somehow gets
1091 * removed (most likely destroyed), update the player view
1092 * appropriately.
1093 */
1094 pl->close_container ();
1095
1096 pl->contr->ns->floorbox_update ();
1097 }
1098
1088 for (tmp = ms.bot; tmp; tmp = tmp->above) 1099 for (tmp = ms.bot; tmp; tmp = tmp->above)
1089 { 1100 {
1090 /* No point updating the players look faces if he is the object 1101 /* No point updating the players look faces if he is the object
1091 * being removed. 1102 * being removed.
1092 */ 1103 */
1093
1094 if (tmp->type == PLAYER && tmp != this)
1095 {
1096 /* If a container that the player is currently using somehow gets
1097 * removed (most likely destroyed), update the player view
1098 * appropriately.
1099 */
1100 if (tmp->container == this)
1101 {
1102 flag [FLAG_APPLIED] = 0;
1103 tmp->container = 0;
1104 }
1105
1106 if (tmp->contr->ns)
1107 tmp->contr->ns->floorbox_update ();
1108 }
1109 1104
1110 /* See if object moving off should effect something */ 1105 /* See if object moving off should effect something */
1111 if (check_walk_off 1106 if (check_walk_off
1112 && ((move_type & tmp->move_off) 1107 && ((move_type & tmp->move_off)
1113 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1108 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1236 1231
1237 object *top, *floor = NULL; 1232 object *top, *floor = NULL;
1238 1233
1239 op->remove (); 1234 op->remove ();
1240 1235
1241#if 0
1242 if (!m->active != !op->active)
1243 if (m->active)
1244 op->activate_recursive ();
1245 else
1246 op->deactivate_recursive ();
1247#endif
1248
1249 if (out_of_map (m, op->x, op->y))
1250 {
1251 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1252#ifdef MANY_CORES
1253 /* Better to catch this here, as otherwise the next use of this object
1254 * is likely to cause a crash. Better to find out where it is getting
1255 * improperly inserted.
1256 */
1257 abort ();
1258#endif
1259 return op;
1260 }
1261
1262 if (object *more = op->more)
1263 if (!insert_ob_in_map (more, m, originator, flag))
1264 return 0;
1265
1266 CLEAR_FLAG (op, FLAG_REMOVED);
1267
1268 /* Ideally, the caller figures this out. However, it complicates a lot 1236 /* Ideally, the caller figures this out. However, it complicates a lot
1269 * 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
1270 * need extra work 1238 * need extra work
1271 */ 1239 */
1272 if (!xy_normalise (m, op->x, op->y)) 1240 if (!xy_normalise (m, op->x, op->y))
1241 {
1242 op->destroy ();
1273 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);
1274 1251
1275 op->map = m; 1252 op->map = m;
1276 mapspace &ms = op->ms (); 1253 mapspace &ms = op->ms ();
1277 1254
1278 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
… …
1419 op->map->touch (); 1396 op->map->touch ();
1420 } 1397 }
1421 1398
1422 op->map->dirty = true; 1399 op->map->dirty = true;
1423 1400
1424 /* If we have a floor, we know the player, if any, will be above
1425 * it, so save a few ticks and start from there.
1426 */
1427 if (!(flag & INS_MAP_LOAD)) 1401 if (!(flag & INS_MAP_LOAD))
1428 if (object *pl = ms.player ()) 1402 if (object *pl = ms.player ())
1429 if (pl->contr->ns)
1430 pl->contr->ns->floorbox_update (); 1403 pl->contr->ns->floorbox_update ();
1431 1404
1432 /* If this object glows, it may affect lighting conditions that are 1405 /* If this object glows, it may affect lighting conditions that are
1433 * visible to others on this map. But update_all_los is really 1406 * visible to others on this map. But update_all_los is really
1434 * an inefficient way to do this, as it means los for all players 1407 * an inefficient way to do this, as it means los for all players
1435 * on the map will get recalculated. The players could very well 1408 * on the map will get recalculated. The players could very well
… …
1673 * be != op, if items are merged. -Tero 1646 * be != op, if items are merged. -Tero
1674 */ 1647 */
1675object * 1648object *
1676object::insert (object *op) 1649object::insert (object *op)
1677{ 1650{
1678 object *tmp, *otmp;
1679
1680 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1651 if (!QUERY_FLAG (op, FLAG_REMOVED))
1681 op->remove (); 1652 op->remove ();
1682 1653
1683 if (op->more) 1654 if (op->more)
1684 { 1655 {
… …
1686 return op; 1657 return op;
1687 } 1658 }
1688 1659
1689 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1660 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1690 CLEAR_FLAG (op, FLAG_REMOVED); 1661 CLEAR_FLAG (op, FLAG_REMOVED);
1662
1691 if (op->nrof) 1663 if (op->nrof)
1692 { 1664 {
1693 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1665 for (object *tmp = inv; tmp; tmp = tmp->below)
1694 if (object::can_merge (tmp, op)) 1666 if (object::can_merge (tmp, op))
1695 { 1667 {
1696 /* return the original object and remove inserted object 1668 /* return the original object and remove inserted object
1697 (client needs the original object) */ 1669 (client needs the original object) */
1698 tmp->nrof += op->nrof; 1670 tmp->nrof += op->nrof;
… …
1717 add_weight (this, op->weight * op->nrof); 1689 add_weight (this, op->weight * op->nrof);
1718 } 1690 }
1719 else 1691 else
1720 add_weight (this, (op->weight + op->carrying)); 1692 add_weight (this, (op->weight + op->carrying));
1721 1693
1722 otmp = this->in_player (); 1694 if (object *otmp = this->in_player ())
1723 if (otmp && otmp->contr)
1724 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1695 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1725 otmp->update_stats (); 1696 otmp->update_stats ();
1726 1697
1698 op->owner = 0; // its his/hers now. period.
1727 op->map = 0; 1699 op->map = 0;
1728 op->env = this; 1700 op->env = this;
1729 op->above = 0; 1701 op->above = 0;
1730 op->below = 0; 1702 op->below = 0;
1731 op->x = 0, op->y = 0; 1703 op->x = op->y = 0;
1732 1704
1733 /* reset the light list and los of the players on the map */ 1705 /* reset the light list and los of the players on the map */
1734 if ((op->glow_radius != 0) && map) 1706 if (op->glow_radius && map)
1735 { 1707 {
1736#ifdef DEBUG_LIGHTS 1708#ifdef DEBUG_LIGHTS
1737 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1709 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1738#endif /* DEBUG_LIGHTS */ 1710#endif /* DEBUG_LIGHTS */
1739 if (map->darkness) 1711 if (map->darkness)
… …
2024 int index = 0, flag; 1996 int index = 0, flag;
2025 int altern[SIZEOFFREE]; 1997 int altern[SIZEOFFREE];
2026 1998
2027 for (int i = start; i < stop; i++) 1999 for (int i = start; i < stop; i++)
2028 { 2000 {
2029 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2001 mapxy pos (m, x, y); pos.move (i);
2030 if (!flag) 2002
2031 altern [index++] = i; 2003 if (!pos.normalise ())
2004 continue;
2005
2006 mapspace &ms = *pos;
2007
2008 if (ms.flags () & P_IS_ALIVE)
2009 continue;
2010
2011 /* However, often
2012 * ob doesn't have any move type (when used to place exits)
2013 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2014 */
2015 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2016 continue;
2032 2017
2033 /* 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.
2034 * 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.
2035 * 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 -
2036 * 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
2037 * 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
2038 * to only the spaces immediately surrounding the target area, and 2023 * to only the spaces immediately surrounding the target area, and
2039 * won't look 2 spaces south of the target space. 2024 * won't look 2 spaces south of the target space.
2040 */ 2025 */
2041 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2026 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2027 {
2042 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;
2043 } 2039 }
2044 2040
2045 if (!index) 2041 if (!index)
2046 return -1; 2042 return -1;
2047 2043
… …
2056 */ 2052 */
2057int 2053int
2058find_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)
2059{ 2055{
2060 for (int i = 0; i < SIZEOFFREE; i++) 2056 for (int i = 0; i < SIZEOFFREE; i++)
2061 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]))
2062 return i; 2058 return i;
2063 2059
2064 return -1; 2060 return -1;
2065} 2061}
2066 2062
… …
2343 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2339 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2344 * core dumps if they do. 2340 * core dumps if they do.
2345 * 2341 *
2346 * Add a check so we can't pick up invisible objects (0.93.8) 2342 * Add a check so we can't pick up invisible objects (0.93.8)
2347 */ 2343 */
2348
2349int 2344int
2350can_pick (const object *who, const object *item) 2345can_pick (const object *who, const object *item)
2351{ 2346{
2352 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2347 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2353 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2348 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2611 &name, 2606 &name,
2612 title ? "\",title:\"" : "", 2607 title ? "\",title:\"" : "",
2613 title ? (const char *)title : "", 2608 title ? (const char *)title : "",
2614 flag_desc (flagdesc, 512), type); 2609 flag_desc (flagdesc, 512), type);
2615 2610
2616 if (env) 2611 if (!this->flag[FLAG_REMOVED] && env)
2617 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2612 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2618 2613
2619 if (map) 2614 if (map)
2620 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);
2621 2616
… …
2668 old_container->flag [FLAG_APPLIED] = 0; 2663 old_container->flag [FLAG_APPLIED] = 0;
2669 container = 0; 2664 container = 0;
2670 2665
2671 esrv_update_item (UPD_FLAGS, this, old_container); 2666 esrv_update_item (UPD_FLAGS, this, old_container);
2672 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2667 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2668 play_sound (sound_find ("chest_close"));
2673 } 2669 }
2674 2670
2675 if (new_container) 2671 if (new_container)
2676 { 2672 {
2677 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2673 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2693 new_container->flag [FLAG_APPLIED] = 1; 2689 new_container->flag [FLAG_APPLIED] = 1;
2694 container = new_container; 2690 container = new_container;
2695 2691
2696 esrv_update_item (UPD_FLAGS, this, new_container); 2692 esrv_update_item (UPD_FLAGS, this, new_container);
2697 esrv_send_inventory (this, new_container); 2693 esrv_send_inventory (this, new_container);
2694 play_sound (sound_find ("chest_open"));
2698 } 2695 }
2699} 2696}
2700 2697
2701object * 2698object *
2702object::force_find (const shstr name) 2699object::force_find (const shstr name)
… …
2731} 2728}
2732 2729
2733void 2730void
2734object::play_sound (faceidx sound) const 2731object::play_sound (faceidx sound) const
2735{ 2732{
2736 if (map) 2733 if (!sound)
2734 return;
2735
2736 if (flag [FLAG_REMOVED])
2737 return;
2738
2739 if (env)
2740 {
2741 if (object *pl = in_player ())
2742 pl->contr->play_sound (sound);
2743 }
2744 else
2737 map->play_sound (sound, x, y); 2745 map->play_sound (sound, x, y);
2738} 2746}
2747

Diff Legend

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