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

Diff Legend

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