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.163 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC

… …
299 return 0; 299 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 301 return 0;
302 } 302 }
303 303
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
306 { 305 {
307 ob1->optimise (); 306 ob1->optimise ();
308 ob2->optimise (); 307 ob2->optimise ();
309 308
310 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 {
311 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
313
314 if (k1 != k2)
311 return 0; 315 return 0;
316 else if (k1 == 0)
317 return 1;
318 else if (!cfperl_can_merge (ob1, ob2))
319 return 0;
320 }
312 } 321 }
313 322
314 /* Everything passes, must be OK. */ 323 /* Everything passes, must be OK. */
315 return 1; 324 return 1;
316} 325}
… …
374/* 383/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 384 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 385 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 386 * If it's not a multi-object, it is returned.
378 */ 387 */
379
380object * 388object *
381get_nearest_part (object *op, const object *pl) 389get_nearest_part (object *op, const object *pl)
382{ 390{
383 object *tmp, *closest; 391 object *tmp, *closest;
384 int last_dist, i; 392 int last_dist, i;
… …
429} 437}
430 438
431/* 439/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 440 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 441 * skill and experience objects.
442 * ACTUALLY NO! investigate! TODO
434 */ 443 */
435void 444void
436object::set_owner (object *owner) 445object::set_owner (object *owner)
437{ 446{
447 // allow objects which own objects
438 if (!owner) 448 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) 449 while (owner->owner)
449 owner = owner->owner; 450 owner = owner->owner;
450 451
451 this->owner = owner; 452 this->owner = owner;
452} 453}
453 454
454int 455int
… …
586object::copy_to (object *dst) 587object::copy_to (object *dst)
587{ 588{
588 *dst = *this; 589 *dst = *this;
589 590
590 if (speed < 0) 591 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 592 dst->speed_left -= rndm ();
592 593
593 dst->set_speed (dst->speed); 594 dst->set_speed (dst->speed);
594} 595}
595 596
596void 597void
… …
923 924
924 if (!freed_map) 925 if (!freed_map)
925 { 926 {
926 freed_map = new maptile; 927 freed_map = new maptile;
927 928
929 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 930 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 931 freed_map->width = 3;
930 freed_map->height = 3; 932 freed_map->height = 3;
931 933
932 freed_map->alloc (); 934 freed_map->alloc ();
… …
959 if (destroyed ()) 961 if (destroyed ())
960 return; 962 return;
961 963
962 if (destroy_inventory) 964 if (destroy_inventory)
963 destroy_inv (false); 965 destroy_inv (false);
966
967 if (is_head ())
968 if (sound_destroy)
969 play_sound (sound_destroy);
970 else if (flag [FLAG_MONSTER])
971 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964 972
965 attachable::destroy (); 973 attachable::destroy ();
966} 974}
967 975
968/* 976/*
… …
1083 if (map->in_memory == MAP_SAVING) 1091 if (map->in_memory == MAP_SAVING)
1084 return; 1092 return;
1085 1093
1086 int check_walk_off = !flag [FLAG_NO_APPLY]; 1094 int check_walk_off = !flag [FLAG_NO_APPLY];
1087 1095
1096 if (object *pl = ms.player ())
1097 {
1098 if (pl->container == this)
1099 /* If a container that the player is currently using somehow gets
1100 * removed (most likely destroyed), update the player view
1101 * appropriately.
1102 */
1103 pl->close_container ();
1104
1105 pl->contr->ns->floorbox_update ();
1106 }
1107
1088 for (tmp = ms.bot; tmp; tmp = tmp->above) 1108 for (tmp = ms.bot; tmp; tmp = tmp->above)
1089 { 1109 {
1090 /* No point updating the players look faces if he is the object 1110 /* No point updating the players look faces if he is the object
1091 * being removed. 1111 * being removed.
1092 */ 1112 */
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 1113
1110 /* See if object moving off should effect something */ 1114 /* See if object moving off should effect something */
1111 if (check_walk_off 1115 if (check_walk_off
1112 && ((move_type & tmp->move_off) 1116 && ((move_type & tmp->move_off)
1113 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1117 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1236 1240
1237 object *top, *floor = NULL; 1241 object *top, *floor = NULL;
1238 1242
1239 op->remove (); 1243 op->remove ();
1240 1244
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 1245 /* 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 1246 * of areas of callers (eg, anything that uses find_free_spot would now
1270 * need extra work 1247 * need extra work
1271 */ 1248 */
1272 if (!xy_normalise (m, op->x, op->y)) 1249 if (!xy_normalise (m, op->x, op->y))
1250 {
1251 op->destroy ();
1273 return 0; 1252 return 0;
1253 }
1254
1255 if (object *more = op->more)
1256 if (!insert_ob_in_map (more, m, originator, flag))
1257 return 0;
1258
1259 CLEAR_FLAG (op, FLAG_REMOVED);
1274 1260
1275 op->map = m; 1261 op->map = m;
1276 mapspace &ms = op->ms (); 1262 mapspace &ms = op->ms ();
1277 1263
1278 /* this has to be done after we translate the coordinates. 1264 /* this has to be done after we translate the coordinates.
… …
1313 else 1299 else
1314 { 1300 {
1315 top = ms.bot; 1301 top = ms.bot;
1316 1302
1317 /* If there are other objects, then */ 1303 /* If there are other objects, then */
1318 if ((!(flag & INS_MAP_LOAD)) && top) 1304 if (top)
1319 { 1305 {
1320 object *last = 0; 1306 object *last = 0;
1321 1307
1322 /* 1308 /*
1323 * If there are multiple objects on this space, we do some trickier handling. 1309 * If there are multiple objects on this space, we do some trickier handling.
… …
1376 if (last && last->below && last != floor) 1362 if (last && last->below && last != floor)
1377 top = last->below; 1363 top = last->below;
1378 } 1364 }
1379 } /* If objects on this space */ 1365 } /* If objects on this space */
1380 1366
1381 if (flag & INS_MAP_LOAD)
1382 top = ms.top;
1383
1384 if (flag & INS_ABOVE_FLOOR_ONLY) 1367 if (flag & INS_ABOVE_FLOOR_ONLY)
1385 top = floor; 1368 top = floor;
1386 1369
1387 /* Top is the object that our object (op) is going to get inserted above. 1370 /* Top is the object that our object (op) is going to get inserted above.
1388 */ 1371 */
… …
1420 op->map->touch (); 1403 op->map->touch ();
1421 } 1404 }
1422 1405
1423 op->map->dirty = true; 1406 op->map->dirty = true;
1424 1407
1425 /* If we have a floor, we know the player, if any, will be above
1426 * it, so save a few ticks and start from there.
1427 */
1428 if (!(flag & INS_MAP_LOAD))
1429 if (object *pl = ms.player ()) 1408 if (object *pl = ms.player ())
1430 if (pl->contr->ns)
1431 pl->contr->ns->floorbox_update (); 1409 pl->contr->ns->floorbox_update ();
1432 1410
1433 /* If this object glows, it may affect lighting conditions that are 1411 /* If this object glows, it may affect lighting conditions that are
1434 * visible to others on this map. But update_all_los is really 1412 * visible to others on this map. But update_all_los is really
1435 * an inefficient way to do this, as it means los for all players 1413 * an inefficient way to do this, as it means los for all players
1436 * on the map will get recalculated. The players could very well 1414 * on the map will get recalculated. The players could very well
… …
1674 * be != op, if items are merged. -Tero 1652 * be != op, if items are merged. -Tero
1675 */ 1653 */
1676object * 1654object *
1677object::insert (object *op) 1655object::insert (object *op)
1678{ 1656{
1679 object *tmp, *otmp;
1680
1681 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1657 if (!QUERY_FLAG (op, FLAG_REMOVED))
1682 op->remove (); 1658 op->remove ();
1683 1659
1684 if (op->more) 1660 if (op->more)
1685 { 1661 {
… …
1687 return op; 1663 return op;
1688 } 1664 }
1689 1665
1690 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1666 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1691 CLEAR_FLAG (op, FLAG_REMOVED); 1667 CLEAR_FLAG (op, FLAG_REMOVED);
1668
1692 if (op->nrof) 1669 if (op->nrof)
1693 { 1670 {
1694 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1671 for (object *tmp = inv; tmp; tmp = tmp->below)
1695 if (object::can_merge (tmp, op)) 1672 if (object::can_merge (tmp, op))
1696 { 1673 {
1697 /* return the original object and remove inserted object 1674 /* return the original object and remove inserted object
1698 (client needs the original object) */ 1675 (client needs the original object) */
1699 tmp->nrof += op->nrof; 1676 tmp->nrof += op->nrof;
… …
1718 add_weight (this, op->weight * op->nrof); 1695 add_weight (this, op->weight * op->nrof);
1719 } 1696 }
1720 else 1697 else
1721 add_weight (this, (op->weight + op->carrying)); 1698 add_weight (this, (op->weight + op->carrying));
1722 1699
1723 otmp = this->in_player (); 1700 if (object *otmp = this->in_player ())
1724 if (otmp && otmp->contr)
1725 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1701 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1726 otmp->update_stats (); 1702 otmp->update_stats ();
1727 1703
1704 op->owner = 0; // its his/hers now. period.
1728 op->map = 0; 1705 op->map = 0;
1729 op->env = this; 1706 op->env = this;
1730 op->above = 0; 1707 op->above = 0;
1731 op->below = 0; 1708 op->below = 0;
1732 op->x = 0, op->y = 0; 1709 op->x = op->y = 0;
1733 1710
1734 /* reset the light list and los of the players on the map */ 1711 /* reset the light list and los of the players on the map */
1735 if ((op->glow_radius != 0) && map) 1712 if (op->glow_radius && map)
1736 { 1713 {
1737#ifdef DEBUG_LIGHTS 1714#ifdef DEBUG_LIGHTS
1738 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1715 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1739#endif /* DEBUG_LIGHTS */ 1716#endif /* DEBUG_LIGHTS */
1740 if (map->darkness) 1717 if (map->darkness)
… …
2020 * customized, changed states, etc. 1997 * customized, changed states, etc.
2021 */ 1998 */
2022int 1999int
2023find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2024{ 2001{
2002 int altern[SIZEOFFREE];
2025 int index = 0, flag; 2003 int index = 0, flag;
2026 int altern[SIZEOFFREE];
2027 2004
2028 for (int i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
2029 { 2006 {
2030 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 mapxy pos (m, x, y); pos.move (i);
2031 if (!flag) 2008
2009 if (!pos.normalise ())
2010 continue;
2011
2012 mapspace &ms = *pos;
2013
2014 if (ms.flags () & P_IS_ALIVE)
2015 continue;
2016
2017 /* However, often
2018 * ob doesn't have any move type (when used to place exits)
2019 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2020 */
2021 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022 {
2032 altern [index++] = i; 2023 altern [index++] = i;
2024 continue;
2025 }
2033 2026
2034 /* Basically, if we find a wall on a space, we cut down the search size. 2027 /* Basically, if we find a wall on a space, we cut down the search size.
2035 * In this way, we won't return spaces that are on another side of a wall. 2028 * In this way, we won't return spaces that are on another side of a wall.
2036 * This mostly work, but it cuts down the search size in all directions - 2029 * This mostly work, but it cuts down the search size in all directions -
2037 * if the space being examined only has a wall to the north and empty 2030 * if the space being examined only has a wall to the north and empty
2038 * spaces in all the other directions, this will reduce the search space 2031 * spaces in all the other directions, this will reduce the search space
2039 * to only the spaces immediately surrounding the target area, and 2032 * to only the spaces immediately surrounding the target area, and
2040 * won't look 2 spaces south of the target space. 2033 * won't look 2 spaces south of the target space.
2041 */ 2034 */
2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2035 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2036 {
2043 stop = maxfree[i]; 2037 stop = maxfree[i];
2038 continue;
2039 }
2040
2041 /* Note it is intentional that we check ob - the movement type of the
2042 * head of the object should correspond for the entire object.
2043 */
2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2045 continue;
2046
2047 altern [index++] = i;
2044 } 2048 }
2045 2049
2046 if (!index) 2050 if (!index)
2047 return -1; 2051 return -1;
2048 2052
… …
2057 */ 2061 */
2058int 2062int
2059find_first_free_spot (const object *ob, maptile *m, int x, int y) 2063find_first_free_spot (const object *ob, maptile *m, int x, int y)
2060{ 2064{
2061 for (int i = 0; i < SIZEOFFREE; i++) 2065 for (int i = 0; i < SIZEOFFREE; i++)
2062 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2066 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063 return i; 2067 return i;
2064 2068
2065 return -1; 2069 return -1;
2066} 2070}
2067 2071
… …
2344 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2348 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2345 * core dumps if they do. 2349 * core dumps if they do.
2346 * 2350 *
2347 * Add a check so we can't pick up invisible objects (0.93.8) 2351 * Add a check so we can't pick up invisible objects (0.93.8)
2348 */ 2352 */
2349
2350int 2353int
2351can_pick (const object *who, const object *item) 2354can_pick (const object *who, const object *item)
2352{ 2355{
2353 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2356 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2354 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2357 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2612 &name, 2615 &name,
2613 title ? "\",title:\"" : "", 2616 title ? "\",title:\"" : "",
2614 title ? (const char *)title : "", 2617 title ? (const char *)title : "",
2615 flag_desc (flagdesc, 512), type); 2618 flag_desc (flagdesc, 512), type);
2616 2619
2617 if (env) 2620 if (!this->flag[FLAG_REMOVED] && env)
2618 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619 2622
2620 if (map) 2623 if (map)
2621 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2622 2625
… …
2640} 2643}
2641 2644
2642const materialtype_t * 2645const materialtype_t *
2643object::dominant_material () const 2646object::dominant_material () const
2644{ 2647{
2645 if (materialtype_t *mat = name_to_material (materialname)) 2648 if (materialtype_t *mt = name_to_material (materialname))
2646 return mat; 2649 return mt;
2647 2650
2648 // omfg this is slow, this has to be temporary :)
2649 shstr unknown ("unknown");
2650
2651 return name_to_material (unknown); 2651 return name_to_material (shstr_unknown);
2652} 2652}
2653 2653
2654void 2654void
2655object::open_container (object *new_container) 2655object::open_container (object *new_container)
2656{ 2656{
… …
2672 old_container->flag [FLAG_APPLIED] = 0; 2672 old_container->flag [FLAG_APPLIED] = 0;
2673 container = 0; 2673 container = 0;
2674 2674
2675 esrv_update_item (UPD_FLAGS, this, old_container); 2675 esrv_update_item (UPD_FLAGS, this, old_container);
2676 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2676 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2677 play_sound (sound_find ("chest_close"));
2677 } 2678 }
2678 2679
2679 if (new_container) 2680 if (new_container)
2680 { 2681 {
2681 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2682 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2697 new_container->flag [FLAG_APPLIED] = 1; 2698 new_container->flag [FLAG_APPLIED] = 1;
2698 container = new_container; 2699 container = new_container;
2699 2700
2700 esrv_update_item (UPD_FLAGS, this, new_container); 2701 esrv_update_item (UPD_FLAGS, this, new_container);
2701 esrv_send_inventory (this, new_container); 2702 esrv_send_inventory (this, new_container);
2703 play_sound (sound_find ("chest_open"));
2704 }
2705}
2706
2707object *
2708object::force_find (const shstr name)
2709{
2710 /* cycle through his inventory to look for the MARK we want to
2711 * place
2712 */
2713 for (object *tmp = inv; tmp; tmp = tmp->below)
2714 if (tmp->type == FORCE && tmp->slaying == name)
2715 return splay (tmp);
2716
2717 return 0;
2718}
2719
2720void
2721object::force_add (const shstr name, int duration)
2722{
2723 if (object *force = force_find (name))
2724 force->destroy ();
2725
2726 object *force = get_archetype (FORCE_NAME);
2727
2728 force->slaying = name;
2729 force->stats.food = 1;
2730 force->speed_left = -1.f;
2731
2732 force->set_speed (duration ? 1.f / duration : 0.f);
2733 force->flag [FLAG_IS_USED_UP] = true;
2734 force->flag [FLAG_APPLIED] = true;
2735
2736 insert (force);
2737}
2738
2739void
2740object::play_sound (faceidx sound) const
2741{
2742 if (!sound)
2743 return;
2744
2745 if (flag [FLAG_REMOVED])
2746 return;
2747
2748 if (env)
2702 } 2749 {
2750 if (object *pl = in_player ())
2751 pl->contr->play_sound (sound);
2752 }
2753 else
2754 map->play_sound (sound, x, y);
2703} 2755}
2704 2756
2705

Diff Legend

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