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.279 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
36static const uint64 UUID_GAP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000; 38uint32_t mapspace::smellcount = 10000;
38 39
39objectvec objects; 40objectvec objects;
40activevec actives; 41activevec actives;
42
43//+GPL
41 44
42short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
43 0, 46 0,
44 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
45 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
49 0, 52 0,
50 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
51 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53}; 56};
54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59};
60int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
61 0, 58 0,
62 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
63 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
62};
63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
65}; 69};
66 70
67static void 71static void
68write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
69{ 73{
… …
328 // the player inventory itself is always visible 332 // the player inventory itself is always visible
329 if (env->is_player ()) 333 if (env->is_player ())
330 return env; 334 return env;
331 335
332 // else a player could have our env open 336 // else a player could have our env open
333 object *envest = env->outer_env (); 337 object *envest = env->outer_env_or_self ();
334 338
335 // the player itself is always on a map, so we will find him here 339 // the player itself is always on a map, so we will find him here
336 // even if our inv is in a player. 340 // even if our inv is in a player.
337 if (envest->is_on_map ()) 341 if (envest->is_on_map ())
338 if (object *pl = envest->ms ().player ()) 342 if (object *pl = envest->ms ().player ())
339 if (pl->container == env) 343 if (pl->container_ () == env)
340 return pl; 344 return pl;
341 } 345 }
342 else 346 else
343 { 347 {
344 // maybe there is a player standing on the same mapspace 348 // maybe there is a player standing on the same mapspace
345 // this will catch the case where "this" is a player 349 // this will catch the case where "this" is a player
346 if (object *pl = ms ().player ()) 350 if (object *pl = ms ().player ())
347 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 351 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348 || this == pl->container) 352 || pl->container_ () == this)
349 return pl; 353 return pl;
350 } 354 }
351 } 355 }
352 356
353 return 0; 357 return 0;
… …
431 object_freezer freezer; 435 object_freezer freezer;
432 op->write (freezer); 436 op->write (freezer);
433 return freezer.as_string (); 437 return freezer.as_string ();
434} 438}
435 439
436/* 440char *
437 * get_nearest_part(multi-object, object 2) returns the part of the 441object::as_string ()
438 * multi-object 1 which is closest to the second object.
439 * If it's not a multi-object, it is returned.
440 */
441object *
442get_nearest_part (object *op, const object *pl)
443{ 442{
444 object *tmp, *closest; 443 return dump_object (this);
445 int last_dist, i;
446
447 if (!op->more)
448 return op;
449
450 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451 tmp;
452 tmp = tmp->more)
453 if ((i = distance (tmp, pl)) < last_dist)
454 closest = tmp, last_dist = i;
455
456 return closest;
457} 444}
458 445
459/* 446/*
460 * Returns the object which has the count-variable equal to the argument. 447 * Returns the object which has the count-variable equal to the argument.
461 * VERRRY slow. 448 * VERRRY slow.
… …
555 update_stats (); 542 update_stats ();
556 543
557 new_draw_info_format (NDI_UNIQUE, 0, this, 544 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, " 545 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. " 546 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name); 547 "[You need to unapply some items first - use the 'body' command to see "
548 "how many items you cna wera on a specific body part.]", &ob->name);
561 return false; 549 return false;
562 } 550 }
563 551
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 552 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 } 553 }
… …
792 780
793object::object () 781object::object ()
794{ 782{
795 SET_FLAG (this, FLAG_REMOVED); 783 SET_FLAG (this, FLAG_REMOVED);
796 784
797 expmul = 1.0; 785 //expmul = 1.0; declared const for the time being
798 face = blank_face; 786 face = blank_face;
799} 787}
800 788
801object::~object () 789object::~object ()
802{ 790{
… …
831{ 819{
832 /* If already on active list, don't do anything */ 820 /* If already on active list, don't do anything */
833 if (active) 821 if (active)
834 return; 822 return;
835 823
836 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839 if (has_active_speed ()) 824 if (has_active_speed ())
825 {
826 if (flag [FLAG_FREED])
827 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
828
840 actives.insert (this); 829 actives.insert (this);
830 }
841} 831}
842 832
843void 833void
844object::activate_recursive () 834object::activate_recursive ()
845{ 835{
… …
1031 * the previous environment. 1021 * the previous environment.
1032 */ 1022 */
1033void 1023void
1034object::do_remove () 1024object::do_remove ()
1035{ 1025{
1036 object *tmp, *last = 0;
1037 object *otmp;
1038
1039 if (flag [FLAG_REMOVED]) 1026 if (flag [FLAG_REMOVED])
1040 return; 1027 return;
1041 1028
1042 INVOKE_OBJECT (REMOVE, this); 1029 INVOKE_OBJECT (REMOVE, this);
1043 1030
… …
1109 close_container (); 1096 close_container ();
1110 1097
1111 --map->players; 1098 --map->players;
1112 map->touch (); 1099 map->touch ();
1113 } 1100 }
1114 else if (pl->container == this) 1101 else if (pl->container_ () == this)
1115 { 1102 {
1116 // removing a container should close it 1103 // removing a container should close it
1117 close_container (); 1104 close_container ();
1118 } 1105 }
1119 1106
… …
1135 1122
1136 int check_walk_off = !flag [FLAG_NO_APPLY]; 1123 int check_walk_off = !flag [FLAG_NO_APPLY];
1137 1124
1138 if (object *pl = ms.player ()) 1125 if (object *pl = ms.player ())
1139 { 1126 {
1140 if (pl->container == this) 1127 if (pl->container_ () == this)
1141 /* If a container that the player is currently using somehow gets 1128 /* If a container that the player is currently using somehow gets
1142 * removed (most likely destroyed), update the player view 1129 * removed (most likely destroyed), update the player view
1143 * appropriately. 1130 * appropriately.
1144 */ 1131 */
1145 pl->close_container (); 1132 pl->close_container ();
… …
1149 //TODO: update floorbox to preserve ordering 1136 //TODO: update floorbox to preserve ordering
1150 if (pl->contr->ns) 1137 if (pl->contr->ns)
1151 pl->contr->ns->floorbox_update (); 1138 pl->contr->ns->floorbox_update ();
1152 } 1139 }
1153 1140
1141 if (check_walk_off)
1154 for (tmp = ms.bot; tmp; tmp = tmp->above) 1142 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1155 { 1143 {
1144 above = tmp->above;
1145
1156 /* No point updating the players look faces if he is the object 1146 /* No point updating the players look faces if he is the object
1157 * being removed. 1147 * being removed.
1158 */ 1148 */
1159 1149
1160 /* See if object moving off should effect something */ 1150 /* See if object moving off should effect something */
1161 if (check_walk_off
1162 && ((move_type & tmp->move_off) 1151 if ((move_type & tmp->move_off)
1163 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1152 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164 {
1165 move_apply (tmp, this, 0); 1153 move_apply (tmp, this, 0);
1166
1167 if (destroyed ())
1168 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169 } 1154 }
1170
1171 last = tmp;
1172 }
1173 1155
1174 if (affects_los ()) 1156 if (affects_los ())
1175 update_all_los (map, x, y); 1157 update_all_los (map, x, y);
1176 } 1158 }
1177} 1159}
… …
1297 1279
1298 if (object *more = op->more) 1280 if (object *more = op->more)
1299 if (!insert_ob_in_map (more, m, originator, flag)) 1281 if (!insert_ob_in_map (more, m, originator, flag))
1300 return 0; 1282 return 0;
1301 1283
1302 CLEAR_FLAG (op, FLAG_REMOVED); 1284 op->flag [FLAG_REMOVED] = false;
1303 1285 op->env = 0;
1304 op->map = newmap; 1286 op->map = newmap;
1287
1305 mapspace &ms = op->ms (); 1288 mapspace &ms = op->ms ();
1306 1289
1307 /* this has to be done after we translate the coordinates. 1290 /* this has to be done after we translate the coordinates.
1308 */ 1291 */
1309 if (op->nrof && !(flag & INS_NO_MERGE)) 1292 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1330 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1313 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331 abort (); 1314 abort ();
1332 } 1315 }
1333 1316
1334 if (!originator->is_on_map ()) 1317 if (!originator->is_on_map ())
1318 {
1335 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1319 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336 op->debug_desc (), originator->debug_desc ()); 1320 op->debug_desc (), originator->debug_desc ());
1321 abort ();
1322 }
1337 1323
1338 op->above = originator; 1324 op->above = originator;
1339 op->below = originator->below; 1325 op->below = originator->below;
1340 originator->below = op; 1326 originator->below = op;
1341 1327
… …
1473 * blocked() and wall() work properly), and these flags are updated by 1459 * blocked() and wall() work properly), and these flags are updated by
1474 * update_object(). 1460 * update_object().
1475 */ 1461 */
1476 1462
1477 /* if this is not the head or flag has been passed, don't check walk on status */ 1463 /* if this is not the head or flag has been passed, don't check walk on status */
1478 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1464 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1479 { 1465 {
1480 if (check_move_on (op, originator)) 1466 if (check_move_on (op, originator))
1481 return 0; 1467 return 0;
1482 1468
1483 /* If we are a multi part object, lets work our way through the check 1469 /* If we are a multi part object, lets work our way through the check
… …
1698 * on top. 1684 * on top.
1699 */ 1685 */
1700int 1686int
1701check_move_on (object *op, object *originator) 1687check_move_on (object *op, object *originator)
1702{ 1688{
1689 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1690 return 0;
1691
1703 object *tmp; 1692 object *tmp;
1704 maptile *m = op->map; 1693 maptile *m = op->map;
1705 int x = op->x, y = op->y; 1694 int x = op->x, y = op->y;
1706 1695
1707 MoveType move_on, move_slow, move_block; 1696 mapspace &ms = m->at (x, y);
1708 1697
1709 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1698 ms.update ();
1710 return 0;
1711 1699
1712 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1700 MoveType move_on = ms.move_on;
1713 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1701 MoveType move_slow = ms.move_slow;
1714 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1702 MoveType move_block = ms.move_block;
1715 1703
1716 /* if nothing on this space will slow op down or be applied, 1704 /* if nothing on this space will slow op down or be applied,
1717 * no need to do checking below. have to make sure move_type 1705 * no need to do checking below. have to make sure move_type
1718 * is set, as lots of objects don't have it set - we treat that 1706 * is set, as lots of objects don't have it set - we treat that
1719 * as walking. 1707 * as walking.
… …
1730 return 0; 1718 return 0;
1731 1719
1732 /* The objects have to be checked from top to bottom. 1720 /* The objects have to be checked from top to bottom.
1733 * Hence, we first go to the top: 1721 * Hence, we first go to the top:
1734 */ 1722 */
1735 1723 for (object *next, *tmp = ms.top; tmp; tmp = next)
1736 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737 {
1738 /* Trim the search when we find the first other spell effect
1739 * this helps performance so that if a space has 50 spell objects,
1740 * we don't need to check all of them.
1741 */
1742 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743 break;
1744 } 1724 {
1725 next = tmp->below;
1745 1726
1746 for (; tmp; tmp = tmp->below)
1747 {
1748 if (tmp == op) 1727 if (tmp == op)
1749 continue; /* Can't apply yourself */ 1728 continue; /* Can't apply yourself */
1750 1729
1751 /* Check to see if one of the movement types should be slowed down. 1730 /* Check to see if one of the movement types should be slowed down.
1752 * Second check makes sure that the movement types not being slowed 1731 * Second check makes sure that the movement types not being slowed
… …
1757 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1736 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758 { 1737 {
1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1738 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1760 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1739 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761 { 1740 {
1762
1763 float
1764 diff = tmp->move_slow_penalty * fabs (op->speed); 1741 float diff = tmp->move_slow_penalty * fabs (op->speed);
1765 1742
1766 if (op->is_player ()) 1743 if (op->is_player ())
1767 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1744 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1768 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1745 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769 diff /= 4.0; 1746 diff /= 4.0;
1770 1747
1771 op->speed_left -= diff; 1748 op->speed_left -= diff;
1772 } 1749 }
1773 } 1750 }
… …
2174 * This basically means that if direction is 15, then it could either go 2151 * This basically means that if direction is 15, then it could either go
2175 * direction 4, 14, or 16 to get back to where we are. 2152 * direction 4, 14, or 16 to get back to where we are.
2176 * Moved from spell_util.c to object.c with the other related direction 2153 * Moved from spell_util.c to object.c with the other related direction
2177 * functions. 2154 * functions.
2178 */ 2155 */
2179const int reduction_dir[SIZEOFFREE][3] = { 2156static const int reduction_dir[SIZEOFFREE][3] = {
2180 {0, 0, 0}, /* 0 */ 2157 {0, 0, 0}, /* 0 */
2181 {0, 0, 0}, /* 1 */ 2158 {0, 0, 0}, /* 1 */
2182 {0, 0, 0}, /* 2 */ 2159 {0, 0, 0}, /* 2 */
2183 {0, 0, 0}, /* 3 */ 2160 {0, 0, 0}, /* 3 */
2184 {0, 0, 0}, /* 4 */ 2161 {0, 0, 0}, /* 4 */
… …
2493 container = 0; 2470 container = 0;
2494 2471
2495 // client needs item update to make it work, client bug requires this to be separate 2472 // client needs item update to make it work, client bug requires this to be separate
2496 esrv_update_item (UPD_FLAGS, this, old_container); 2473 esrv_update_item (UPD_FLAGS, this, old_container);
2497 2474
2498 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2475 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499 play_sound (sound_find ("chest_close")); 2476 play_sound (sound_find ("chest_close"));
2500 } 2477 }
2501 2478
2502 if (new_container) 2479 if (new_container)
2503 { 2480 {
… …
2513 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2490 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514 new_container->insert (closer); 2491 new_container->insert (closer);
2515 } 2492 }
2516#endif 2493#endif
2517 2494
2518 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2495 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519 2496
2520 // make sure the container is available, client bug requires this to be separate 2497 // make sure the container is available, client bug requires this to be separate
2521 esrv_send_item (this, new_container); 2498 esrv_send_item (this, new_container);
2522 2499
2523 new_container->flag [FLAG_APPLIED] = true; 2500 new_container->flag [FLAG_APPLIED] = true;
… …
2543 return splay (tmp); 2520 return splay (tmp);
2544 2521
2545 return 0; 2522 return 0;
2546} 2523}
2547 2524
2525//-GPL
2526
2527void
2528object::force_set_timer (int duration)
2529{
2530 this->duration = 1;
2531 this->speed_left = -1.f;
2532
2533 this->set_speed (duration ? 1.f / duration : 0.f);
2534}
2535
2548object * 2536object *
2549object::force_add (shstr_tmp name, int duration) 2537object::force_add (shstr_tmp name, int duration)
2550{ 2538{
2551 if (object *force = force_find (name)) 2539 if (object *force = force_find (name))
2552 force->destroy (); 2540 force->destroy ();
2553 2541
2554 object *force = get_archetype (FORCE_NAME); 2542 object *force = get_archetype (FORCE_NAME);
2555 2543
2556 force->slaying = name; 2544 force->slaying = name;
2557 force->stats.food = 1; 2545 force->force_set_timer (duration);
2558 force->speed_left = -1.f;
2559
2560 force->set_speed (duration ? 1.f / duration : 0.f);
2561 force->flag [FLAG_IS_USED_UP] = true;
2562 force->flag [FLAG_APPLIED] = true; 2546 force->flag [FLAG_APPLIED] = true;
2563 2547
2564 return insert (force); 2548 return insert (force);
2565} 2549}
2566 2550
2567void 2551void
2568object::play_sound (faceidx sound) 2552object::play_sound (faceidx sound) const
2569{ 2553{
2570 if (!sound) 2554 if (!sound)
2571 return; 2555 return;
2572 2556
2573 if (flag [FLAG_REMOVED]) 2557 if (is_on_map ())
2574 return;
2575
2576 if (env)
2577 {
2578 if (object *pl = in_player ())
2579 pl->contr->play_sound (sound);
2580 }
2581 else
2582 map->play_sound (sound, x, y); 2558 map->play_sound (sound, x, y);
2559 else if (object *pl = in_player ())
2560 pl->contr->play_sound (sound);
2561}
2562
2563void
2564object::say_msg (const char *msg) const
2565{
2566 if (is_on_map ())
2567 map->say_msg (msg, x, y);
2568 else if (object *pl = in_player ())
2569 pl->contr->play_sound (sound);
2583} 2570}
2584 2571
2585void 2572void
2586object::make_noise () 2573object::make_noise ()
2587{ 2574{

Diff Legend

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