… | |
… | |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008,2009 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> |
… | |
… | |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | static const uint64 UUID_GAP = 1<<19; |
37 | uint32_t mapspace::smellcount = 10000; |
38 | uint32_t mapspace::smellcount = 10000; |
38 | |
39 | |
39 | objectvec objects; |
40 | objectvec objects; |
40 | activevec actives; |
41 | activevec actives; |
|
|
42 | |
|
|
43 | //+GPL |
41 | |
44 | |
42 | short freearr_x[SIZEOFFREE] = { |
45 | short 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 | }; |
54 | int 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 | }; |
|
|
60 | int freedir[SIZEOFFREE] = { |
57 | int 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 | |
|
|
64 | static 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 | |
67 | static void |
71 | static void |
68 | write_uuid (uval64 skip, bool sync) |
72 | write_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 | |
|
|
440 | char * |
|
|
441 | object::as_string () |
|
|
442 | { |
|
|
443 | return dump_object (this); |
|
|
444 | } |
|
|
445 | |
436 | /* |
446 | /* |
437 | * get_nearest_part(multi-object, object 2) returns the part of the |
447 | * get_nearest_part(multi-object, object 2) returns the part of the |
438 | * multi-object 1 which is closest to the second object. |
448 | * multi-object 1 which is closest to the second object. |
439 | * If it's not a multi-object, it is returned. |
449 | * If it's not a multi-object, it is returned. |
440 | */ |
450 | */ |
441 | object * |
451 | static object * |
442 | get_nearest_part (object *op, const object *pl) |
452 | get_nearest_part (object *op, const object *pl) |
443 | { |
453 | { |
444 | object *tmp, *closest; |
454 | object *tmp, *closest; |
445 | int last_dist, i; |
455 | int last_dist, i; |
446 | |
456 | |
… | |
… | |
555 | update_stats (); |
565 | update_stats (); |
556 | |
566 | |
557 | new_draw_info_format (NDI_UNIQUE, 0, this, |
567 | new_draw_info_format (NDI_UNIQUE, 0, this, |
558 | "You try to balance all your items at once, " |
568 | "You try to balance all your items at once, " |
559 | "but the %s is just too much for your body. " |
569 | "but the %s is just too much for your body. " |
560 | "[You need to unapply some items first.]", &ob->name); |
570 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
571 | "how many items you cna wera on a specific body part.]", &ob->name); |
561 | return false; |
572 | return false; |
562 | } |
573 | } |
563 | |
574 | |
564 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
575 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
565 | } |
576 | } |
… | |
… | |
792 | |
803 | |
793 | object::object () |
804 | object::object () |
794 | { |
805 | { |
795 | SET_FLAG (this, FLAG_REMOVED); |
806 | SET_FLAG (this, FLAG_REMOVED); |
796 | |
807 | |
797 | expmul = 1.0; |
808 | //expmul = 1.0; declared const for the time being |
798 | face = blank_face; |
809 | face = blank_face; |
799 | } |
810 | } |
800 | |
811 | |
801 | object::~object () |
812 | object::~object () |
802 | { |
813 | { |
… | |
… | |
831 | { |
842 | { |
832 | /* If already on active list, don't do anything */ |
843 | /* If already on active list, don't do anything */ |
833 | if (active) |
844 | if (active) |
834 | return; |
845 | return; |
835 | |
846 | |
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 ()) |
847 | if (has_active_speed ()) |
|
|
848 | { |
|
|
849 | if (flag [FLAG_FREED]) |
|
|
850 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
851 | |
840 | actives.insert (this); |
852 | actives.insert (this); |
|
|
853 | } |
841 | } |
854 | } |
842 | |
855 | |
843 | void |
856 | void |
844 | object::activate_recursive () |
857 | object::activate_recursive () |
845 | { |
858 | { |
… | |
… | |
1031 | * the previous environment. |
1044 | * the previous environment. |
1032 | */ |
1045 | */ |
1033 | void |
1046 | void |
1034 | object::do_remove () |
1047 | object::do_remove () |
1035 | { |
1048 | { |
1036 | object *tmp, *last = 0; |
|
|
1037 | object *otmp; |
|
|
1038 | |
|
|
1039 | if (flag [FLAG_REMOVED]) |
1049 | if (flag [FLAG_REMOVED]) |
1040 | return; |
1050 | return; |
1041 | |
1051 | |
1042 | INVOKE_OBJECT (REMOVE, this); |
1052 | INVOKE_OBJECT (REMOVE, this); |
1043 | |
1053 | |
… | |
… | |
1109 | close_container (); |
1119 | close_container (); |
1110 | |
1120 | |
1111 | --map->players; |
1121 | --map->players; |
1112 | map->touch (); |
1122 | map->touch (); |
1113 | } |
1123 | } |
1114 | else if (pl->container == this) |
1124 | else if (pl->container_ () == this) |
1115 | { |
1125 | { |
1116 | // removing a container should close it |
1126 | // removing a container should close it |
1117 | close_container (); |
1127 | close_container (); |
1118 | } |
1128 | } |
1119 | |
1129 | |
… | |
… | |
1135 | |
1145 | |
1136 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1146 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1137 | |
1147 | |
1138 | if (object *pl = ms.player ()) |
1148 | if (object *pl = ms.player ()) |
1139 | { |
1149 | { |
1140 | if (pl->container == this) |
1150 | if (pl->container_ () == this) |
1141 | /* If a container that the player is currently using somehow gets |
1151 | /* If a container that the player is currently using somehow gets |
1142 | * removed (most likely destroyed), update the player view |
1152 | * removed (most likely destroyed), update the player view |
1143 | * appropriately. |
1153 | * appropriately. |
1144 | */ |
1154 | */ |
1145 | pl->close_container (); |
1155 | pl->close_container (); |
… | |
… | |
1149 | //TODO: update floorbox to preserve ordering |
1159 | //TODO: update floorbox to preserve ordering |
1150 | if (pl->contr->ns) |
1160 | if (pl->contr->ns) |
1151 | pl->contr->ns->floorbox_update (); |
1161 | pl->contr->ns->floorbox_update (); |
1152 | } |
1162 | } |
1153 | |
1163 | |
|
|
1164 | if (check_walk_off) |
1154 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1165 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1155 | { |
1166 | { |
|
|
1167 | above = tmp->above; |
|
|
1168 | |
1156 | /* No point updating the players look faces if he is the object |
1169 | /* No point updating the players look faces if he is the object |
1157 | * being removed. |
1170 | * being removed. |
1158 | */ |
1171 | */ |
1159 | |
1172 | |
1160 | /* See if object moving off should effect something */ |
1173 | /* See if object moving off should effect something */ |
1161 | if (check_walk_off |
|
|
1162 | && ((move_type & tmp->move_off) |
1174 | if ((move_type & tmp->move_off) |
1163 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1175 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1164 | { |
|
|
1165 | move_apply (tmp, this, 0); |
1176 | 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 | } |
1177 | } |
1170 | |
|
|
1171 | last = tmp; |
|
|
1172 | } |
|
|
1173 | |
1178 | |
1174 | if (affects_los ()) |
1179 | if (affects_los ()) |
1175 | update_all_los (map, x, y); |
1180 | update_all_los (map, x, y); |
1176 | } |
1181 | } |
1177 | } |
1182 | } |
… | |
… | |
1297 | |
1302 | |
1298 | if (object *more = op->more) |
1303 | if (object *more = op->more) |
1299 | if (!insert_ob_in_map (more, m, originator, flag)) |
1304 | if (!insert_ob_in_map (more, m, originator, flag)) |
1300 | return 0; |
1305 | return 0; |
1301 | |
1306 | |
1302 | CLEAR_FLAG (op, FLAG_REMOVED); |
1307 | op->flag [FLAG_REMOVED] = false; |
1303 | |
1308 | op->env = 0; |
1304 | op->map = newmap; |
1309 | op->map = newmap; |
|
|
1310 | |
1305 | mapspace &ms = op->ms (); |
1311 | mapspace &ms = op->ms (); |
1306 | |
1312 | |
1307 | /* this has to be done after we translate the coordinates. |
1313 | /* this has to be done after we translate the coordinates. |
1308 | */ |
1314 | */ |
1309 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1476 | * blocked() and wall() work properly), and these flags are updated by |
1482 | * blocked() and wall() work properly), and these flags are updated by |
1477 | * update_object(). |
1483 | * update_object(). |
1478 | */ |
1484 | */ |
1479 | |
1485 | |
1480 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1486 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1481 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1487 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1482 | { |
1488 | { |
1483 | if (check_move_on (op, originator)) |
1489 | if (check_move_on (op, originator)) |
1484 | return 0; |
1490 | return 0; |
1485 | |
1491 | |
1486 | /* If we are a multi part object, lets work our way through the check |
1492 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1701 | * on top. |
1707 | * on top. |
1702 | */ |
1708 | */ |
1703 | int |
1709 | int |
1704 | check_move_on (object *op, object *originator) |
1710 | check_move_on (object *op, object *originator) |
1705 | { |
1711 | { |
|
|
1712 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1713 | return 0; |
|
|
1714 | |
1706 | object *tmp; |
1715 | object *tmp; |
1707 | maptile *m = op->map; |
1716 | maptile *m = op->map; |
1708 | int x = op->x, y = op->y; |
1717 | int x = op->x, y = op->y; |
1709 | |
1718 | |
1710 | MoveType move_on, move_slow, move_block; |
1719 | mapspace &ms = m->at (x, y); |
1711 | |
1720 | |
1712 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1721 | ms.update (); |
1713 | return 0; |
|
|
1714 | |
1722 | |
1715 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1723 | MoveType move_on = ms.move_on; |
1716 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1724 | MoveType move_slow = ms.move_slow; |
1717 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1725 | MoveType move_block = ms.move_block; |
1718 | |
1726 | |
1719 | /* if nothing on this space will slow op down or be applied, |
1727 | /* if nothing on this space will slow op down or be applied, |
1720 | * no need to do checking below. have to make sure move_type |
1728 | * no need to do checking below. have to make sure move_type |
1721 | * is set, as lots of objects don't have it set - we treat that |
1729 | * is set, as lots of objects don't have it set - we treat that |
1722 | * as walking. |
1730 | * as walking. |
… | |
… | |
1733 | return 0; |
1741 | return 0; |
1734 | |
1742 | |
1735 | /* The objects have to be checked from top to bottom. |
1743 | /* The objects have to be checked from top to bottom. |
1736 | * Hence, we first go to the top: |
1744 | * Hence, we first go to the top: |
1737 | */ |
1745 | */ |
1738 | |
1746 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1739 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1740 | { |
|
|
1741 | /* Trim the search when we find the first other spell effect |
|
|
1742 | * this helps performance so that if a space has 50 spell objects, |
|
|
1743 | * we don't need to check all of them. |
|
|
1744 | */ |
|
|
1745 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1746 | break; |
|
|
1747 | } |
1747 | { |
|
|
1748 | next = tmp->below; |
1748 | |
1749 | |
1749 | for (; tmp; tmp = tmp->below) |
|
|
1750 | { |
|
|
1751 | if (tmp == op) |
1750 | if (tmp == op) |
1752 | continue; /* Can't apply yourself */ |
1751 | continue; /* Can't apply yourself */ |
1753 | |
1752 | |
1754 | /* Check to see if one of the movement types should be slowed down. |
1753 | /* Check to see if one of the movement types should be slowed down. |
1755 | * Second check makes sure that the movement types not being slowed |
1754 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1760 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1759 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1761 | { |
1760 | { |
1762 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1761 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1763 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1762 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1764 | { |
1763 | { |
1765 | |
|
|
1766 | float |
|
|
1767 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1764 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1768 | |
1765 | |
1769 | if (op->is_player ()) |
1766 | if (op->is_player ()) |
1770 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1767 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1771 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1768 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1772 | diff /= 4.0; |
1769 | diff /= 4.0; |
1773 | |
1770 | |
1774 | op->speed_left -= diff; |
1771 | op->speed_left -= diff; |
1775 | } |
1772 | } |
1776 | } |
1773 | } |
… | |
… | |
2177 | * This basically means that if direction is 15, then it could either go |
2174 | * This basically means that if direction is 15, then it could either go |
2178 | * direction 4, 14, or 16 to get back to where we are. |
2175 | * direction 4, 14, or 16 to get back to where we are. |
2179 | * Moved from spell_util.c to object.c with the other related direction |
2176 | * Moved from spell_util.c to object.c with the other related direction |
2180 | * functions. |
2177 | * functions. |
2181 | */ |
2178 | */ |
2182 | const int reduction_dir[SIZEOFFREE][3] = { |
2179 | static const int reduction_dir[SIZEOFFREE][3] = { |
2183 | {0, 0, 0}, /* 0 */ |
2180 | {0, 0, 0}, /* 0 */ |
2184 | {0, 0, 0}, /* 1 */ |
2181 | {0, 0, 0}, /* 1 */ |
2185 | {0, 0, 0}, /* 2 */ |
2182 | {0, 0, 0}, /* 2 */ |
2186 | {0, 0, 0}, /* 3 */ |
2183 | {0, 0, 0}, /* 3 */ |
2187 | {0, 0, 0}, /* 4 */ |
2184 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2546 | return splay (tmp); |
2543 | return splay (tmp); |
2547 | |
2544 | |
2548 | return 0; |
2545 | return 0; |
2549 | } |
2546 | } |
2550 | |
2547 | |
|
|
2548 | //-GPL |
|
|
2549 | |
|
|
2550 | void |
|
|
2551 | object::force_set_timer (int duration) |
|
|
2552 | { |
|
|
2553 | this->duration = 1; |
|
|
2554 | this->speed_left = -1.f; |
|
|
2555 | |
|
|
2556 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2557 | } |
|
|
2558 | |
2551 | object * |
2559 | object * |
2552 | object::force_add (shstr_tmp name, int duration) |
2560 | object::force_add (shstr_tmp name, int duration) |
2553 | { |
2561 | { |
2554 | if (object *force = force_find (name)) |
2562 | if (object *force = force_find (name)) |
2555 | force->destroy (); |
2563 | force->destroy (); |
2556 | |
2564 | |
2557 | object *force = get_archetype (FORCE_NAME); |
2565 | object *force = get_archetype (FORCE_NAME); |
2558 | |
2566 | |
2559 | force->slaying = name; |
2567 | force->slaying = name; |
2560 | force->stats.food = 1; |
2568 | force->force_set_timer (duration); |
2561 | force->speed_left = -1.f; |
|
|
2562 | |
|
|
2563 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2564 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2565 | force->flag [FLAG_APPLIED] = true; |
2569 | force->flag [FLAG_APPLIED] = true; |
2566 | |
2570 | |
2567 | return insert (force); |
2571 | return insert (force); |
2568 | } |
2572 | } |
2569 | |
2573 | |
2570 | void |
2574 | void |