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> |
… | |
… | |
32 | #include <bitset> |
33 | #include <bitset> |
33 | |
34 | |
34 | UUID UUID::cur; |
35 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
36 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | static const uint64 UUID_GAP = 1<<19; |
|
|
38 | uint32_t mapspace::smellcount = 10000; |
37 | |
39 | |
38 | objectvec objects; |
40 | objectvec objects; |
39 | activevec actives; |
41 | activevec actives; |
|
|
42 | |
|
|
43 | //+GPL |
40 | |
44 | |
41 | short freearr_x[SIZEOFFREE] = { |
45 | short freearr_x[SIZEOFFREE] = { |
42 | 0, |
46 | 0, |
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
47 | 0, 1, 1, 1, 0, -1, -1, -1, |
44 | 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, |
… | |
… | |
139 | |
143 | |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
144 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
141 | static bool |
145 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
146 | compare_ob_value_lists_one (const object *wants, const object *has) |
143 | { |
147 | { |
144 | key_value *wants_field; |
|
|
145 | |
|
|
146 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
148 | /* n-squared behaviour (see kv_get), but I'm hoping both |
147 | * objects with lists are rare, and lists stay short. If not, use a |
149 | * objects with lists are rare, and lists stay short. If not, use a |
148 | * different structure or at least keep the lists sorted... |
150 | * different structure or at least keep the lists sorted... |
149 | */ |
151 | */ |
150 | |
152 | |
151 | /* For each field in wants, */ |
153 | /* For each field in wants, */ |
152 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
154 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
153 | { |
155 | if (has->kv_get (kv->key) != kv->value) |
154 | key_value *has_field; |
156 | return false; |
155 | |
|
|
156 | /* Look for a field in has with the same key. */ |
|
|
157 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
158 | |
|
|
159 | if (!has_field) |
|
|
160 | return 0; /* No field with that name. */ |
|
|
161 | |
|
|
162 | /* Found the matching field. */ |
|
|
163 | if (has_field->value != wants_field->value) |
|
|
164 | return 0; /* Values don't match, so this half of the comparison is false. */ |
|
|
165 | |
|
|
166 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
167 | } |
|
|
168 | |
157 | |
169 | /* If we get here, every field in wants has a matching field in has. */ |
158 | /* If we get here, every field in wants has a matching field in has. */ |
170 | return 1; |
159 | return true; |
171 | } |
160 | } |
172 | |
161 | |
173 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
162 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
174 | static bool |
163 | static bool |
175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
164 | compare_ob_value_lists (const object *ob1, const object *ob2) |
176 | { |
165 | { |
177 | /* However, there may be fields in has which aren't partnered in wants, |
166 | /* However, there may be fields in has which aren't partnered in wants, |
178 | * so we need to run the comparison *twice*. :( |
167 | * so we need to run the comparison *twice*. :( |
179 | */ |
168 | */ |
180 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
169 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
170 | && compare_ob_value_lists_one (ob2, ob1); |
181 | } |
171 | } |
182 | |
172 | |
183 | /* Function examines the 2 objects given to it, and returns true if |
173 | /* Function examines the 2 objects given to it, and returns true if |
184 | * they can be merged together. |
174 | * they can be merged together. |
185 | * |
175 | * |
… | |
… | |
200 | || ob1->speed != ob2->speed |
190 | || ob1->speed != ob2->speed |
201 | || ob1->value != ob2->value |
191 | || ob1->value != ob2->value |
202 | || ob1->name != ob2->name) |
192 | || ob1->name != ob2->name) |
203 | return 0; |
193 | return 0; |
204 | |
194 | |
205 | /* Do not merge objects if nrof would overflow. First part checks |
195 | /* Do not merge objects if nrof would overflow, assume nrof |
206 | * for unsigned overflow (2c), second part checks whether the result |
196 | * is always 0 .. 2**31-1 */ |
207 | * would fit into a 32 bit signed int, which is often used to hold |
197 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
208 | * nrof values. |
|
|
209 | */ |
|
|
210 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
211 | return 0; |
198 | return 0; |
212 | |
199 | |
213 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
200 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
214 | * This is to the comparison of the flags below will be OK. We |
201 | * This is to the comparison of the flags below will be OK. We |
215 | * just can't ignore the been applied or identified flags, as they |
202 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
220 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | |
208 | |
222 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | |
211 | |
225 | if (ob1->arch->name != ob2->arch->name |
212 | if (ob1->arch->archname != ob2->arch->archname |
226 | || ob1->name != ob2->name |
213 | || ob1->name != ob2->name |
227 | || ob1->title != ob2->title |
214 | || ob1->title != ob2->title |
228 | || ob1->msg != ob2->msg |
215 | || ob1->msg != ob2->msg |
229 | || ob1->weight != ob2->weight |
216 | || ob1->weight != ob2->weight |
230 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->attacktype != ob2->attacktype |
231 | || ob1->magic != ob2->magic |
218 | || ob1->magic != ob2->magic |
232 | || ob1->slaying != ob2->slaying |
219 | || ob1->slaying != ob2->slaying |
233 | || ob1->skill != ob2->skill |
220 | || ob1->skill != ob2->skill |
234 | || ob1->value != ob2->value |
221 | || ob1->value != ob2->value |
235 | || ob1->animation_id != ob2->animation_id |
222 | || ob1->animation_id != ob2->animation_id |
|
|
223 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
236 | || ob1->client_type != ob2->client_type |
224 | || ob1->client_type != ob2->client_type |
237 | || ob1->materialname != ob2->materialname |
225 | || ob1->materialname != ob2->materialname |
238 | || ob1->lore != ob2->lore |
226 | || ob1->lore != ob2->lore |
239 | || ob1->subtype != ob2->subtype |
227 | || ob1->subtype != ob2->subtype |
240 | || ob1->move_type != ob2->move_type |
228 | || ob1->move_type != ob2->move_type |
… | |
… | |
248 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
236 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
249 | return 0; |
237 | return 0; |
250 | |
238 | |
251 | if ((ob1->flag ^ ob2->flag) |
239 | if ((ob1->flag ^ ob2->flag) |
252 | .reset (FLAG_INV_LOCKED) |
240 | .reset (FLAG_INV_LOCKED) |
253 | .reset (FLAG_CLIENT_SENT) |
|
|
254 | .reset (FLAG_REMOVED) |
241 | .reset (FLAG_REMOVED) |
255 | .any ()) |
242 | .any ()) |
256 | return 0; |
243 | return 0; |
257 | |
244 | |
258 | /* This is really a spellbook check - we should in general |
245 | /* This is really a spellbook check - we should in general |
… | |
… | |
340 | { |
327 | { |
341 | // see if we are in a container of sorts |
328 | // see if we are in a container of sorts |
342 | if (env) |
329 | if (env) |
343 | { |
330 | { |
344 | // the player inventory itself is always visible |
331 | // the player inventory itself is always visible |
345 | if (env->type == PLAYER) |
332 | if (env->is_player ()) |
346 | return env; |
333 | return env; |
347 | |
334 | |
348 | // else a player could have our env open |
335 | // else a player could have our env open |
349 | object *envest = env->outer_env (); |
336 | object *envest = env->outer_env_or_self (); |
350 | |
337 | |
351 | // the player itself is always on a map, so we will find him here |
338 | // the player itself is always on a map, so we will find him here |
352 | // even if our inv is in a player. |
339 | // even if our inv is in a player. |
353 | if (envest->is_on_map ()) |
340 | if (envest->is_on_map ()) |
354 | if (object *pl = envest->ms ().player ()) |
341 | if (object *pl = envest->ms ().player ()) |
355 | if (pl->container == env) |
342 | if (pl->container_ () == env) |
356 | return pl; |
343 | return pl; |
357 | } |
344 | } |
358 | else |
345 | else |
359 | { |
346 | { |
360 | // maybe there is a player standing on the same mapspace |
347 | // maybe there is a player standing on the same mapspace |
361 | // this will catch the case where "this" is a player |
348 | // this will catch the case where "this" is a player |
362 | if (object *pl = ms ().player ()) |
349 | if (object *pl = ms ().player ()) |
363 | if (!pl->container || this == pl->container) |
350 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
|
|
351 | || pl->container_ () == this) |
364 | return pl; |
352 | return pl; |
365 | } |
353 | } |
366 | } |
354 | } |
367 | |
355 | |
368 | return 0; |
356 | return 0; |
369 | } |
357 | } |
370 | |
358 | |
371 | // adjust weight per container type ("of holding") |
359 | // adjust weight per container type ("of holding") |
372 | static sint32 |
360 | static sint32 |
373 | weight_adjust (object *op, sint32 weight) |
361 | weight_adjust_for (object *op, sint32 weight) |
374 | { |
362 | { |
375 | return op->type == CONTAINER |
363 | return op->type == CONTAINER |
376 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
364 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
377 | : weight; |
365 | : weight; |
378 | } |
366 | } |
… | |
… | |
384 | static void |
372 | static void |
385 | adjust_weight (object *op, sint32 weight) |
373 | adjust_weight (object *op, sint32 weight) |
386 | { |
374 | { |
387 | while (op) |
375 | while (op) |
388 | { |
376 | { |
|
|
377 | // adjust by actual difference to account for rounding errors |
|
|
378 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
389 | weight = weight_adjust (op, weight); |
379 | weight = weight_adjust_for (op, op->carrying) |
|
|
380 | - weight_adjust_for (op, op->carrying - weight); |
390 | |
381 | |
391 | if (!weight) |
382 | if (!weight) |
392 | return; |
383 | return; |
393 | |
384 | |
394 | op->carrying += weight; |
385 | op->carrying += weight; |
… | |
… | |
417 | op->update_weight (); |
408 | op->update_weight (); |
418 | |
409 | |
419 | sum += op->total_weight (); |
410 | sum += op->total_weight (); |
420 | } |
411 | } |
421 | |
412 | |
422 | sum = weight_adjust (this, sum); |
413 | sum = weight_adjust_for (this, sum); |
423 | |
414 | |
424 | if (sum != carrying) |
415 | if (sum != carrying) |
425 | { |
416 | { |
426 | carrying = sum; |
417 | carrying = sum; |
427 | |
418 | |
… | |
… | |
441 | return strdup ("[NULLOBJ]"); |
432 | return strdup ("[NULLOBJ]"); |
442 | |
433 | |
443 | object_freezer freezer; |
434 | object_freezer freezer; |
444 | op->write (freezer); |
435 | op->write (freezer); |
445 | return freezer.as_string (); |
436 | return freezer.as_string (); |
|
|
437 | } |
|
|
438 | |
|
|
439 | char * |
|
|
440 | object::as_string () |
|
|
441 | { |
|
|
442 | return dump_object (this); |
446 | } |
443 | } |
447 | |
444 | |
448 | /* |
445 | /* |
449 | * get_nearest_part(multi-object, object 2) returns the part of the |
446 | * get_nearest_part(multi-object, object 2) returns the part of the |
450 | * multi-object 1 which is closest to the second object. |
447 | * multi-object 1 which is closest to the second object. |
… | |
… | |
489 | */ |
486 | */ |
490 | object * |
487 | object * |
491 | find_object_name (const char *str) |
488 | find_object_name (const char *str) |
492 | { |
489 | { |
493 | shstr_cmp str_ (str); |
490 | shstr_cmp str_ (str); |
494 | object *op; |
|
|
495 | |
491 | |
|
|
492 | if (str_) |
496 | for_all_objects (op) |
493 | for_all_objects (op) |
497 | if (op->name == str_) |
494 | if (op->name == str_) |
498 | break; |
495 | return op; |
499 | |
496 | |
500 | return op; |
497 | return 0; |
501 | } |
498 | } |
502 | |
499 | |
503 | /* |
500 | /* |
504 | * Sets the owner and sets the skill and exp pointers to owner's current |
501 | * Sets the owner and sets the skill and exp pointers to owner's current |
505 | * skill and experience objects. |
502 | * skill and experience objects. |
… | |
… | |
567 | update_stats (); |
564 | update_stats (); |
568 | |
565 | |
569 | new_draw_info_format (NDI_UNIQUE, 0, this, |
566 | new_draw_info_format (NDI_UNIQUE, 0, this, |
570 | "You try to balance all your items at once, " |
567 | "You try to balance all your items at once, " |
571 | "but the %s is just too much for your body. " |
568 | "but the %s is just too much for your body. " |
572 | "[You need to unapply some items first.]", &ob->name); |
569 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
570 | "how many items you cna wera on a specific body part.]", &ob->name); |
573 | return false; |
571 | return false; |
574 | } |
572 | } |
575 | |
573 | |
576 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
574 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
577 | } |
575 | } |
… | |
… | |
603 | } |
601 | } |
604 | |
602 | |
605 | op->key_values = 0; |
603 | op->key_values = 0; |
606 | } |
604 | } |
607 | |
605 | |
608 | object & |
606 | /* |
609 | object::operator =(const object &src) |
607 | * copy_to first frees everything allocated by the dst object, |
|
|
608 | * and then copies the contents of itself into the second |
|
|
609 | * object, allocating what needs to be allocated. Basically, any |
|
|
610 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
611 | * if the first object is freed, the pointers in the new object |
|
|
612 | * will point at garbage. |
|
|
613 | */ |
|
|
614 | void |
|
|
615 | object::copy_to (object *dst) |
610 | { |
616 | { |
611 | bool is_freed = flag [FLAG_FREED]; |
617 | dst->remove (); |
612 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
613 | |
|
|
614 | *(object_copy *)this = src; |
618 | *(object_copy *)dst = *this; |
615 | |
|
|
616 | flag [FLAG_FREED] = is_freed; |
|
|
617 | flag [FLAG_REMOVED] = is_removed; |
619 | dst->flag [FLAG_REMOVED] = true; |
618 | |
620 | |
619 | /* Copy over key_values, if any. */ |
621 | /* Copy over key_values, if any. */ |
620 | if (src.key_values) |
622 | if (key_values) |
621 | { |
623 | { |
622 | key_value *tail = 0; |
624 | key_value *tail = 0; |
623 | key_values = 0; |
625 | dst->key_values = 0; |
624 | |
626 | |
625 | for (key_value *i = src.key_values; i; i = i->next) |
627 | for (key_value *i = key_values; i; i = i->next) |
626 | { |
628 | { |
627 | key_value *new_link = new key_value; |
629 | key_value *new_link = new key_value; |
628 | |
630 | |
629 | new_link->next = 0; |
631 | new_link->next = 0; |
630 | new_link->key = i->key; |
632 | new_link->key = i->key; |
631 | new_link->value = i->value; |
633 | new_link->value = i->value; |
632 | |
634 | |
633 | /* Try and be clever here, too. */ |
635 | /* Try and be clever here, too. */ |
634 | if (!key_values) |
636 | if (!dst->key_values) |
635 | { |
637 | { |
636 | key_values = new_link; |
638 | dst->key_values = new_link; |
637 | tail = new_link; |
639 | tail = new_link; |
638 | } |
640 | } |
639 | else |
641 | else |
640 | { |
642 | { |
641 | tail->next = new_link; |
643 | tail->next = new_link; |
642 | tail = new_link; |
644 | tail = new_link; |
643 | } |
645 | } |
644 | } |
646 | } |
645 | } |
647 | } |
646 | } |
|
|
647 | |
|
|
648 | /* |
|
|
649 | * copy_to first frees everything allocated by the dst object, |
|
|
650 | * and then copies the contents of itself into the second |
|
|
651 | * object, allocating what needs to be allocated. Basically, any |
|
|
652 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
653 | * if the first object is freed, the pointers in the new object |
|
|
654 | * will point at garbage. |
|
|
655 | */ |
|
|
656 | void |
|
|
657 | object::copy_to (object *dst) |
|
|
658 | { |
|
|
659 | *dst = *this; |
|
|
660 | |
648 | |
661 | if (speed < 0) |
649 | if (speed < 0) |
662 | dst->speed_left -= rndm (); |
650 | dst->speed_left -= rndm (); |
663 | |
651 | |
664 | dst->set_speed (dst->speed); |
652 | dst->activate (); |
665 | } |
653 | } |
666 | |
654 | |
667 | void |
655 | void |
668 | object::instantiate () |
656 | object::instantiate () |
669 | { |
657 | { |
… | |
… | |
686 | object * |
674 | object * |
687 | object::clone () |
675 | object::clone () |
688 | { |
676 | { |
689 | object *neu = create (); |
677 | object *neu = create (); |
690 | copy_to (neu); |
678 | copy_to (neu); |
|
|
679 | neu->map = map; // not copied by copy_to |
691 | return neu; |
680 | return neu; |
692 | } |
681 | } |
693 | |
682 | |
694 | /* |
683 | /* |
695 | * If an object with the IS_TURNABLE() flag needs to be turned due |
684 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
746 | * UP_OBJ_FACE: only the objects face has changed. |
735 | * UP_OBJ_FACE: only the objects face has changed. |
747 | */ |
736 | */ |
748 | void |
737 | void |
749 | update_object (object *op, int action) |
738 | update_object (object *op, int action) |
750 | { |
739 | { |
751 | if (op == NULL) |
740 | if (!op) |
752 | { |
741 | { |
753 | /* this should never happen */ |
742 | /* this should never happen */ |
754 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
743 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
755 | return; |
744 | return; |
756 | } |
745 | } |
757 | |
746 | |
758 | if (op->env) |
747 | if (!op->is_on_map ()) |
759 | { |
748 | { |
760 | /* Animation is currently handled by client, so nothing |
749 | /* Animation is currently handled by client, so nothing |
761 | * to do in this case. |
750 | * to do in this case. |
762 | */ |
751 | */ |
763 | return; |
752 | return; |
764 | } |
753 | } |
765 | |
|
|
766 | /* If the map is saving, don't do anything as everything is |
|
|
767 | * going to get freed anyways. |
|
|
768 | */ |
|
|
769 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
770 | return; |
|
|
771 | |
754 | |
772 | /* make sure the object is within map boundaries */ |
755 | /* make sure the object is within map boundaries */ |
773 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
756 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
774 | { |
757 | { |
775 | LOG (llevError, "update_object() called for object out of map!\n"); |
758 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
786 | else if (action == UP_OBJ_INSERT) |
769 | else if (action == UP_OBJ_INSERT) |
787 | { |
770 | { |
788 | // this is likely overkill, TODO: revisit (schmorp) |
771 | // this is likely overkill, TODO: revisit (schmorp) |
789 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
772 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
790 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
773 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
791 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
774 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
792 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
775 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
793 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
776 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
794 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
777 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
795 | || (m.move_on | op->move_on ) != m.move_on |
778 | || (m.move_on | op->move_on ) != m.move_on |
796 | || (m.move_off | op->move_off ) != m.move_off |
779 | || (m.move_off | op->move_off ) != m.move_off |
797 | || (m.move_slow | op->move_slow) != m.move_slow |
780 | || (m.move_slow | op->move_slow) != m.move_slow |
798 | /* This isn't perfect, but I don't expect a lot of objects to |
781 | /* This isn't perfect, but I don't expect a lot of objects to |
799 | * to have move_allow right now. |
782 | * have move_allow right now. |
800 | */ |
783 | */ |
801 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
784 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
802 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
785 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
803 | m.flags_ = 0; |
786 | m.invalidate (); |
804 | } |
787 | } |
805 | /* if the object is being removed, we can't make intelligent |
788 | /* if the object is being removed, we can't make intelligent |
806 | * decisions, because remove_ob can't really pass the object |
789 | * decisions, because remove_ob can't really pass the object |
807 | * that is being removed. |
790 | * that is being removed. |
808 | */ |
791 | */ |
809 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
792 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
810 | m.flags_ = 0; |
793 | m.invalidate (); |
811 | else if (action == UP_OBJ_FACE) |
794 | else if (action == UP_OBJ_FACE) |
812 | /* Nothing to do for that case */ ; |
795 | /* Nothing to do for that case */ ; |
813 | else |
796 | else |
814 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
797 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
815 | |
798 | |
… | |
… | |
819 | |
802 | |
820 | object::object () |
803 | object::object () |
821 | { |
804 | { |
822 | SET_FLAG (this, FLAG_REMOVED); |
805 | SET_FLAG (this, FLAG_REMOVED); |
823 | |
806 | |
824 | expmul = 1.0; |
807 | //expmul = 1.0; declared const for the time being |
825 | face = blank_face; |
808 | face = blank_face; |
826 | } |
809 | } |
827 | |
810 | |
828 | object::~object () |
811 | object::~object () |
829 | { |
812 | { |
… | |
… | |
859 | /* If already on active list, don't do anything */ |
842 | /* If already on active list, don't do anything */ |
860 | if (active) |
843 | if (active) |
861 | return; |
844 | return; |
862 | |
845 | |
863 | if (has_active_speed ()) |
846 | if (has_active_speed ()) |
|
|
847 | { |
|
|
848 | if (flag [FLAG_FREED]) |
|
|
849 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
850 | |
864 | actives.insert (this); |
851 | actives.insert (this); |
|
|
852 | } |
865 | } |
853 | } |
866 | |
854 | |
867 | void |
855 | void |
868 | object::activate_recursive () |
856 | object::activate_recursive () |
869 | { |
857 | { |
… | |
… | |
930 | * drop on that space. |
918 | * drop on that space. |
931 | */ |
919 | */ |
932 | if (!drop_to_ground |
920 | if (!drop_to_ground |
933 | || !map |
921 | || !map |
934 | || map->in_memory != MAP_ACTIVE |
922 | || map->in_memory != MAP_ACTIVE |
935 | || map->nodrop |
923 | || map->no_drop |
936 | || ms ().move_block == MOVE_ALL) |
924 | || ms ().move_block == MOVE_ALL) |
937 | { |
925 | { |
938 | while (inv) |
926 | while (inv) |
939 | { |
|
|
940 | inv->destroy_inv (false); |
|
|
941 | inv->destroy (); |
927 | inv->destroy (); |
942 | } |
|
|
943 | } |
928 | } |
944 | else |
929 | else |
945 | { /* Put objects in inventory onto this space */ |
930 | { /* Put objects in inventory onto this space */ |
946 | while (inv) |
931 | while (inv) |
947 | { |
932 | { |
… | |
… | |
951 | || op->flag [FLAG_NO_DROP] |
936 | || op->flag [FLAG_NO_DROP] |
952 | || op->type == RUNE |
937 | || op->type == RUNE |
953 | || op->type == TRAP |
938 | || op->type == TRAP |
954 | || op->flag [FLAG_IS_A_TEMPLATE] |
939 | || op->flag [FLAG_IS_A_TEMPLATE] |
955 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
940 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
956 | op->destroy (true); |
941 | op->destroy (); |
957 | else |
942 | else |
958 | map->insert (op, x, y); |
943 | map->insert (op, x, y); |
959 | } |
944 | } |
960 | } |
945 | } |
961 | } |
946 | } |
… | |
… | |
965 | object *op = new object; |
950 | object *op = new object; |
966 | op->link (); |
951 | op->link (); |
967 | return op; |
952 | return op; |
968 | } |
953 | } |
969 | |
954 | |
|
|
955 | static struct freed_map : maptile |
|
|
956 | { |
|
|
957 | freed_map () |
|
|
958 | { |
|
|
959 | path = "<freed objects map>"; |
|
|
960 | name = "/internal/freed_objects_map"; |
|
|
961 | width = 3; |
|
|
962 | height = 3; |
|
|
963 | no_drop = 1; |
|
|
964 | no_reset = 1; |
|
|
965 | |
|
|
966 | alloc (); |
|
|
967 | in_memory = MAP_ACTIVE; |
|
|
968 | } |
|
|
969 | |
|
|
970 | ~freed_map () |
|
|
971 | { |
|
|
972 | destroy (); |
|
|
973 | } |
|
|
974 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
975 | |
970 | void |
976 | void |
971 | object::do_destroy () |
977 | object::do_destroy () |
972 | { |
978 | { |
973 | if (flag [FLAG_IS_LINKED]) |
979 | if (flag [FLAG_IS_LINKED]) |
974 | remove_button_link (this); |
980 | remove_link (); |
975 | |
981 | |
976 | if (flag [FLAG_FRIENDLY]) |
982 | if (flag [FLAG_FRIENDLY]) |
977 | remove_friendly_object (this); |
983 | remove_friendly_object (this); |
978 | |
984 | |
979 | remove (); |
985 | remove (); |
… | |
… | |
984 | unlink (); |
990 | unlink (); |
985 | |
991 | |
986 | flag [FLAG_FREED] = 1; |
992 | flag [FLAG_FREED] = 1; |
987 | |
993 | |
988 | // hack to ensure that freed objects still have a valid map |
994 | // hack to ensure that freed objects still have a valid map |
989 | { |
|
|
990 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
991 | |
|
|
992 | if (!freed_map) |
|
|
993 | { |
|
|
994 | freed_map = new maptile; |
|
|
995 | |
|
|
996 | freed_map->path = "<freed objects map>"; |
|
|
997 | freed_map->name = "/internal/freed_objects_map"; |
|
|
998 | freed_map->width = 3; |
|
|
999 | freed_map->height = 3; |
|
|
1000 | freed_map->nodrop = 1; |
|
|
1001 | |
|
|
1002 | freed_map->alloc (); |
|
|
1003 | freed_map->in_memory = MAP_ACTIVE; |
|
|
1004 | } |
|
|
1005 | |
|
|
1006 | map = freed_map; |
995 | map = &freed_map; |
1007 | x = 1; |
996 | x = 1; |
1008 | y = 1; |
997 | y = 1; |
1009 | } |
|
|
1010 | |
998 | |
1011 | if (more) |
999 | if (more) |
1012 | { |
1000 | { |
1013 | more->destroy (); |
1001 | more->destroy (); |
1014 | more = 0; |
1002 | more = 0; |
… | |
… | |
1022 | attacked_by = 0; |
1010 | attacked_by = 0; |
1023 | current_weapon = 0; |
1011 | current_weapon = 0; |
1024 | } |
1012 | } |
1025 | |
1013 | |
1026 | void |
1014 | void |
1027 | object::destroy (bool destroy_inventory) |
1015 | object::destroy () |
1028 | { |
1016 | { |
1029 | if (destroyed ()) |
1017 | if (destroyed ()) |
1030 | return; |
1018 | return; |
1031 | |
1019 | |
1032 | if (!is_head () && !head->destroyed ()) |
1020 | if (!is_head () && !head->destroyed ()) |
1033 | { |
1021 | { |
1034 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1022 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1035 | head->destroy (destroy_inventory); |
1023 | head->destroy (); |
|
|
1024 | return; |
1036 | } |
1025 | } |
1037 | |
1026 | |
1038 | destroy_inv (!destroy_inventory); |
1027 | destroy_inv (false); |
1039 | |
1028 | |
1040 | if (is_head ()) |
1029 | if (is_head ()) |
1041 | if (sound_destroy) |
1030 | if (sound_destroy) |
1042 | play_sound (sound_destroy); |
1031 | play_sound (sound_destroy); |
1043 | else if (flag [FLAG_MONSTER]) |
1032 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1054 | * the previous environment. |
1043 | * the previous environment. |
1055 | */ |
1044 | */ |
1056 | void |
1045 | void |
1057 | object::do_remove () |
1046 | object::do_remove () |
1058 | { |
1047 | { |
1059 | object *tmp, *last = 0; |
|
|
1060 | object *otmp; |
|
|
1061 | |
|
|
1062 | if (flag [FLAG_REMOVED]) |
1048 | if (flag [FLAG_REMOVED]) |
1063 | return; |
1049 | return; |
1064 | |
1050 | |
1065 | INVOKE_OBJECT (REMOVE, this); |
1051 | INVOKE_OBJECT (REMOVE, this); |
1066 | |
1052 | |
… | |
… | |
1080 | esrv_del_item (pl->contr, count); |
1066 | esrv_del_item (pl->contr, count); |
1081 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1067 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1082 | |
1068 | |
1083 | adjust_weight (env, -total_weight ()); |
1069 | adjust_weight (env, -total_weight ()); |
1084 | |
1070 | |
1085 | *(above ? &above->below : &env->inv) = below; |
1071 | object *pl = in_player (); |
1086 | |
|
|
1087 | if (below) |
|
|
1088 | below->above = above; |
|
|
1089 | |
1072 | |
1090 | /* we set up values so that it could be inserted into |
1073 | /* we set up values so that it could be inserted into |
1091 | * the map, but we don't actually do that - it is up |
1074 | * the map, but we don't actually do that - it is up |
1092 | * to the caller to decide what we want to do. |
1075 | * to the caller to decide what we want to do. |
1093 | */ |
1076 | */ |
1094 | map = env->map; |
1077 | map = env->map; |
1095 | x = env->x; |
1078 | x = env->x; |
1096 | y = env->y; |
1079 | y = env->y; |
|
|
1080 | |
|
|
1081 | // make sure cmov optimisation is applicable |
|
|
1082 | *(above ? &above->below : &env->inv) = below; |
|
|
1083 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1084 | |
1097 | above = 0; |
1085 | above = 0; |
1098 | below = 0; |
1086 | below = 0; |
1099 | env = 0; |
1087 | env = 0; |
1100 | |
1088 | |
1101 | /* NO_FIX_PLAYER is set when a great many changes are being |
1089 | /* NO_FIX_PLAYER is set when a great many changes are being |
1102 | * made to players inventory. If set, avoiding the call |
1090 | * made to players inventory. If set, avoiding the call |
1103 | * to save cpu time. |
1091 | * to save cpu time. |
1104 | */ |
1092 | */ |
1105 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1093 | if (pl) |
|
|
1094 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1095 | { |
1106 | otmp->update_stats (); |
1096 | pl->update_stats (); |
|
|
1097 | |
|
|
1098 | if (glow_radius && pl->is_on_map ()) |
|
|
1099 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1100 | } |
1107 | } |
1101 | } |
1108 | else if (map) |
1102 | else if (map) |
1109 | { |
1103 | { |
1110 | map->dirty = true; |
1104 | map->dirty = true; |
1111 | mapspace &ms = this->ms (); |
1105 | mapspace &ms = this->ms (); |
1112 | |
1106 | |
1113 | if (object *pl = ms.player ()) |
1107 | if (object *pl = ms.player ()) |
1114 | { |
1108 | { |
1115 | if (type == PLAYER) // this == pl(!) |
1109 | if (is_player ()) |
1116 | { |
1110 | { |
|
|
1111 | if (!flag [FLAG_WIZPASS]) |
|
|
1112 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1113 | |
1117 | // leaving a spot always closes any open container on the ground |
1114 | // leaving a spot always closes any open container on the ground |
1118 | if (container && !container->env) |
1115 | if (container && !container->env) |
1119 | // this causes spurious floorbox updates, but it ensures |
1116 | // this causes spurious floorbox updates, but it ensures |
1120 | // that the CLOSE event is being sent. |
1117 | // that the CLOSE event is being sent. |
1121 | close_container (); |
1118 | close_container (); |
1122 | |
1119 | |
1123 | --map->players; |
1120 | --map->players; |
1124 | map->touch (); |
1121 | map->touch (); |
1125 | } |
1122 | } |
1126 | else if (pl->container == this) |
1123 | else if (pl->container_ () == this) |
1127 | { |
1124 | { |
1128 | // removing a container should close it |
1125 | // removing a container should close it |
1129 | close_container (); |
1126 | close_container (); |
1130 | } |
1127 | } |
1131 | |
1128 | |
1132 | esrv_del_item (pl->contr, count); |
1129 | esrv_del_item (pl->contr, count); |
1133 | } |
1130 | } |
1134 | |
1131 | |
1135 | /* link the object above us */ |
1132 | /* link the object above us */ |
1136 | if (above) |
1133 | // re-link, make sure compiler can easily use cmove |
1137 | above->below = below; |
1134 | *(above ? &above->below : &ms.top) = below; |
1138 | else |
1135 | *(below ? &below->above : &ms.bot) = above; |
1139 | ms.top = below; /* we were top, set new top */ |
|
|
1140 | |
|
|
1141 | /* Relink the object below us, if there is one */ |
|
|
1142 | if (below) |
|
|
1143 | below->above = above; |
|
|
1144 | else |
|
|
1145 | { |
|
|
1146 | /* Nothing below, which means we need to relink map object for this space |
|
|
1147 | * use translated coordinates in case some oddness with map tiling is |
|
|
1148 | * evident |
|
|
1149 | */ |
|
|
1150 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1151 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
1152 | |
|
|
1153 | ms.bot = above; /* goes on above it. */ |
|
|
1154 | } |
|
|
1155 | |
1136 | |
1156 | above = 0; |
1137 | above = 0; |
1157 | below = 0; |
1138 | below = 0; |
1158 | |
1139 | |
|
|
1140 | ms.invalidate (); |
|
|
1141 | |
1159 | if (map->in_memory == MAP_SAVING) |
1142 | if (map->in_memory == MAP_SAVING) |
1160 | return; |
1143 | return; |
1161 | |
1144 | |
1162 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1145 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1163 | |
1146 | |
1164 | if (object *pl = ms.player ()) |
1147 | if (object *pl = ms.player ()) |
1165 | { |
1148 | { |
1166 | if (pl->container == this) |
1149 | if (pl->container_ () == this) |
1167 | /* If a container that the player is currently using somehow gets |
1150 | /* If a container that the player is currently using somehow gets |
1168 | * removed (most likely destroyed), update the player view |
1151 | * removed (most likely destroyed), update the player view |
1169 | * appropriately. |
1152 | * appropriately. |
1170 | */ |
1153 | */ |
1171 | pl->close_container (); |
1154 | pl->close_container (); |
1172 | |
1155 | |
1173 | //TODO: the floorbox prev/next might need updating |
1156 | //TODO: the floorbox prev/next might need updating |
1174 | esrv_del_item (pl->contr, count); |
1157 | //esrv_del_item (pl->contr, count); |
|
|
1158 | //TODO: update floorbox to preserve ordering |
|
|
1159 | if (pl->contr->ns) |
|
|
1160 | pl->contr->ns->floorbox_update (); |
1175 | } |
1161 | } |
1176 | |
1162 | |
|
|
1163 | if (check_walk_off) |
1177 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1164 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1178 | { |
1165 | { |
|
|
1166 | above = tmp->above; |
|
|
1167 | |
1179 | /* No point updating the players look faces if he is the object |
1168 | /* No point updating the players look faces if he is the object |
1180 | * being removed. |
1169 | * being removed. |
1181 | */ |
1170 | */ |
1182 | |
1171 | |
1183 | /* See if object moving off should effect something */ |
1172 | /* See if object moving off should effect something */ |
1184 | if (check_walk_off |
|
|
1185 | && ((move_type & tmp->move_off) |
1173 | if ((move_type & tmp->move_off) |
1186 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1174 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1187 | { |
|
|
1188 | move_apply (tmp, this, 0); |
1175 | move_apply (tmp, this, 0); |
1189 | |
|
|
1190 | if (destroyed ()) |
|
|
1191 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1192 | } |
1176 | } |
1193 | |
1177 | |
1194 | last = tmp; |
1178 | if (affects_los ()) |
1195 | } |
|
|
1196 | |
|
|
1197 | /* last == NULL if there are no objects on this space */ |
|
|
1198 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1199 | if (!last) |
|
|
1200 | map->at (x, y).flags_ = 0; |
|
|
1201 | else |
|
|
1202 | update_object (last, UP_OBJ_REMOVE); |
|
|
1203 | |
|
|
1204 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1205 | update_all_los (map, x, y); |
1179 | update_all_los (map, x, y); |
1206 | } |
1180 | } |
1207 | } |
1181 | } |
1208 | |
1182 | |
1209 | /* |
1183 | /* |
… | |
… | |
1233 | esrv_update_item (UPD_NROF, pl, top); |
1207 | esrv_update_item (UPD_NROF, pl, top); |
1234 | |
1208 | |
1235 | op->weight = 0; // cancel the addition above |
1209 | op->weight = 0; // cancel the addition above |
1236 | op->carrying = 0; // must be 0 already |
1210 | op->carrying = 0; // must be 0 already |
1237 | |
1211 | |
1238 | op->destroy (1); |
1212 | op->destroy (); |
1239 | |
1213 | |
1240 | return top; |
1214 | return top; |
1241 | } |
1215 | } |
1242 | |
1216 | |
1243 | return 0; |
1217 | return 0; |
… | |
… | |
1271 | * job preparing multi-part monsters. |
1245 | * job preparing multi-part monsters. |
1272 | */ |
1246 | */ |
1273 | object * |
1247 | object * |
1274 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1248 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1275 | { |
1249 | { |
|
|
1250 | op->remove (); |
|
|
1251 | |
1276 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1252 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1277 | { |
1253 | { |
1278 | tmp->x = x + tmp->arch->x; |
1254 | tmp->x = x + tmp->arch->x; |
1279 | tmp->y = y + tmp->arch->y; |
1255 | tmp->y = y + tmp->arch->y; |
1280 | } |
1256 | } |
… | |
… | |
1303 | * just 'op' otherwise |
1279 | * just 'op' otherwise |
1304 | */ |
1280 | */ |
1305 | object * |
1281 | object * |
1306 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1282 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1307 | { |
1283 | { |
1308 | assert (!op->flag [FLAG_FREED]); |
|
|
1309 | |
|
|
1310 | op->remove (); |
1284 | op->remove (); |
|
|
1285 | |
|
|
1286 | if (m == &freed_map)//D TODO: remove soon |
|
|
1287 | {//D |
|
|
1288 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1289 | }//D |
1311 | |
1290 | |
1312 | /* Ideally, the caller figures this out. However, it complicates a lot |
1291 | /* Ideally, the caller figures this out. However, it complicates a lot |
1313 | * of areas of callers (eg, anything that uses find_free_spot would now |
1292 | * of areas of callers (eg, anything that uses find_free_spot would now |
1314 | * need extra work |
1293 | * need extra work |
1315 | */ |
1294 | */ |
|
|
1295 | maptile *newmap = m; |
1316 | if (!xy_normalise (m, op->x, op->y)) |
1296 | if (!xy_normalise (newmap, op->x, op->y)) |
1317 | { |
1297 | { |
1318 | op->destroy (1); |
1298 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1319 | return 0; |
1299 | return 0; |
1320 | } |
1300 | } |
1321 | |
1301 | |
1322 | if (object *more = op->more) |
1302 | if (object *more = op->more) |
1323 | if (!insert_ob_in_map (more, m, originator, flag)) |
1303 | if (!insert_ob_in_map (more, m, originator, flag)) |
1324 | return 0; |
1304 | return 0; |
1325 | |
1305 | |
1326 | CLEAR_FLAG (op, FLAG_REMOVED); |
1306 | op->flag [FLAG_REMOVED] = false; |
1327 | |
1307 | op->env = 0; |
1328 | op->map = m; |
1308 | op->map = newmap; |
|
|
1309 | |
1329 | mapspace &ms = op->ms (); |
1310 | mapspace &ms = op->ms (); |
1330 | |
1311 | |
1331 | /* this has to be done after we translate the coordinates. |
1312 | /* this has to be done after we translate the coordinates. |
1332 | */ |
1313 | */ |
1333 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1314 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1334 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1315 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1335 | if (object::can_merge (op, tmp)) |
1316 | if (object::can_merge (op, tmp)) |
1336 | { |
1317 | { |
1337 | // TODO: we atcually want to update tmp, not op, |
1318 | // TODO: we actually want to update tmp, not op, |
1338 | // but some caller surely breaks when we return tmp |
1319 | // but some caller surely breaks when we return tmp |
1339 | // from here :/ |
1320 | // from here :/ |
1340 | op->nrof += tmp->nrof; |
1321 | op->nrof += tmp->nrof; |
1341 | tmp->destroy (1); |
1322 | tmp->destroy (); |
1342 | } |
1323 | } |
1343 | |
1324 | |
1344 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1325 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1345 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1326 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1346 | |
1327 | |
… | |
… | |
1353 | { |
1334 | { |
1354 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1335 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1355 | abort (); |
1336 | abort (); |
1356 | } |
1337 | } |
1357 | |
1338 | |
|
|
1339 | if (!originator->is_on_map ()) |
|
|
1340 | { |
|
|
1341 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1342 | op->debug_desc (), originator->debug_desc ()); |
|
|
1343 | abort (); |
|
|
1344 | } |
|
|
1345 | |
1358 | op->above = originator; |
1346 | op->above = originator; |
1359 | op->below = originator->below; |
1347 | op->below = originator->below; |
1360 | |
|
|
1361 | if (op->below) |
|
|
1362 | op->below->above = op; |
|
|
1363 | else |
|
|
1364 | ms.bot = op; |
|
|
1365 | |
|
|
1366 | /* since *below* originator, no need to update top */ |
|
|
1367 | originator->below = op; |
1348 | originator->below = op; |
|
|
1349 | |
|
|
1350 | *(op->below ? &op->below->above : &ms.bot) = op; |
1368 | } |
1351 | } |
1369 | else |
1352 | else |
1370 | { |
1353 | { |
1371 | object *top, *floor = NULL; |
1354 | object *floor = 0; |
1372 | |
1355 | object *top = ms.top; |
1373 | top = ms.bot; |
|
|
1374 | |
1356 | |
1375 | /* If there are other objects, then */ |
1357 | /* If there are other objects, then */ |
1376 | if (top) |
1358 | if (top) |
1377 | { |
1359 | { |
1378 | object *last = 0; |
|
|
1379 | |
|
|
1380 | /* |
1360 | /* |
1381 | * If there are multiple objects on this space, we do some trickier handling. |
1361 | * If there are multiple objects on this space, we do some trickier handling. |
1382 | * We've already dealt with merging if appropriate. |
1362 | * We've already dealt with merging if appropriate. |
1383 | * Generally, we want to put the new object on top. But if |
1363 | * Generally, we want to put the new object on top. But if |
1384 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1364 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1387 | * once we get to them. This reduces the need to traverse over all of |
1367 | * once we get to them. This reduces the need to traverse over all of |
1388 | * them when adding another one - this saves quite a bit of cpu time |
1368 | * them when adding another one - this saves quite a bit of cpu time |
1389 | * when lots of spells are cast in one area. Currently, it is presumed |
1369 | * when lots of spells are cast in one area. Currently, it is presumed |
1390 | * that flying non pickable objects are spell objects. |
1370 | * that flying non pickable objects are spell objects. |
1391 | */ |
1371 | */ |
1392 | for (top = ms.bot; top; top = top->above) |
1372 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1393 | { |
1373 | { |
1394 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1374 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1395 | floor = top; |
1375 | floor = tmp; |
1396 | |
1376 | |
1397 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1377 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1398 | { |
1378 | { |
1399 | /* We insert above top, so we want this object below this */ |
1379 | /* We insert above top, so we want this object below this */ |
1400 | top = top->below; |
1380 | top = tmp->below; |
1401 | break; |
1381 | break; |
1402 | } |
1382 | } |
1403 | |
1383 | |
1404 | last = top; |
1384 | top = tmp; |
1405 | } |
1385 | } |
1406 | |
|
|
1407 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1408 | top = last; |
|
|
1409 | |
1386 | |
1410 | /* We let update_position deal with figuring out what the space |
1387 | /* We let update_position deal with figuring out what the space |
1411 | * looks like instead of lots of conditions here. |
1388 | * looks like instead of lots of conditions here. |
1412 | * makes things faster, and effectively the same result. |
1389 | * makes things faster, and effectively the same result. |
1413 | */ |
1390 | */ |
… | |
… | |
1420 | */ |
1397 | */ |
1421 | if (!(flag & INS_ON_TOP) |
1398 | if (!(flag & INS_ON_TOP) |
1422 | && ms.flags () & P_BLOCKSVIEW |
1399 | && ms.flags () & P_BLOCKSVIEW |
1423 | && (op->face && !faces [op->face].visibility)) |
1400 | && (op->face && !faces [op->face].visibility)) |
1424 | { |
1401 | { |
|
|
1402 | object *last; |
|
|
1403 | |
1425 | for (last = top; last != floor; last = last->below) |
1404 | for (last = top; last != floor; last = last->below) |
1426 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1405 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1427 | break; |
1406 | break; |
1428 | |
1407 | |
1429 | /* Check to see if we found the object that blocks view, |
1408 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1437 | } /* If objects on this space */ |
1416 | } /* If objects on this space */ |
1438 | |
1417 | |
1439 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1418 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1440 | top = floor; |
1419 | top = floor; |
1441 | |
1420 | |
1442 | /* Top is the object that our object (op) is going to get inserted above. |
1421 | // insert object above top, or bottom-most if top = 0 |
1443 | */ |
|
|
1444 | |
|
|
1445 | /* First object on this space */ |
|
|
1446 | if (!top) |
1422 | if (!top) |
1447 | { |
1423 | { |
|
|
1424 | op->below = 0; |
1448 | op->above = ms.bot; |
1425 | op->above = ms.bot; |
1449 | |
|
|
1450 | if (op->above) |
|
|
1451 | op->above->below = op; |
|
|
1452 | |
|
|
1453 | op->below = 0; |
|
|
1454 | ms.bot = op; |
1426 | ms.bot = op; |
|
|
1427 | |
|
|
1428 | *(op->above ? &op->above->below : &ms.top) = op; |
1455 | } |
1429 | } |
1456 | else |
1430 | else |
1457 | { /* get inserted into the stack above top */ |
1431 | { |
1458 | op->above = top->above; |
1432 | op->above = top->above; |
1459 | |
|
|
1460 | if (op->above) |
|
|
1461 | op->above->below = op; |
1433 | top->above = op; |
1462 | |
1434 | |
1463 | op->below = top; |
1435 | op->below = top; |
1464 | top->above = op; |
1436 | *(op->above ? &op->above->below : &ms.top) = op; |
1465 | } |
1437 | } |
|
|
1438 | } |
1466 | |
1439 | |
1467 | if (!op->above) |
1440 | if (op->is_player ()) |
1468 | ms.top = op; |
|
|
1469 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1470 | |
|
|
1471 | if (op->type == PLAYER) |
|
|
1472 | { |
1441 | { |
1473 | op->contr->do_los = 1; |
1442 | op->contr->do_los = 1; |
1474 | ++op->map->players; |
1443 | ++op->map->players; |
1475 | op->map->touch (); |
1444 | op->map->touch (); |
1476 | } |
1445 | } |
1477 | |
1446 | |
1478 | op->map->dirty = true; |
1447 | op->map->dirty = true; |
1479 | |
1448 | |
1480 | if (object *pl = ms.player ()) |
1449 | if (object *pl = ms.player ()) |
1481 | //TODO: the floorbox prev/next might need updating |
1450 | //TODO: the floorbox prev/next might need updating |
1482 | esrv_send_item (pl, op); |
1451 | //esrv_send_item (pl, op); |
|
|
1452 | //TODO: update floorbox to preserve ordering |
|
|
1453 | if (pl->contr->ns) |
|
|
1454 | pl->contr->ns->floorbox_update (); |
1483 | |
1455 | |
1484 | /* If this object glows, it may affect lighting conditions that are |
1456 | /* If this object glows, it may affect lighting conditions that are |
1485 | * visible to others on this map. But update_all_los is really |
1457 | * visible to others on this map. But update_all_los is really |
1486 | * an inefficient way to do this, as it means los for all players |
1458 | * an inefficient way to do this, as it means los for all players |
1487 | * on the map will get recalculated. The players could very well |
1459 | * on the map will get recalculated. The players could very well |
1488 | * be far away from this change and not affected in any way - |
1460 | * be far away from this change and not affected in any way - |
1489 | * this should get redone to only look for players within range, |
1461 | * this should get redone to only look for players within range, |
1490 | * or just updating the P_UPTODATE for spaces within this area |
1462 | * or just updating the P_UPTODATE for spaces within this area |
1491 | * of effect may be sufficient. |
1463 | * of effect may be sufficient. |
1492 | */ |
1464 | */ |
1493 | if (op->map->darkness && (op->glow_radius != 0)) |
1465 | if (op->affects_los ()) |
|
|
1466 | { |
|
|
1467 | op->ms ().invalidate (); |
1494 | update_all_los (op->map, op->x, op->y); |
1468 | update_all_los (op->map, op->x, op->y); |
|
|
1469 | } |
1495 | |
1470 | |
1496 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1471 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1497 | update_object (op, UP_OBJ_INSERT); |
1472 | update_object (op, UP_OBJ_INSERT); |
1498 | |
1473 | |
1499 | INVOKE_OBJECT (INSERT, op); |
1474 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1506 | * blocked() and wall() work properly), and these flags are updated by |
1481 | * blocked() and wall() work properly), and these flags are updated by |
1507 | * update_object(). |
1482 | * update_object(). |
1508 | */ |
1483 | */ |
1509 | |
1484 | |
1510 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1485 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1511 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1486 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1512 | { |
1487 | { |
1513 | if (check_move_on (op, originator)) |
1488 | if (check_move_on (op, originator)) |
1514 | return 0; |
1489 | return 0; |
1515 | |
1490 | |
1516 | /* If we are a multi part object, lets work our way through the check |
1491 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1527 | /* this function inserts an object in the map, but if it |
1502 | /* this function inserts an object in the map, but if it |
1528 | * finds an object of its own type, it'll remove that one first. |
1503 | * finds an object of its own type, it'll remove that one first. |
1529 | * op is the object to insert it under: supplies x and the map. |
1504 | * op is the object to insert it under: supplies x and the map. |
1530 | */ |
1505 | */ |
1531 | void |
1506 | void |
1532 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1507 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1533 | { |
1508 | { |
1534 | /* first search for itself and remove any old instances */ |
1509 | /* first search for itself and remove any old instances */ |
1535 | |
1510 | |
1536 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1511 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1537 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1512 | if (tmp->arch->archname == archname) /* same archetype */ |
1538 | tmp->destroy (1); |
1513 | tmp->destroy (); |
1539 | |
1514 | |
1540 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1515 | object *tmp = arch_to_object (archetype::find (archname)); |
1541 | |
1516 | |
1542 | tmp->x = op->x; |
1517 | tmp->x = op->x; |
1543 | tmp->y = op->y; |
1518 | tmp->y = op->y; |
1544 | |
1519 | |
1545 | insert_ob_in_map (tmp, op->map, op, 0); |
1520 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1567 | if (!nr) |
1542 | if (!nr) |
1568 | return true; |
1543 | return true; |
1569 | |
1544 | |
1570 | nr = min (nr, nrof); |
1545 | nr = min (nr, nrof); |
1571 | |
1546 | |
|
|
1547 | if (nrof > nr) |
|
|
1548 | { |
1572 | nrof -= nr; |
1549 | nrof -= nr; |
1573 | |
|
|
1574 | if (nrof) |
|
|
1575 | { |
|
|
1576 | adjust_weight (env, -weight * nr); // carrying == 0 |
1550 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1577 | |
1551 | |
1578 | if (object *pl = visible_to ()) |
1552 | if (object *pl = visible_to ()) |
1579 | esrv_update_item (UPD_NROF, pl, this); |
1553 | esrv_update_item (UPD_NROF, pl, this); |
1580 | |
1554 | |
1581 | return true; |
1555 | return true; |
1582 | } |
1556 | } |
1583 | else |
1557 | else |
1584 | { |
1558 | { |
1585 | destroy (1); |
1559 | destroy (); |
1586 | return false; |
1560 | return false; |
1587 | } |
1561 | } |
1588 | } |
1562 | } |
1589 | |
1563 | |
1590 | /* |
1564 | /* |
… | |
… | |
1607 | } |
1581 | } |
1608 | else |
1582 | else |
1609 | { |
1583 | { |
1610 | decrease (nr); |
1584 | decrease (nr); |
1611 | |
1585 | |
1612 | object *op = object_create_clone (this); |
1586 | object *op = deep_clone (); |
1613 | op->nrof = nr; |
1587 | op->nrof = nr; |
1614 | return op; |
1588 | return op; |
1615 | } |
1589 | } |
1616 | } |
1590 | } |
1617 | |
1591 | |
… | |
… | |
1667 | if (object *pl = tmp->visible_to ()) |
1641 | if (object *pl = tmp->visible_to ()) |
1668 | esrv_update_item (UPD_NROF, pl, tmp); |
1642 | esrv_update_item (UPD_NROF, pl, tmp); |
1669 | |
1643 | |
1670 | adjust_weight (this, op->total_weight ()); |
1644 | adjust_weight (this, op->total_weight ()); |
1671 | |
1645 | |
1672 | op->destroy (1); |
1646 | op->destroy (); |
1673 | op = tmp; |
1647 | op = tmp; |
1674 | goto inserted; |
1648 | goto inserted; |
1675 | } |
1649 | } |
1676 | |
1650 | |
1677 | op->owner = 0; // it's his/hers now. period. |
1651 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1695 | |
1669 | |
1696 | adjust_weight (this, op->total_weight ()); |
1670 | adjust_weight (this, op->total_weight ()); |
1697 | |
1671 | |
1698 | inserted: |
1672 | inserted: |
1699 | /* reset the light list and los of the players on the map */ |
1673 | /* reset the light list and los of the players on the map */ |
1700 | if (op->glow_radius && map && map->darkness) |
1674 | if (op->glow_radius && is_on_map ()) |
|
|
1675 | { |
|
|
1676 | update_stats (); |
1701 | update_all_los (map, x, y); |
1677 | update_all_los (map, x, y); |
1702 | |
1678 | } |
|
|
1679 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1703 | // if this is a player's inventory, update stats |
1680 | // if this is a player's inventory, update stats |
1704 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1705 | update_stats (); |
1681 | update_stats (); |
1706 | |
1682 | |
1707 | INVOKE_OBJECT (INSERT, this); |
1683 | INVOKE_OBJECT (INSERT, this); |
1708 | |
1684 | |
1709 | return op; |
1685 | return op; |
… | |
… | |
1730 | * on top. |
1706 | * on top. |
1731 | */ |
1707 | */ |
1732 | int |
1708 | int |
1733 | check_move_on (object *op, object *originator) |
1709 | check_move_on (object *op, object *originator) |
1734 | { |
1710 | { |
|
|
1711 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1712 | return 0; |
|
|
1713 | |
1735 | object *tmp; |
1714 | object *tmp; |
1736 | maptile *m = op->map; |
1715 | maptile *m = op->map; |
1737 | int x = op->x, y = op->y; |
1716 | int x = op->x, y = op->y; |
1738 | |
1717 | |
1739 | MoveType move_on, move_slow, move_block; |
1718 | mapspace &ms = m->at (x, y); |
1740 | |
1719 | |
1741 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1720 | ms.update (); |
1742 | return 0; |
|
|
1743 | |
1721 | |
1744 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1722 | MoveType move_on = ms.move_on; |
1745 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1723 | MoveType move_slow = ms.move_slow; |
1746 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1724 | MoveType move_block = ms.move_block; |
1747 | |
1725 | |
1748 | /* if nothing on this space will slow op down or be applied, |
1726 | /* if nothing on this space will slow op down or be applied, |
1749 | * no need to do checking below. have to make sure move_type |
1727 | * no need to do checking below. have to make sure move_type |
1750 | * is set, as lots of objects don't have it set - we treat that |
1728 | * is set, as lots of objects don't have it set - we treat that |
1751 | * as walking. |
1729 | * as walking. |
… | |
… | |
1762 | return 0; |
1740 | return 0; |
1763 | |
1741 | |
1764 | /* The objects have to be checked from top to bottom. |
1742 | /* The objects have to be checked from top to bottom. |
1765 | * Hence, we first go to the top: |
1743 | * Hence, we first go to the top: |
1766 | */ |
1744 | */ |
1767 | |
1745 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1768 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1769 | { |
|
|
1770 | /* Trim the search when we find the first other spell effect |
|
|
1771 | * this helps performance so that if a space has 50 spell objects, |
|
|
1772 | * we don't need to check all of them. |
|
|
1773 | */ |
|
|
1774 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1775 | break; |
|
|
1776 | } |
1746 | { |
|
|
1747 | next = tmp->below; |
1777 | |
1748 | |
1778 | for (; tmp; tmp = tmp->below) |
|
|
1779 | { |
|
|
1780 | if (tmp == op) |
1749 | if (tmp == op) |
1781 | continue; /* Can't apply yourself */ |
1750 | continue; /* Can't apply yourself */ |
1782 | |
1751 | |
1783 | /* Check to see if one of the movement types should be slowed down. |
1752 | /* Check to see if one of the movement types should be slowed down. |
1784 | * Second check makes sure that the movement types not being slowed |
1753 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1789 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1758 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1790 | { |
1759 | { |
1791 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1760 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1792 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1761 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1793 | { |
1762 | { |
1794 | |
|
|
1795 | float |
|
|
1796 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1763 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1797 | |
1764 | |
1798 | if (op->type == PLAYER) |
1765 | if (op->is_player ()) |
1799 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1766 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1800 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1767 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1801 | diff /= 4.0; |
1768 | diff /= 4.0; |
1802 | |
1769 | |
1803 | op->speed_left -= diff; |
1770 | op->speed_left -= diff; |
1804 | } |
1771 | } |
1805 | } |
1772 | } |
… | |
… | |
1838 | LOG (llevError, "Present_arch called outside map.\n"); |
1805 | LOG (llevError, "Present_arch called outside map.\n"); |
1839 | return NULL; |
1806 | return NULL; |
1840 | } |
1807 | } |
1841 | |
1808 | |
1842 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1809 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1843 | if (tmp->arch == at) |
1810 | if (tmp->arch->archname == at->archname) |
1844 | return tmp; |
1811 | return tmp; |
1845 | |
1812 | |
1846 | return NULL; |
1813 | return NULL; |
1847 | } |
1814 | } |
1848 | |
1815 | |
… | |
… | |
1912 | * The first matching object is returned, or NULL if none. |
1879 | * The first matching object is returned, or NULL if none. |
1913 | */ |
1880 | */ |
1914 | object * |
1881 | object * |
1915 | present_arch_in_ob (const archetype *at, const object *op) |
1882 | present_arch_in_ob (const archetype *at, const object *op) |
1916 | { |
1883 | { |
1917 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1884 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1918 | if (tmp->arch == at) |
1885 | if (tmp->arch->archname == at->archname) |
1919 | return tmp; |
1886 | return tmp; |
1920 | |
1887 | |
1921 | return NULL; |
1888 | return NULL; |
1922 | } |
1889 | } |
1923 | |
1890 | |
… | |
… | |
2011 | * head of the object should correspond for the entire object. |
1978 | * head of the object should correspond for the entire object. |
2012 | */ |
1979 | */ |
2013 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1980 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
2014 | continue; |
1981 | continue; |
2015 | |
1982 | |
2016 | if (ob->blocked (m, pos.x, pos.y)) |
1983 | if (ob->blocked (pos.m, pos.x, pos.y)) |
2017 | continue; |
1984 | continue; |
2018 | |
1985 | |
2019 | altern [index++] = i; |
1986 | altern [index++] = i; |
2020 | } |
1987 | } |
2021 | |
1988 | |
… | |
… | |
2089 | * there is capable of. |
2056 | * there is capable of. |
2090 | */ |
2057 | */ |
2091 | int |
2058 | int |
2092 | find_dir (maptile *m, int x, int y, object *exclude) |
2059 | find_dir (maptile *m, int x, int y, object *exclude) |
2093 | { |
2060 | { |
2094 | int i, max = SIZEOFFREE, mflags; |
2061 | int max = SIZEOFFREE, mflags; |
2095 | |
|
|
2096 | sint16 nx, ny; |
|
|
2097 | object *tmp; |
|
|
2098 | maptile *mp; |
|
|
2099 | |
|
|
2100 | MoveType blocked, move_type; |
2062 | MoveType move_type; |
2101 | |
2063 | |
2102 | if (exclude && exclude->head_ () != exclude) |
2064 | if (exclude && exclude->head_ () != exclude) |
2103 | { |
2065 | { |
2104 | exclude = exclude->head; |
2066 | exclude = exclude->head; |
2105 | move_type = exclude->move_type; |
2067 | move_type = exclude->move_type; |
… | |
… | |
2108 | { |
2070 | { |
2109 | /* If we don't have anything, presume it can use all movement types. */ |
2071 | /* If we don't have anything, presume it can use all movement types. */ |
2110 | move_type = MOVE_ALL; |
2072 | move_type = MOVE_ALL; |
2111 | } |
2073 | } |
2112 | |
2074 | |
2113 | for (i = 1; i < max; i++) |
2075 | for (int i = 1; i < max; i++) |
2114 | { |
2076 | { |
2115 | mp = m; |
2077 | mapxy pos (m, x, y); |
2116 | nx = x + freearr_x[i]; |
2078 | pos.move (i); |
2117 | ny = y + freearr_y[i]; |
|
|
2118 | |
2079 | |
2119 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2080 | if (!pos.normalise ()) |
2120 | |
|
|
2121 | if (mflags & P_OUT_OF_MAP) |
|
|
2122 | max = maxfree[i]; |
2081 | max = maxfree[i]; |
2123 | else |
2082 | else |
2124 | { |
2083 | { |
2125 | mapspace &ms = mp->at (nx, ny); |
2084 | mapspace &ms = *pos; |
2126 | |
2085 | |
2127 | blocked = ms.move_block; |
|
|
2128 | |
|
|
2129 | if ((move_type & blocked) == move_type) |
2086 | if ((move_type & ms.move_block) == move_type) |
2130 | max = maxfree[i]; |
2087 | max = maxfree [i]; |
2131 | else if (mflags & P_IS_ALIVE) |
2088 | else if (ms.flags () & P_IS_ALIVE) |
2132 | { |
2089 | { |
2133 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2090 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2134 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2091 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2135 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2092 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2136 | break; |
|
|
2137 | |
|
|
2138 | if (tmp) |
|
|
2139 | return freedir[i]; |
2093 | return freedir [i]; |
2140 | } |
2094 | } |
2141 | } |
2095 | } |
2142 | } |
2096 | } |
2143 | |
2097 | |
2144 | return 0; |
2098 | return 0; |
… | |
… | |
2219 | * This basically means that if direction is 15, then it could either go |
2173 | * This basically means that if direction is 15, then it could either go |
2220 | * direction 4, 14, or 16 to get back to where we are. |
2174 | * direction 4, 14, or 16 to get back to where we are. |
2221 | * Moved from spell_util.c to object.c with the other related direction |
2175 | * Moved from spell_util.c to object.c with the other related direction |
2222 | * functions. |
2176 | * functions. |
2223 | */ |
2177 | */ |
2224 | int reduction_dir[SIZEOFFREE][3] = { |
2178 | const int reduction_dir[SIZEOFFREE][3] = { |
2225 | {0, 0, 0}, /* 0 */ |
2179 | {0, 0, 0}, /* 0 */ |
2226 | {0, 0, 0}, /* 1 */ |
2180 | {0, 0, 0}, /* 1 */ |
2227 | {0, 0, 0}, /* 2 */ |
2181 | {0, 0, 0}, /* 2 */ |
2228 | {0, 0, 0}, /* 3 */ |
2182 | {0, 0, 0}, /* 3 */ |
2229 | {0, 0, 0}, /* 4 */ |
2183 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2325 | int |
2279 | int |
2326 | can_pick (const object *who, const object *item) |
2280 | can_pick (const object *who, const object *item) |
2327 | { |
2281 | { |
2328 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2282 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2329 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2283 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2330 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2284 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2331 | } |
2285 | } |
2332 | |
2286 | |
2333 | /* |
2287 | /* |
2334 | * create clone from object to another |
2288 | * create clone from object to another |
2335 | */ |
2289 | */ |
2336 | object * |
2290 | object * |
2337 | object_create_clone (object *asrc) |
2291 | object::deep_clone () |
2338 | { |
2292 | { |
2339 | object *dst = 0, *tmp, *src, *prev, *item; |
2293 | assert (("deep_clone called on non-head object", is_head ())); |
2340 | |
2294 | |
2341 | if (!asrc) |
2295 | object *dst = clone (); |
2342 | return 0; |
|
|
2343 | |
2296 | |
2344 | src = asrc->head_ (); |
2297 | object *prev = dst; |
2345 | |
|
|
2346 | prev = 0; |
|
|
2347 | for (object *part = src; part; part = part->more) |
2298 | for (object *part = this->more; part; part = part->more) |
2348 | { |
2299 | { |
2349 | tmp = part->clone (); |
2300 | object *tmp = part->clone (); |
2350 | tmp->x -= src->x; |
|
|
2351 | tmp->y -= src->y; |
|
|
2352 | |
|
|
2353 | if (!part->head) |
|
|
2354 | { |
|
|
2355 | dst = tmp; |
|
|
2356 | tmp->head = 0; |
|
|
2357 | } |
|
|
2358 | else |
|
|
2359 | tmp->head = dst; |
2301 | tmp->head = dst; |
2360 | |
|
|
2361 | tmp->more = 0; |
|
|
2362 | |
|
|
2363 | if (prev) |
|
|
2364 | prev->more = tmp; |
2302 | prev->more = tmp; |
2365 | |
|
|
2366 | prev = tmp; |
2303 | prev = tmp; |
2367 | } |
2304 | } |
2368 | |
2305 | |
2369 | for (item = src->inv; item; item = item->below) |
2306 | for (object *item = inv; item; item = item->below) |
2370 | insert_ob_in_ob (object_create_clone (item), dst); |
2307 | insert_ob_in_ob (item->deep_clone (), dst); |
2371 | |
2308 | |
2372 | return dst; |
2309 | return dst; |
2373 | } |
2310 | } |
2374 | |
2311 | |
2375 | /* This returns the first object in who's inventory that |
2312 | /* This returns the first object in who's inventory that |
… | |
… | |
2384 | return tmp; |
2321 | return tmp; |
2385 | |
2322 | |
2386 | return 0; |
2323 | return 0; |
2387 | } |
2324 | } |
2388 | |
2325 | |
2389 | /* If ob has a field named key, return the link from the list, |
2326 | shstr_tmp |
2390 | * otherwise return NULL. |
2327 | object::kv_get (shstr_tmp key) const |
2391 | * |
|
|
2392 | * key must be a passed in shared string - otherwise, this won't |
|
|
2393 | * do the desired thing. |
|
|
2394 | */ |
|
|
2395 | key_value * |
|
|
2396 | get_ob_key_link (const object *ob, const char *key) |
|
|
2397 | { |
2328 | { |
2398 | for (key_value *link = ob->key_values; link; link = link->next) |
2329 | for (key_value *kv = key_values; kv; kv = kv->next) |
2399 | if (link->key == key) |
2330 | if (kv->key == key) |
2400 | return link; |
|
|
2401 | |
|
|
2402 | return 0; |
|
|
2403 | } |
|
|
2404 | |
|
|
2405 | /* |
|
|
2406 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2407 | * |
|
|
2408 | * The argument doesn't need to be a shared string. |
|
|
2409 | * |
|
|
2410 | * The returned string is shared. |
|
|
2411 | */ |
|
|
2412 | const char * |
|
|
2413 | get_ob_key_value (const object *op, const char *const key) |
|
|
2414 | { |
|
|
2415 | key_value *link; |
|
|
2416 | shstr_cmp canonical_key (key); |
|
|
2417 | |
|
|
2418 | if (!canonical_key) |
|
|
2419 | { |
|
|
2420 | /* 1. There being a field named key on any object |
|
|
2421 | * implies there'd be a shared string to find. |
|
|
2422 | * 2. Since there isn't, no object has this field. |
|
|
2423 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2424 | */ |
|
|
2425 | return 0; |
|
|
2426 | } |
|
|
2427 | |
|
|
2428 | /* This is copied from get_ob_key_link() above - |
|
|
2429 | * only 4 lines, and saves the function call overhead. |
|
|
2430 | */ |
|
|
2431 | for (link = op->key_values; link; link = link->next) |
|
|
2432 | if (link->key == canonical_key) |
|
|
2433 | return link->value; |
2331 | return kv->value; |
2434 | |
2332 | |
2435 | return 0; |
2333 | return shstr (); |
2436 | } |
2334 | } |
2437 | |
2335 | |
2438 | /* |
2336 | void |
2439 | * Updates the canonical_key in op to value. |
2337 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2440 | * |
|
|
2441 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2442 | * |
|
|
2443 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2444 | * keys. |
|
|
2445 | * |
|
|
2446 | * Returns TRUE on success. |
|
|
2447 | */ |
|
|
2448 | int |
|
|
2449 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2450 | { |
2338 | { |
2451 | key_value *field = NULL, *last = NULL; |
2339 | for (key_value *kv = key_values; kv; kv = kv->next) |
2452 | |
2340 | if (kv->key == key) |
2453 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2454 | { |
|
|
2455 | if (field->key != canonical_key) |
|
|
2456 | { |
2341 | { |
2457 | last = field; |
2342 | kv->value = value; |
2458 | continue; |
2343 | return; |
2459 | } |
2344 | } |
2460 | |
2345 | |
2461 | if (value) |
2346 | key_value *kv = new key_value; |
2462 | field->value = value; |
2347 | |
2463 | else |
2348 | kv->next = key_values; |
|
|
2349 | kv->key = key; |
|
|
2350 | kv->value = value; |
|
|
2351 | |
|
|
2352 | key_values = kv; |
|
|
2353 | } |
|
|
2354 | |
|
|
2355 | void |
|
|
2356 | object::kv_del (shstr_tmp key) |
|
|
2357 | { |
|
|
2358 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2359 | if ((*kvp)->key == key) |
2464 | { |
2360 | { |
2465 | /* Basically, if the archetype has this key set, |
2361 | key_value *kv = *kvp; |
2466 | * we need to store the null value so when we save |
2362 | *kvp = (*kvp)->next; |
2467 | * it, we save the empty value so that when we load, |
2363 | delete kv; |
2468 | * we get this value back again. |
2364 | return; |
2469 | */ |
|
|
2470 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2471 | field->value = 0; |
|
|
2472 | else |
|
|
2473 | { |
|
|
2474 | if (last) |
|
|
2475 | last->next = field->next; |
|
|
2476 | else |
|
|
2477 | op->key_values = field->next; |
|
|
2478 | |
|
|
2479 | delete field; |
|
|
2480 | } |
|
|
2481 | } |
2365 | } |
2482 | return TRUE; |
|
|
2483 | } |
|
|
2484 | /* IF we get here, key doesn't exist */ |
|
|
2485 | |
|
|
2486 | /* No field, we'll have to add it. */ |
|
|
2487 | |
|
|
2488 | if (!add_key) |
|
|
2489 | return FALSE; |
|
|
2490 | |
|
|
2491 | /* There isn't any good reason to store a null |
|
|
2492 | * value in the key/value list. If the archetype has |
|
|
2493 | * this key, then we should also have it, so shouldn't |
|
|
2494 | * be here. If user wants to store empty strings, |
|
|
2495 | * should pass in "" |
|
|
2496 | */ |
|
|
2497 | if (value == NULL) |
|
|
2498 | return TRUE; |
|
|
2499 | |
|
|
2500 | field = new key_value; |
|
|
2501 | |
|
|
2502 | field->key = canonical_key; |
|
|
2503 | field->value = value; |
|
|
2504 | /* Usual prepend-addition. */ |
|
|
2505 | field->next = op->key_values; |
|
|
2506 | op->key_values = field; |
|
|
2507 | |
|
|
2508 | return TRUE; |
|
|
2509 | } |
|
|
2510 | |
|
|
2511 | /* |
|
|
2512 | * Updates the key in op to value. |
|
|
2513 | * |
|
|
2514 | * If add_key is FALSE, this will only update existing keys, |
|
|
2515 | * and not add new ones. |
|
|
2516 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2517 | * |
|
|
2518 | * Returns TRUE on success. |
|
|
2519 | */ |
|
|
2520 | int |
|
|
2521 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2522 | { |
|
|
2523 | shstr key_ (key); |
|
|
2524 | |
|
|
2525 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2526 | } |
2366 | } |
2527 | |
2367 | |
2528 | object::depth_iterator::depth_iterator (object *container) |
2368 | object::depth_iterator::depth_iterator (object *container) |
2529 | : iterator_base (container) |
2369 | : iterator_base (container) |
2530 | { |
2370 | { |
… | |
… | |
2580 | { |
2420 | { |
2581 | char flagdesc[512]; |
2421 | char flagdesc[512]; |
2582 | char info2[256 * 4]; |
2422 | char info2[256 * 4]; |
2583 | char *p = info; |
2423 | char *p = info; |
2584 | |
2424 | |
2585 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2425 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2586 | count, |
2426 | count, |
2587 | uuid.c_str (), |
2427 | uuid.c_str (), |
2588 | &name, |
2428 | &name, |
2589 | title ? "\",title:\"" : "", |
2429 | title ? ",title:\"" : "", |
2590 | title ? (const char *)title : "", |
2430 | title ? (const char *)title : "", |
|
|
2431 | title ? "\"" : "", |
2591 | flag_desc (flagdesc, 512), type); |
2432 | flag_desc (flagdesc, 512), type); |
2592 | |
2433 | |
2593 | if (!flag[FLAG_REMOVED] && env) |
2434 | if (!flag[FLAG_REMOVED] && env) |
2594 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2435 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2595 | |
2436 | |
… | |
… | |
2651 | container = 0; |
2492 | container = 0; |
2652 | |
2493 | |
2653 | // client needs item update to make it work, client bug requires this to be separate |
2494 | // client needs item update to make it work, client bug requires this to be separate |
2654 | esrv_update_item (UPD_FLAGS, this, old_container); |
2495 | esrv_update_item (UPD_FLAGS, this, old_container); |
2655 | |
2496 | |
2656 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2497 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2657 | play_sound (sound_find ("chest_close")); |
2498 | play_sound (sound_find ("chest_close")); |
2658 | } |
2499 | } |
2659 | |
2500 | |
2660 | if (new_container) |
2501 | if (new_container) |
2661 | { |
2502 | { |
… | |
… | |
2671 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2512 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2672 | new_container->insert (closer); |
2513 | new_container->insert (closer); |
2673 | } |
2514 | } |
2674 | #endif |
2515 | #endif |
2675 | |
2516 | |
2676 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2517 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2677 | |
2518 | |
2678 | // make sure the container is available, client bug requires this to be separate |
2519 | // make sure the container is available, client bug requires this to be separate |
2679 | esrv_send_item (this, new_container); |
2520 | esrv_send_item (this, new_container); |
2680 | |
2521 | |
2681 | new_container->flag [FLAG_APPLIED] = true; |
2522 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2689 | // else if (!old_container->env && contr && contr->ns) |
2530 | // else if (!old_container->env && contr && contr->ns) |
2690 | // contr->ns->floorbox_reset (); |
2531 | // contr->ns->floorbox_reset (); |
2691 | } |
2532 | } |
2692 | |
2533 | |
2693 | object * |
2534 | object * |
2694 | object::force_find (const shstr name) |
2535 | object::force_find (shstr_tmp name) |
2695 | { |
2536 | { |
2696 | /* cycle through his inventory to look for the MARK we want to |
2537 | /* cycle through his inventory to look for the MARK we want to |
2697 | * place |
2538 | * place |
2698 | */ |
2539 | */ |
2699 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2540 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2701 | return splay (tmp); |
2542 | return splay (tmp); |
2702 | |
2543 | |
2703 | return 0; |
2544 | return 0; |
2704 | } |
2545 | } |
2705 | |
2546 | |
|
|
2547 | //-GPL |
|
|
2548 | |
2706 | void |
2549 | void |
|
|
2550 | object::force_set_timer (int duration) |
|
|
2551 | { |
|
|
2552 | this->duration = 1; |
|
|
2553 | this->speed_left = -1.f; |
|
|
2554 | |
|
|
2555 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2556 | } |
|
|
2557 | |
|
|
2558 | object * |
2707 | object::force_add (const shstr name, int duration) |
2559 | object::force_add (shstr_tmp name, int duration) |
2708 | { |
2560 | { |
2709 | if (object *force = force_find (name)) |
2561 | if (object *force = force_find (name)) |
2710 | force->destroy (); |
2562 | force->destroy (); |
2711 | |
2563 | |
2712 | object *force = get_archetype (FORCE_NAME); |
2564 | object *force = get_archetype (FORCE_NAME); |
2713 | |
2565 | |
2714 | force->slaying = name; |
2566 | force->slaying = name; |
2715 | force->stats.food = 1; |
2567 | force->force_set_timer (duration); |
2716 | force->speed_left = -1.f; |
|
|
2717 | |
|
|
2718 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2719 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2720 | force->flag [FLAG_APPLIED] = true; |
2568 | force->flag [FLAG_APPLIED] = true; |
2721 | |
2569 | |
2722 | insert (force); |
2570 | return insert (force); |
2723 | } |
2571 | } |
2724 | |
2572 | |
2725 | void |
2573 | void |
2726 | object::play_sound (faceidx sound) |
2574 | object::play_sound (faceidx sound) const |
2727 | { |
2575 | { |
2728 | if (!sound) |
2576 | if (!sound) |
2729 | return; |
2577 | return; |
2730 | |
2578 | |
2731 | if (flag [FLAG_REMOVED]) |
2579 | if (is_on_map ()) |
|
|
2580 | map->play_sound (sound, x, y); |
|
|
2581 | else if (object *pl = in_player ()) |
|
|
2582 | pl->contr->play_sound (sound); |
|
|
2583 | } |
|
|
2584 | |
|
|
2585 | void |
|
|
2586 | object::say_msg (const char *msg) const |
|
|
2587 | { |
|
|
2588 | if (is_on_map ()) |
|
|
2589 | map->say_msg (msg, x, y); |
|
|
2590 | else if (object *pl = in_player ()) |
|
|
2591 | pl->contr->play_sound (sound); |
|
|
2592 | } |
|
|
2593 | |
|
|
2594 | void |
|
|
2595 | object::make_noise () |
|
|
2596 | { |
|
|
2597 | // we do not model noise in the map, so instead put |
|
|
2598 | // a temporary light into the noise source |
|
|
2599 | // could use the map instead, but that's less reliable for our |
|
|
2600 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2601 | |
|
|
2602 | // currently only works sensibly for players |
|
|
2603 | if (!is_player ()) |
2732 | return; |
2604 | return; |
2733 | |
2605 | |
2734 | if (env) |
2606 | // find old force, or create new one |
2735 | { |
2607 | object *force = force_find (shstr_noise_force); |
2736 | if (object *pl = in_player ()) |
2608 | |
2737 | pl->contr->play_sound (sound); |
2609 | if (force) |
2738 | } |
2610 | force->speed_left = -1.f; // patch old speed up |
2739 | else |
2611 | else |
2740 | map->play_sound (sound, x, y); |
2612 | { |
2741 | } |
2613 | force = archetype::get (shstr_noise_force); |
2742 | |
2614 | |
|
|
2615 | force->slaying = shstr_noise_force; |
|
|
2616 | force->stats.food = 1; |
|
|
2617 | force->speed_left = -1.f; |
|
|
2618 | |
|
|
2619 | force->set_speed (1.f / 4.f); |
|
|
2620 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2621 | force->flag [FLAG_APPLIED] = true; |
|
|
2622 | |
|
|
2623 | insert (force); |
|
|
2624 | } |
|
|
2625 | } |
|
|
2626 | |