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.164 by root, Thu Jul 5 08:10:29 2007 UTC vs.
Revision 1.191 by root, Sun Sep 30 20:22:15 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 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 311 return 0;
312 } 312 }
313 313
314 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
315 return 1; 315 return 1;
316} 316}
… …
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.
… …
1313 else 1290 else
1314 { 1291 {
1315 top = ms.bot; 1292 top = ms.bot;
1316 1293
1317 /* If there are other objects, then */ 1294 /* If there are other objects, then */
1318 if ((!(flag & INS_MAP_LOAD)) && top) 1295 if (top)
1319 { 1296 {
1320 object *last = 0; 1297 object *last = 0;
1321 1298
1322 /* 1299 /*
1323 * 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.
… …
1376 if (last && last->below && last != floor) 1353 if (last && last->below && last != floor)
1377 top = last->below; 1354 top = last->below;
1378 } 1355 }
1379 } /* If objects on this space */ 1356 } /* If objects on this space */
1380 1357
1381 if (flag & INS_MAP_LOAD)
1382 top = ms.top;
1383
1384 if (flag & INS_ABOVE_FLOOR_ONLY) 1358 if (flag & INS_ABOVE_FLOOR_ONLY)
1385 top = floor; 1359 top = floor;
1386 1360
1387 /* 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.
1388 */ 1362 */
… …
1420 op->map->touch (); 1394 op->map->touch ();
1421 } 1395 }
1422 1396
1423 op->map->dirty = true; 1397 op->map->dirty = true;
1424 1398
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 ()) 1399 if (object *pl = ms.player ())
1430 if (pl->contr->ns)
1431 pl->contr->ns->floorbox_update (); 1400 pl->contr->ns->floorbox_update ();
1432 1401
1433 /* If this object glows, it may affect lighting conditions that are 1402 /* If this object glows, it may affect lighting conditions that are
1434 * 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
1435 * 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
1436 * on the map will get recalculated. The players could very well 1405 * on the map will get recalculated. The players could very well
… …
1674 * be != op, if items are merged. -Tero 1643 * be != op, if items are merged. -Tero
1675 */ 1644 */
1676object * 1645object *
1677object::insert (object *op) 1646object::insert (object *op)
1678{ 1647{
1679 object *tmp, *otmp;
1680
1681 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1648 if (!QUERY_FLAG (op, FLAG_REMOVED))
1682 op->remove (); 1649 op->remove ();
1683 1650
1684 if (op->more) 1651 if (op->more)
1685 { 1652 {
… …
1687 return op; 1654 return op;
1688 } 1655 }
1689 1656
1690 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1657 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1691 CLEAR_FLAG (op, FLAG_REMOVED); 1658 CLEAR_FLAG (op, FLAG_REMOVED);
1659
1692 if (op->nrof) 1660 if (op->nrof)
1693 { 1661 {
1694 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1662 for (object *tmp = inv; tmp; tmp = tmp->below)
1695 if (object::can_merge (tmp, op)) 1663 if (object::can_merge (tmp, op))
1696 { 1664 {
1697 /* return the original object and remove inserted object 1665 /* return the original object and remove inserted object
1698 (client needs the original object) */ 1666 (client needs the original object) */
1699 tmp->nrof += op->nrof; 1667 tmp->nrof += op->nrof;
… …
1718 add_weight (this, op->weight * op->nrof); 1686 add_weight (this, op->weight * op->nrof);
1719 } 1687 }
1720 else 1688 else
1721 add_weight (this, (op->weight + op->carrying)); 1689 add_weight (this, (op->weight + op->carrying));
1722 1690
1723 otmp = this->in_player (); 1691 if (object *otmp = this->in_player ())
1724 if (otmp && otmp->contr)
1725 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1692 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1726 otmp->update_stats (); 1693 otmp->update_stats ();
1727 1694
1695 op->owner = 0; // its his/hers now. period.
1728 op->map = 0; 1696 op->map = 0;
1729 op->env = this; 1697 op->env = this;
1730 op->above = 0; 1698 op->above = 0;
1731 op->below = 0; 1699 op->below = 0;
1732 op->x = 0, op->y = 0; 1700 op->x = op->y = 0;
1733 1701
1734 /* 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 */
1735 if ((op->glow_radius != 0) && map) 1703 if (op->glow_radius && map)
1736 { 1704 {
1737#ifdef DEBUG_LIGHTS 1705#ifdef DEBUG_LIGHTS
1738 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);
1739#endif /* DEBUG_LIGHTS */ 1707#endif /* DEBUG_LIGHTS */
1740 if (map->darkness) 1708 if (map->darkness)
… …
2020 * customized, changed states, etc. 1988 * customized, changed states, etc.
2021 */ 1989 */
2022int 1990int
2023find_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)
2024{ 1992{
1993 int altern[SIZEOFFREE];
2025 int index = 0, flag; 1994 int index = 0, flag;
2026 int altern[SIZEOFFREE];
2027 1995
2028 for (int i = start; i < stop; i++) 1996 for (int i = start; i < stop; i++)
2029 { 1997 {
2030 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1998 mapxy pos (m, x, y); pos.move (i);
2031 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 {
2032 altern [index++] = i; 2014 altern [index++] = i;
2015 continue;
2016 }
2033 2017
2034 /* 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.
2035 * 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.
2036 * 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 -
2037 * 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
2038 * 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
2039 * to only the spaces immediately surrounding the target area, and 2023 * to only the spaces immediately surrounding the target area, and
2040 * won't look 2 spaces south of the target space. 2024 * won't look 2 spaces south of the target space.
2041 */ 2025 */
2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2026 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2027 {
2043 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;
2044 } 2039 }
2045 2040
2046 if (!index) 2041 if (!index)
2047 return -1; 2042 return -1;
2048 2043
… …
2057 */ 2052 */
2058int 2053int
2059find_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)
2060{ 2055{
2061 for (int i = 0; i < SIZEOFFREE; i++) 2056 for (int i = 0; i < SIZEOFFREE; i++)
2062 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]))
2063 return i; 2058 return i;
2064 2059
2065 return -1; 2060 return -1;
2066} 2061}
2067 2062
… …
2344 * 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
2345 * core dumps if they do. 2340 * core dumps if they do.
2346 * 2341 *
2347 * 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)
2348 */ 2343 */
2349
2350int 2344int
2351can_pick (const object *who, const object *item) 2345can_pick (const object *who, const object *item)
2352{ 2346{
2353 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2347 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2354 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2348 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2612 &name, 2606 &name,
2613 title ? "\",title:\"" : "", 2607 title ? "\",title:\"" : "",
2614 title ? (const char *)title : "", 2608 title ? (const char *)title : "",
2615 flag_desc (flagdesc, 512), type); 2609 flag_desc (flagdesc, 512), type);
2616 2610
2617 if (env) 2611 if (!this->flag[FLAG_REMOVED] && env)
2618 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2612 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619 2613
2620 if (map) 2614 if (map)
2621 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);
2622 2616
… …
2640} 2634}
2641 2635
2642const materialtype_t * 2636const materialtype_t *
2643object::dominant_material () const 2637object::dominant_material () const
2644{ 2638{
2645 if (materialtype_t *mat = name_to_material (materialname)) 2639 if (materialtype_t *mt = name_to_material (materialname))
2646 return mat; 2640 return mt;
2647 2641
2648 // omfg this is slow, this has to be temporary :)
2649 shstr unknown ("unknown");
2650
2651 return name_to_material (unknown); 2642 return name_to_material (shstr_unknown);
2652} 2643}
2653 2644
2654void 2645void
2655object::open_container (object *new_container) 2646object::open_container (object *new_container)
2656{ 2647{
… …
2672 old_container->flag [FLAG_APPLIED] = 0; 2663 old_container->flag [FLAG_APPLIED] = 0;
2673 container = 0; 2664 container = 0;
2674 2665
2675 esrv_update_item (UPD_FLAGS, this, old_container); 2666 esrv_update_item (UPD_FLAGS, this, old_container);
2676 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"));
2677 } 2669 }
2678 2670
2679 if (new_container) 2671 if (new_container)
2680 { 2672 {
2681 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2673 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2697 new_container->flag [FLAG_APPLIED] = 1; 2689 new_container->flag [FLAG_APPLIED] = 1;
2698 container = new_container; 2690 container = new_container;
2699 2691
2700 esrv_update_item (UPD_FLAGS, this, new_container); 2692 esrv_update_item (UPD_FLAGS, this, new_container);
2701 esrv_send_inventory (this, new_container); 2693 esrv_send_inventory (this, new_container);
2694 play_sound (sound_find ("chest_open"));
2702 } 2695 }
2703} 2696}
2704 2697
2705object * 2698object *
2706object::force_find (const shstr name) 2699object::force_find (const shstr name)
… …
2732 force->flag [FLAG_APPLIED] = true; 2725 force->flag [FLAG_APPLIED] = true;
2733 2726
2734 insert (force); 2727 insert (force);
2735} 2728}
2736 2729
2730void
2731object::play_sound (faceidx sound) const
2732{
2733 if (!sound)
2734 return;
2737 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
2745 map->play_sound (sound, x, y);
2746}
2747

Diff Legend

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