… | |
… | |
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 | { |
… | |
… | |
97 | |
101 | |
98 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
102 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
99 | _exit (1); |
103 | _exit (1); |
100 | } |
104 | } |
101 | |
105 | |
102 | UUID::BUF buf; |
106 | char buf [UUID::MAX_LEN]; |
103 | buf[0] = 0; |
107 | buf[0] = 0; |
104 | fgets (buf, sizeof (buf), fp); |
108 | fgets (buf, sizeof (buf), fp); |
105 | |
109 | |
106 | if (!UUID::cur.parse (buf)) |
110 | if (!UUID::cur.parse (buf)) |
107 | { |
111 | { |
… | |
… | |
134 | |
138 | |
135 | void |
139 | void |
136 | UUID::init () |
140 | UUID::init () |
137 | { |
141 | { |
138 | read_uuid (); |
142 | read_uuid (); |
|
|
143 | } |
|
|
144 | |
|
|
145 | bool |
|
|
146 | UUID::parse (const char *s) |
|
|
147 | { |
|
|
148 | if (*s++ != '<' || *s++ != '1' || *s++ != '.') |
|
|
149 | return false; |
|
|
150 | |
|
|
151 | seq = 0; |
|
|
152 | |
|
|
153 | while (*s != '>') |
|
|
154 | { |
|
|
155 | if (*s < '0') |
|
|
156 | return false; |
|
|
157 | |
|
|
158 | // this gives nice branchless code with gcc |
|
|
159 | assert ('0' < 'a' && '0' == 48 && 'a' == 97); |
|
|
160 | int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15; |
|
|
161 | |
|
|
162 | seq = (seq << 4) | digit; |
|
|
163 | |
|
|
164 | ++s; |
|
|
165 | } |
|
|
166 | |
|
|
167 | return true; |
|
|
168 | } |
|
|
169 | |
|
|
170 | char * |
|
|
171 | UUID::append (char *buf) const |
|
|
172 | { |
|
|
173 | *buf++ = '<'; |
|
|
174 | *buf++ = '1'; |
|
|
175 | *buf++ = '.'; |
|
|
176 | |
|
|
177 | uint64_t seq = this->seq; |
|
|
178 | const int bits = 64; |
|
|
179 | char nz = 0; |
|
|
180 | static const char tohex [] = "0123456789abcdef"; |
|
|
181 | |
|
|
182 | // assert (len >= 3 + bits / 4 + 1 + 1); |
|
|
183 | for (int i = bits / 4; --i; ) |
|
|
184 | { |
|
|
185 | uint8_t digit = seq >> (bits - 4); |
|
|
186 | |
|
|
187 | *buf = tohex [digit]; |
|
|
188 | nz |= digit; |
|
|
189 | buf += nz ? 1 : 0; |
|
|
190 | seq <<= 4; |
|
|
191 | } |
|
|
192 | |
|
|
193 | // last digit is special - always emit |
|
|
194 | uint8_t digit = seq >> (bits - 4); |
|
|
195 | *buf++ = tohex [digit]; |
|
|
196 | |
|
|
197 | *buf++ = '>'; |
|
|
198 | |
|
|
199 | return buf; |
|
|
200 | } |
|
|
201 | |
|
|
202 | char * |
|
|
203 | UUID::c_str () const |
|
|
204 | { |
|
|
205 | static char buf [MAX_LEN]; |
|
|
206 | *append (buf) = 0; |
|
|
207 | return buf; |
139 | } |
208 | } |
140 | |
209 | |
141 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
210 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
142 | static bool |
211 | static bool |
143 | compare_ob_value_lists_one (const object *wants, const object *has) |
212 | compare_ob_value_lists_one (const object *wants, const object *has) |
… | |
… | |
182 | bool object::can_merge_slow (object *ob1, object *ob2) |
251 | bool object::can_merge_slow (object *ob1, object *ob2) |
183 | { |
252 | { |
184 | /* A couple quicksanity checks */ |
253 | /* A couple quicksanity checks */ |
185 | if (ob1 == ob2 |
254 | if (ob1 == ob2 |
186 | || ob1->type != ob2->type |
255 | || ob1->type != ob2->type |
187 | || ob1->speed != ob2->speed |
256 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED |
188 | || ob1->value != ob2->value |
257 | || ob1->value != ob2->value |
189 | || ob1->name != ob2->name) |
258 | || ob1->name != ob2->name) |
190 | return 0; |
259 | return 0; |
191 | |
260 | |
192 | /* Do not merge objects if nrof would overflow, assume nrof |
261 | /* Do not merge objects if nrof would overflow, assume nrof |
… | |
… | |
226 | || ob1->move_block != ob2->move_block |
295 | || ob1->move_block != ob2->move_block |
227 | || ob1->move_allow != ob2->move_allow |
296 | || ob1->move_allow != ob2->move_allow |
228 | || ob1->move_on != ob2->move_on |
297 | || ob1->move_on != ob2->move_on |
229 | || ob1->move_off != ob2->move_off |
298 | || ob1->move_off != ob2->move_off |
230 | || ob1->move_slow != ob2->move_slow |
299 | || ob1->move_slow != ob2->move_slow |
231 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
300 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
301 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
302 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
234 | return 0; |
303 | return 0; |
235 | |
304 | |
236 | if ((ob1->flag ^ ob2->flag) |
305 | if ((ob1->flag ^ ob2->flag) |
… | |
… | |
334 | |
403 | |
335 | // the player itself is always on a map, so we will find him here |
404 | // the player itself is always on a map, so we will find him here |
336 | // even if our inv is in a player. |
405 | // even if our inv is in a player. |
337 | if (envest->is_on_map ()) |
406 | if (envest->is_on_map ()) |
338 | if (object *pl = envest->ms ().player ()) |
407 | if (object *pl = envest->ms ().player ()) |
339 | if (pl->container == env) |
408 | if (pl->container_ () == env) |
340 | return pl; |
409 | return pl; |
341 | } |
410 | } |
342 | else |
411 | else |
343 | { |
412 | { |
344 | // maybe there is a player standing on the same mapspace |
413 | // maybe there is a player standing on the same mapspace |
345 | // this will catch the case where "this" is a player |
414 | // this will catch the case where "this" is a player |
346 | if (object *pl = ms ().player ()) |
415 | if (object *pl = ms ().player ()) |
347 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
416 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
348 | || this == pl->container) |
417 | || pl->container_ () == this) |
349 | return pl; |
418 | return pl; |
350 | } |
419 | } |
351 | } |
420 | } |
352 | |
421 | |
353 | return 0; |
422 | return 0; |
… | |
… | |
435 | |
504 | |
436 | char * |
505 | char * |
437 | object::as_string () |
506 | object::as_string () |
438 | { |
507 | { |
439 | return dump_object (this); |
508 | return dump_object (this); |
440 | } |
|
|
441 | |
|
|
442 | /* |
|
|
443 | * get_nearest_part(multi-object, object 2) returns the part of the |
|
|
444 | * multi-object 1 which is closest to the second object. |
|
|
445 | * If it's not a multi-object, it is returned. |
|
|
446 | */ |
|
|
447 | object * |
|
|
448 | get_nearest_part (object *op, const object *pl) |
|
|
449 | { |
|
|
450 | object *tmp, *closest; |
|
|
451 | int last_dist, i; |
|
|
452 | |
|
|
453 | if (!op->more) |
|
|
454 | return op; |
|
|
455 | |
|
|
456 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
457 | tmp; |
|
|
458 | tmp = tmp->more) |
|
|
459 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
460 | closest = tmp, last_dist = i; |
|
|
461 | |
|
|
462 | return closest; |
|
|
463 | } |
509 | } |
464 | |
510 | |
465 | /* |
511 | /* |
466 | * Returns the object which has the count-variable equal to the argument. |
512 | * Returns the object which has the count-variable equal to the argument. |
467 | * VERRRY slow. |
513 | * VERRRY slow. |
… | |
… | |
698 | * This function needs to be called whenever the speed of an object changes. |
744 | * This function needs to be called whenever the speed of an object changes. |
699 | */ |
745 | */ |
700 | void |
746 | void |
701 | object::set_speed (float speed) |
747 | object::set_speed (float speed) |
702 | { |
748 | { |
703 | if (flag [FLAG_FREED] && speed) |
|
|
704 | { |
|
|
705 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
706 | speed = 0; |
|
|
707 | } |
|
|
708 | |
|
|
709 | this->speed = speed; |
749 | this->speed = speed; |
710 | |
750 | |
711 | if (has_active_speed ()) |
751 | if (has_active_speed ()) |
712 | activate (); |
752 | activate (); |
713 | else |
753 | else |
… | |
… | |
763 | |
803 | |
764 | if (!(m.flags_ & P_UPTODATE)) |
804 | if (!(m.flags_ & P_UPTODATE)) |
765 | /* nop */; |
805 | /* nop */; |
766 | else if (action == UP_OBJ_INSERT) |
806 | else if (action == UP_OBJ_INSERT) |
767 | { |
807 | { |
|
|
808 | #if 0 |
768 | // this is likely overkill, TODO: revisit (schmorp) |
809 | // this is likely overkill, TODO: revisit (schmorp) |
769 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
810 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
770 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
811 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
771 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
812 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
772 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
813 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
… | |
… | |
777 | || (m.move_slow | op->move_slow) != m.move_slow |
818 | || (m.move_slow | op->move_slow) != m.move_slow |
778 | /* This isn't perfect, but I don't expect a lot of objects to |
819 | /* This isn't perfect, but I don't expect a lot of objects to |
779 | * have move_allow right now. |
820 | * have move_allow right now. |
780 | */ |
821 | */ |
781 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
822 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
782 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
|
|
783 | m.invalidate (); |
823 | m.invalidate (); |
|
|
824 | #else |
|
|
825 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
|
|
826 | m.invalidate (); |
|
|
827 | #endif |
784 | } |
828 | } |
785 | /* if the object is being removed, we can't make intelligent |
829 | /* if the object is being removed, we can't make intelligent |
786 | * decisions, because remove_ob can't really pass the object |
830 | * decisions, because remove_ob can't really pass the object |
787 | * that is being removed. |
831 | * that is being removed. |
788 | */ |
832 | */ |
… | |
… | |
1040 | * the previous environment. |
1084 | * the previous environment. |
1041 | */ |
1085 | */ |
1042 | void |
1086 | void |
1043 | object::do_remove () |
1087 | object::do_remove () |
1044 | { |
1088 | { |
1045 | object *tmp, *last = 0; |
|
|
1046 | object *otmp; |
|
|
1047 | |
|
|
1048 | if (flag [FLAG_REMOVED]) |
1089 | if (flag [FLAG_REMOVED]) |
1049 | return; |
1090 | return; |
1050 | |
1091 | |
1051 | INVOKE_OBJECT (REMOVE, this); |
1092 | INVOKE_OBJECT (REMOVE, this); |
1052 | |
1093 | |
… | |
… | |
1118 | close_container (); |
1159 | close_container (); |
1119 | |
1160 | |
1120 | --map->players; |
1161 | --map->players; |
1121 | map->touch (); |
1162 | map->touch (); |
1122 | } |
1163 | } |
1123 | else if (pl->container == this) |
1164 | else if (pl->container_ () == this) |
1124 | { |
1165 | { |
1125 | // removing a container should close it |
1166 | // removing a container should close it |
1126 | close_container (); |
1167 | close_container (); |
1127 | } |
1168 | } |
1128 | |
1169 | |
… | |
… | |
1144 | |
1185 | |
1145 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1186 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1146 | |
1187 | |
1147 | if (object *pl = ms.player ()) |
1188 | if (object *pl = ms.player ()) |
1148 | { |
1189 | { |
1149 | if (pl->container == this) |
1190 | if (pl->container_ () == this) |
1150 | /* If a container that the player is currently using somehow gets |
1191 | /* If a container that the player is currently using somehow gets |
1151 | * removed (most likely destroyed), update the player view |
1192 | * removed (most likely destroyed), update the player view |
1152 | * appropriately. |
1193 | * appropriately. |
1153 | */ |
1194 | */ |
1154 | pl->close_container (); |
1195 | pl->close_container (); |
… | |
… | |
1158 | //TODO: update floorbox to preserve ordering |
1199 | //TODO: update floorbox to preserve ordering |
1159 | if (pl->contr->ns) |
1200 | if (pl->contr->ns) |
1160 | pl->contr->ns->floorbox_update (); |
1201 | pl->contr->ns->floorbox_update (); |
1161 | } |
1202 | } |
1162 | |
1203 | |
|
|
1204 | if (check_walk_off) |
1163 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1205 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1164 | { |
1206 | { |
|
|
1207 | above = tmp->above; |
|
|
1208 | |
1165 | /* No point updating the players look faces if he is the object |
1209 | /* No point updating the players look faces if he is the object |
1166 | * being removed. |
1210 | * being removed. |
1167 | */ |
1211 | */ |
1168 | |
1212 | |
1169 | /* See if object moving off should effect something */ |
1213 | /* See if object moving off should effect something */ |
1170 | if (check_walk_off |
|
|
1171 | && ((move_type & tmp->move_off) |
1214 | if ((move_type & tmp->move_off) |
1172 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1215 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1173 | { |
|
|
1174 | move_apply (tmp, this, 0); |
1216 | move_apply (tmp, this, 0); |
1175 | |
|
|
1176 | if (destroyed ()) |
|
|
1177 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1178 | } |
1217 | } |
1179 | |
|
|
1180 | last = tmp; |
|
|
1181 | } |
|
|
1182 | |
1218 | |
1183 | if (affects_los ()) |
1219 | if (affects_los ()) |
1184 | update_all_los (map, x, y); |
1220 | update_all_los (map, x, y); |
1185 | } |
1221 | } |
1186 | } |
1222 | } |
… | |
… | |
1532 | return where->env->insert (this); |
1568 | return where->env->insert (this); |
1533 | else |
1569 | else |
1534 | return where->map->insert (this, where->x, where->y, originator, flags); |
1570 | return where->map->insert (this, where->x, where->y, originator, flags); |
1535 | } |
1571 | } |
1536 | |
1572 | |
|
|
1573 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1574 | bool |
|
|
1575 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1576 | { |
|
|
1577 | mapspace &ms = m->at (x, y); |
|
|
1578 | |
|
|
1579 | int items = ms.items (); |
|
|
1580 | |
|
|
1581 | if (!items // testing !items ensures we can drop at least one item |
|
|
1582 | || (items < m->max_items |
|
|
1583 | && ms.volume () < m->max_volume)) |
|
|
1584 | return true; |
|
|
1585 | |
|
|
1586 | if (originator && originator->is_player ()) |
|
|
1587 | originator->contr->failmsg (format ( |
|
|
1588 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
|
|
1589 | query_name () |
|
|
1590 | )); |
|
|
1591 | |
|
|
1592 | return false; |
|
|
1593 | } |
|
|
1594 | |
1537 | /* |
1595 | /* |
1538 | * decrease(object, number) decreases a specified number from |
1596 | * decrease(object, number) decreases a specified number from |
1539 | * the amount of an object. If the amount reaches 0, the object |
1597 | * the amount of an object. If the amount reaches 0, the object |
1540 | * is subsequently removed and freed. |
1598 | * is subsequently removed and freed. |
1541 | * |
1599 | * |
… | |
… | |
2178 | * This basically means that if direction is 15, then it could either go |
2236 | * This basically means that if direction is 15, then it could either go |
2179 | * direction 4, 14, or 16 to get back to where we are. |
2237 | * direction 4, 14, or 16 to get back to where we are. |
2180 | * Moved from spell_util.c to object.c with the other related direction |
2238 | * Moved from spell_util.c to object.c with the other related direction |
2181 | * functions. |
2239 | * functions. |
2182 | */ |
2240 | */ |
2183 | const int reduction_dir[SIZEOFFREE][3] = { |
2241 | static const int reduction_dir[SIZEOFFREE][3] = { |
2184 | {0, 0, 0}, /* 0 */ |
2242 | {0, 0, 0}, /* 0 */ |
2185 | {0, 0, 0}, /* 1 */ |
2243 | {0, 0, 0}, /* 1 */ |
2186 | {0, 0, 0}, /* 2 */ |
2244 | {0, 0, 0}, /* 2 */ |
2187 | {0, 0, 0}, /* 3 */ |
2245 | {0, 0, 0}, /* 3 */ |
2188 | {0, 0, 0}, /* 4 */ |
2246 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2547 | return splay (tmp); |
2605 | return splay (tmp); |
2548 | |
2606 | |
2549 | return 0; |
2607 | return 0; |
2550 | } |
2608 | } |
2551 | |
2609 | |
|
|
2610 | //-GPL |
|
|
2611 | |
2552 | void |
2612 | void |
2553 | object::force_set_timer (int duration) |
2613 | object::force_set_timer (int duration) |
2554 | { |
2614 | { |
2555 | this->duration = 1; |
2615 | this->duration = 1; |
2556 | this->speed_left = -1.f; |
2616 | this->speed_left = -1.f; |
… | |
… | |
2565 | force->destroy (); |
2625 | force->destroy (); |
2566 | |
2626 | |
2567 | object *force = get_archetype (FORCE_NAME); |
2627 | object *force = get_archetype (FORCE_NAME); |
2568 | |
2628 | |
2569 | force->slaying = name; |
2629 | force->slaying = name; |
2570 | |
|
|
2571 | force->force_set_timer (duration); |
2630 | force->force_set_timer (duration); |
2572 | |
|
|
2573 | force->flag [FLAG_APPLIED] = true; |
2631 | force->flag [FLAG_APPLIED] = true; |
2574 | |
2632 | |
2575 | return insert (force); |
2633 | return insert (force); |
2576 | } |
2634 | } |
2577 | |
2635 | |
2578 | void |
2636 | void |