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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
8 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the terms of the Affero GNU General Public License as published by the |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * option) any later version. |
12 | * option) any later version. |
12 | * |
13 | * |
13 | * This program is distributed in the hope that it will be useful, |
14 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
17 | * GNU General Public License for more details. |
17 | * |
18 | * |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * You should have received a copy of the Affero GNU General Public License |
19 | * and the GNU General Public License along with this program. If not, see |
20 | * and the GNU General Public License along with this program. If not, see |
20 | * <http://www.gnu.org/licenses/>. |
21 | * <http://www.gnu.org/licenses/>. |
21 | * |
22 | * |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
24 | */ |
24 | |
25 | |
25 | #include <global.h> |
26 | #include <global.h> |
26 | #include <stdio.h> |
27 | #include <stdio.h> |
… | |
… | |
45 | uint32_t object::create_count; |
46 | uint32_t object::create_count; |
46 | uint32_t object::destroy_count; |
47 | uint32_t object::destroy_count; |
47 | |
48 | |
48 | //+GPL |
49 | //+GPL |
49 | |
50 | |
50 | short freearr_x[SIZEOFFREE] = { |
51 | int freearr_x[SIZEOFFREE] = { |
51 | 0, |
52 | 0, |
52 | 0, 1, 1, 1, 0, -1, -1, -1, |
53 | 0, 1, 1, 1, 0, -1, -1, -1, |
53 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
54 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
54 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
55 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
55 | }; |
56 | }; |
56 | short freearr_y[SIZEOFFREE] = { |
57 | int freearr_y[SIZEOFFREE] = { |
57 | 0, |
58 | 0, |
58 | -1, -1, 0, 1, 1, 1, 0, -1, |
59 | -1, -1, 0, 1, 1, 1, 0, -1, |
59 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
60 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
60 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
61 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
61 | }; |
62 | }; |
… | |
… | |
72 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
73 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
73 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
74 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
74 | }; |
75 | }; |
75 | |
76 | |
76 | const char *wall_suffix[16] = { |
77 | const char *wall_suffix[16] = { |
77 | "0", |
78 | "0", |
78 | "1_3", |
79 | "1_3", |
79 | "1_4", |
80 | "1_4", |
80 | "2_1_2", |
81 | "2_1_2", |
81 | "1_2", |
82 | "1_2", |
82 | "2_2_4", |
83 | "2_2_4", |
83 | "2_2_1", |
84 | "2_2_1", |
84 | "3_1", |
85 | "3_1", |
85 | "1_1", |
86 | "1_1", |
86 | "2_2_3", |
87 | "2_2_3", |
87 | "2_2_2", |
88 | "2_2_2", |
88 | "3_3", |
89 | "3_3", |
89 | "2_1_1", |
90 | "2_1_1", |
90 | "3_4", |
91 | "3_4", |
91 | "3_2", |
92 | "3_2", |
92 | "4" |
93 | "4" |
93 | }; |
94 | }; |
94 | |
95 | |
95 | static void |
96 | static void |
96 | write_uuid (uval64 skip, bool sync) |
97 | write_uuid (uval64 skip, bool sync) |
97 | { |
98 | { |
… | |
… | |
233 | |
234 | |
234 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
235 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
235 | static bool |
236 | static bool |
236 | compare_ob_value_lists_one (const object *wants, const object *has) |
237 | compare_ob_value_lists_one (const object *wants, const object *has) |
237 | { |
238 | { |
238 | /* n-squared behaviour (see kv_get), but I'm hoping both |
239 | /* n-squared behaviour (see kv.get), but I'm hoping both |
239 | * objects with lists are rare, and lists stay short. If not, use a |
240 | * objects with lists are rare, and lists stay short. If not, use a |
240 | * different structure or at least keep the lists sorted... |
241 | * different structure or at least keep the lists sorted... |
241 | */ |
242 | */ |
242 | |
243 | |
243 | /* For each field in wants, */ |
244 | /* For each field in wants, */ |
244 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
245 | for (key_value *kv = wants->kv.first; kv; kv = kv->next) |
245 | if (has->kv_get (kv->key) != kv->value) |
246 | if (has->kv.get (kv->key) != kv->value) |
246 | return false; |
247 | return false; |
247 | |
248 | |
248 | /* If we get here, every field in wants has a matching field in has. */ |
249 | /* If we get here, every field in wants has a matching field in has. */ |
249 | return true; |
250 | return true; |
250 | } |
251 | } |
… | |
… | |
274 | */ |
275 | */ |
275 | bool object::can_merge_slow (object *ob1, object *ob2) |
276 | bool object::can_merge_slow (object *ob1, object *ob2) |
276 | { |
277 | { |
277 | /* A couple quick sanity checks */ |
278 | /* A couple quick sanity checks */ |
278 | if (ob1 == ob2 |
279 | if (ob1 == ob2 |
279 | || ob1->type != ob2->type |
280 | || ob1->type != ob2->type |
280 | || ob1->value != ob2->value |
281 | || ob1->value != ob2->value |
281 | || ob1->name != ob2->name |
282 | || ob1->name != ob2->name |
|
|
283 | || ob1->custom_name != ob2->custom_name |
282 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
284 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
283 | return 0; |
285 | return 0; |
284 | |
286 | |
285 | /* Do not merge objects if nrof would overflow, assume nrof |
287 | /* Do not merge objects if nrof would overflow, assume nrof |
286 | * is always 0 .. 2**31-1 */ |
288 | * is always 0 .. 2**31-1 */ |
… | |
… | |
350 | /* inventory ok - still need to check rest of this object to see |
352 | /* inventory ok - still need to check rest of this object to see |
351 | * if it is valid. |
353 | * if it is valid. |
352 | */ |
354 | */ |
353 | } |
355 | } |
354 | |
356 | |
355 | /* Don't merge objects that are applied. With the new 'body' code, |
357 | /* Don't merge objects that are applied. With the new 'body' code, |
356 | * it is possible for most any character to have more than one of |
358 | * it is possible for most any character to have more than one of |
357 | * some items equipped, and we don't want those to merge. |
359 | * some items equipped, and we don't want those to merge. |
358 | */ |
360 | */ |
359 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
361 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
360 | return 0; |
362 | return 0; |
361 | |
363 | |
362 | /* Note sure why the following is the case - either the object has to |
364 | /* Not sure why the following is the case - either the object has to |
363 | * be animated or have a very low speed. Is this an attempted monster |
365 | * be animated or have a very low speed. Is this an attempted monster |
364 | * check? |
366 | * check? |
365 | */ |
367 | */ |
366 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
368 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
367 | return 0; |
369 | return 0; |
368 | |
370 | |
… | |
… | |
372 | if (ob1->level != ob2->level) |
374 | if (ob1->level != ob2->level) |
373 | return 0; |
375 | return 0; |
374 | break; |
376 | break; |
375 | } |
377 | } |
376 | |
378 | |
377 | if (ob1->key_values || ob2->key_values) |
379 | if (!ob1->kv.empty () || !ob2->kv.empty ()) |
378 | { |
380 | { |
379 | /* At least one of these has key_values. */ |
381 | /* At least one of these has key_values. */ |
380 | if ((!ob1->key_values) != (!ob2->key_values)) |
382 | if (ob1->kv.empty () != ob2->kv.empty ()) |
381 | return 0; /* One has fields, but the other one doesn't. */ |
383 | return 0; /* One has fields, but the other one doesn't. */ |
382 | |
384 | |
383 | if (!compare_ob_value_lists (ob1, ob2)) |
385 | if (!compare_ob_value_lists (ob1, ob2)) |
384 | return 0; |
386 | return 0; |
385 | } |
387 | } |
… | |
… | |
445 | |
447 | |
446 | return 0; |
448 | return 0; |
447 | } |
449 | } |
448 | |
450 | |
449 | // adjust weight per container type ("of holding") |
451 | // adjust weight per container type ("of holding") |
450 | static uint32 |
452 | static weight_t |
451 | weight_adjust_for (object *op, uint32 weight) |
453 | weight_adjust_for (object *op, weight_t weight) |
452 | { |
454 | { |
453 | return op->type == CONTAINER |
455 | if (op->type == CONTAINER) |
454 | ? weight - weight * op->stats.Str / 100 |
456 | weight -= weight * op->stats.Str / 100; |
455 | : weight; |
457 | |
|
|
458 | return weight; |
456 | } |
459 | } |
457 | |
460 | |
458 | /* |
461 | /* |
459 | * subtracts, then adds, the specified weight to an object, |
462 | * subtracts, then adds, the specified weight to an object, |
460 | * and also updates how much the environment(s) is/are carrying. |
463 | * and also updates how much the environment(s) is/are carrying. |
461 | */ |
464 | */ |
462 | static void |
465 | static void |
463 | adjust_weight (object *op, sint32 sub, sint32 add) |
466 | adjust_weight (object *op, weight_t sub, weight_t add) |
464 | { |
467 | { |
465 | while (op) |
468 | while (op) |
466 | { |
469 | { |
467 | sint32 ocarrying = op->carrying; |
470 | weight_t carrying = (weight_t)op->carrying |
|
|
471 | - weight_adjust_for (op, sub) |
|
|
472 | + weight_adjust_for (op, add); |
468 | |
473 | |
469 | op->carrying -= weight_adjust_for (op, sub); |
474 | sub = op->carrying; |
470 | op->carrying += weight_adjust_for (op, add); |
475 | op->carrying = carrying; |
|
|
476 | add = op->carrying; |
471 | |
477 | |
472 | if (object *pl = op->visible_to ()) |
478 | if (object *pl = op->visible_to ()) |
473 | if (pl != op) // player is handled lazily |
479 | if (pl != op) // player is handled lazily |
474 | esrv_update_item (UPD_WEIGHT, pl, op); |
480 | esrv_update_item (UPD_WEIGHT, pl, op); |
475 | |
481 | |
476 | sub = ocarrying; |
|
|
477 | add = op->carrying; |
|
|
478 | |
|
|
479 | op = op->env; |
482 | op = op->env; |
480 | } |
483 | } |
481 | } |
484 | } |
482 | |
485 | |
483 | /* |
486 | /* |
… | |
… | |
486 | * containers are carrying, and sums it up. |
489 | * containers are carrying, and sums it up. |
487 | */ |
490 | */ |
488 | void |
491 | void |
489 | object::update_weight () |
492 | object::update_weight () |
490 | { |
493 | { |
491 | sint32 sum = 0; |
494 | weight_t sum = 0; |
492 | |
495 | |
493 | for (object *op = inv; op; op = op->below) |
496 | for (object *op = inv; op; op = op->below) |
494 | { |
497 | { |
495 | op->update_weight (); |
498 | op->update_weight (); |
496 | |
499 | |
… | |
… | |
596 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
599 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
597 | return; |
600 | return; |
598 | } |
601 | } |
599 | |
602 | |
600 | this->owner = owner; |
603 | this->owner = owner; |
601 | } |
|
|
602 | |
|
|
603 | /* Zero the key_values on op, decrementing the shared-string |
|
|
604 | * refcounts and freeing the links. |
|
|
605 | */ |
|
|
606 | static void |
|
|
607 | free_key_values (object *op) |
|
|
608 | { |
|
|
609 | for (key_value *i = op->key_values; i; ) |
|
|
610 | { |
|
|
611 | key_value *next = i->next; |
|
|
612 | delete i; |
|
|
613 | |
|
|
614 | i = next; |
|
|
615 | } |
|
|
616 | |
|
|
617 | op->key_values = 0; |
|
|
618 | } |
604 | } |
619 | |
605 | |
620 | /* |
606 | /* |
621 | * copy_to first frees everything allocated by the dst object, |
607 | * copy_to first frees everything allocated by the dst object, |
622 | * and then copies the contents of itself into the second |
608 | * and then copies the contents of itself into the second |
… | |
… | |
628 | void |
614 | void |
629 | object::copy_to (object *dst) |
615 | object::copy_to (object *dst) |
630 | { |
616 | { |
631 | dst->remove (); |
617 | dst->remove (); |
632 | *(object_copy *)dst = *this; |
618 | *(object_copy *)dst = *this; |
|
|
619 | |
|
|
620 | // maybe move to object_copy? |
|
|
621 | dst->kv = kv; |
|
|
622 | |
633 | dst->flag [FLAG_REMOVED] = true; |
623 | dst->flag [FLAG_REMOVED] = true; |
634 | |
|
|
635 | /* Copy over key_values, if any. */ |
|
|
636 | if (key_values) |
|
|
637 | { |
|
|
638 | key_value *tail = 0; |
|
|
639 | dst->key_values = 0; |
|
|
640 | |
|
|
641 | for (key_value *i = key_values; i; i = i->next) |
|
|
642 | { |
|
|
643 | key_value *new_link = new key_value; |
|
|
644 | |
|
|
645 | new_link->next = 0; |
|
|
646 | new_link->key = i->key; |
|
|
647 | new_link->value = i->value; |
|
|
648 | |
|
|
649 | /* Try and be clever here, too. */ |
|
|
650 | if (!dst->key_values) |
|
|
651 | { |
|
|
652 | dst->key_values = new_link; |
|
|
653 | tail = new_link; |
|
|
654 | } |
|
|
655 | else |
|
|
656 | { |
|
|
657 | tail->next = new_link; |
|
|
658 | tail = new_link; |
|
|
659 | } |
|
|
660 | } |
|
|
661 | } |
|
|
662 | |
|
|
663 | dst->activate (); |
624 | dst->activate (); |
664 | } |
625 | } |
665 | |
626 | |
666 | void |
627 | void |
667 | object::instantiate () |
628 | object::instantiate () |
668 | { |
629 | { |
669 | if (!uuid.seq) // HACK |
630 | if (!uuid.seq) // HACK |
670 | uuid = UUID::gen (); |
631 | uuid = UUID::gen (); |
671 | |
632 | |
672 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
633 | // TODO: unclean state changes, should not be done in copy_to AND instantiate |
673 | if (flag [FLAG_RANDOM_SPEED] && speed) |
634 | if (flag [FLAG_RANDOM_SPEED] && speed) |
674 | speed_left = - speed - rndm (); // TODO animation |
635 | speed_left = - speed - rndm (); // TODO animation |
675 | else |
636 | else |
676 | speed_left = -1.; |
637 | speed_left = -1.; |
677 | |
638 | |
678 | /* copy the body_info to the body_used - this is only really |
639 | /* copy the body_info to the body_used - this is only really |
679 | * need for monsters, but doesn't hurt to do it for everything. |
640 | * need for monsters, but doesn't hurt to do it for everything. |
680 | * by doing so, when a monster is created, it has good starting |
641 | * by doing so, when a monster is created, it has good starting |
681 | * values for the body_used info, so when items are created |
642 | * values for the body_used info, so when items are created |
682 | * for it, they can be properly equipped. |
643 | * for it, they can be properly equipped. |
683 | */ |
644 | */ |
684 | for (int i = NUM_BODY_LOCATIONS; i--; ) |
645 | for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) |
685 | slot[i].used = slot[i].info; |
646 | slot[i].used = slot[i].info; |
686 | |
647 | |
687 | attachable::instantiate (); |
648 | attachable::instantiate (); |
688 | } |
649 | } |
689 | |
650 | |
… | |
… | |
699 | |
660 | |
700 | neu->map = map; // not copied by copy_to |
661 | neu->map = map; // not copied by copy_to |
701 | return neu; |
662 | return neu; |
702 | } |
663 | } |
703 | |
664 | |
|
|
665 | // update the anhimation frame of an object, but only if it has an animation |
|
|
666 | // assigned and the frame number if within the animation. |
|
|
667 | void object::update_anim_frame (int frame) |
|
|
668 | { |
|
|
669 | if (ecb_expect_false (!has_anim () || frame >= anim_frames ())) |
|
|
670 | return; |
|
|
671 | |
|
|
672 | set_anim_frame (frame); |
|
|
673 | update_object (this, UP_OBJ_FACE); |
|
|
674 | } |
|
|
675 | |
704 | /* |
676 | /* |
705 | * If an object with the IS_TURNABLE() flag needs to be turned due |
677 | * If an object with the IS_TURNABLE() flag needs to be turned due |
706 | * to the closest player being on the other side, this function can |
678 | * to the closest player being on the other side, this function can |
707 | * be called to update the face variable, _and_ how it looks on the map. |
679 | * be called to update the face variable, _and_ how it looks on the map. |
708 | */ |
680 | */ |
… | |
… | |
710 | update_turn_face (object *op) |
682 | update_turn_face (object *op) |
711 | { |
683 | { |
712 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
684 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
713 | return; |
685 | return; |
714 | |
686 | |
715 | SET_ANIMATION (op, op->direction); |
687 | op->update_anim_frame (op->direction); |
716 | update_object (op, UP_OBJ_FACE); |
|
|
717 | } |
688 | } |
718 | |
689 | |
719 | /* |
690 | /* |
720 | * Updates the speed of an object. If the speed changes from 0 to another |
691 | * Updates the speed of an object. If the speed changes from 0 to another |
721 | * value, or vice versa, then add/remove the object from the active list. |
692 | * value, or vice versa, then add/remove the object from the active list. |
… | |
… | |
731 | else |
702 | else |
732 | deactivate (); |
703 | deactivate (); |
733 | } |
704 | } |
734 | |
705 | |
735 | /* |
706 | /* |
736 | * update_object() updates the the map. |
707 | * update_object() updates the map. |
737 | * It takes into account invisible objects (and represent squares covered |
708 | * It takes into account invisible objects (and represent squares covered |
738 | * by invisible objects by whatever is below them (unless it's another |
709 | * by invisible objects by whatever is below them (unless it's another |
739 | * invisible object, etc...) |
710 | * invisible object, etc...) |
740 | * If the object being updated is beneath a player, the look-window |
711 | * If the object being updated is beneath a player, the look-window |
741 | * of that player is updated (this might be a suboptimal way of |
712 | * of that player is updated (this might be a suboptimal way of |
… | |
… | |
778 | } |
749 | } |
779 | |
750 | |
780 | mapspace &m = op->ms (); |
751 | mapspace &m = op->ms (); |
781 | |
752 | |
782 | if (!(m.flags_ & P_UPTODATE)) |
753 | if (!(m.flags_ & P_UPTODATE)) |
783 | /* nop */; |
754 | m.update_up (); // nothing to do except copy up |
784 | else if (action == UP_OBJ_INSERT) |
755 | else if (action == UP_OBJ_INSERT) |
785 | { |
756 | { |
786 | #if 0 |
757 | #if 0 |
787 | // this is likely overkill, TODO: revisit (schmorp) |
758 | // this is likely overkill, TODO: revisit (schmorp) |
788 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
759 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
… | |
… | |
793 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
764 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
794 | || (m.move_on | op->move_on ) != m.move_on |
765 | || (m.move_on | op->move_on ) != m.move_on |
795 | || (m.move_off | op->move_off ) != m.move_off |
766 | || (m.move_off | op->move_off ) != m.move_off |
796 | || (m.move_slow | op->move_slow) != m.move_slow |
767 | || (m.move_slow | op->move_slow) != m.move_slow |
797 | /* This isn't perfect, but I don't expect a lot of objects to |
768 | /* This isn't perfect, but I don't expect a lot of objects to |
798 | * have move_allow right now. |
769 | * have move_allow right now. |
799 | */ |
770 | */ |
800 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
771 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
801 | m.invalidate (); |
772 | m.invalidate (); |
802 | #else |
773 | #else |
803 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
774 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
… | |
… | |
809 | * that is being removed. |
780 | * that is being removed. |
810 | */ |
781 | */ |
811 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
782 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
812 | m.invalidate (); |
783 | m.invalidate (); |
813 | else if (action == UP_OBJ_FACE) |
784 | else if (action == UP_OBJ_FACE) |
814 | /* Nothing to do for that case */ ; |
785 | m.update_up (); // nothing to do for that case, except copy up |
815 | else |
786 | else |
816 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
787 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
817 | |
788 | |
818 | if (op->more) |
789 | if (op->more) |
819 | update_object (op->more, action); |
790 | update_object (op->more, action); |
… | |
… | |
830 | |
801 | |
831 | object::~object () |
802 | object::~object () |
832 | { |
803 | { |
833 | unlink (); |
804 | unlink (); |
834 | |
805 | |
835 | free_key_values (this); |
806 | kv.clear (); |
836 | } |
807 | } |
837 | |
808 | |
838 | void object::link () |
809 | void object::link () |
839 | { |
810 | { |
840 | assert (!index);//D |
811 | assert (!index);//D |
… | |
… | |
883 | op->activate_recursive (); |
854 | op->activate_recursive (); |
884 | } |
855 | } |
885 | |
856 | |
886 | /* This function removes object 'op' from the list of active |
857 | /* This function removes object 'op' from the list of active |
887 | * objects. |
858 | * objects. |
888 | * This should only be used for style maps or other such |
859 | * This should only be used for style maps or other such |
889 | * reference maps where you don't want an object that isn't |
860 | * reference maps where you don't want an object that isn't |
890 | * in play chewing up cpu time getting processed. |
861 | * in play chewing up cpu time getting processed. |
891 | * The reverse of this is to call update_ob_speed, which |
862 | * The reverse of this is to call update_ob_speed, which |
892 | * will do the right thing based on the speed of the object. |
863 | * will do the right thing based on the speed of the object. |
893 | */ |
864 | */ |
… | |
… | |
939 | * if some form of movement is allowed, let objects |
910 | * if some form of movement is allowed, let objects |
940 | * drop on that space. |
911 | * drop on that space. |
941 | */ |
912 | */ |
942 | if (!drop_to_ground |
913 | if (!drop_to_ground |
943 | || !map |
914 | || !map |
944 | || map->in_memory != MAP_ACTIVE |
915 | || !map->linkable () |
945 | || map->no_drop |
916 | || map->no_drop |
946 | || ms ().move_block == MOVE_ALL) |
917 | || ms ().move_block == MOVE_ALL) |
947 | { |
918 | { |
948 | while (inv) |
919 | while (inv) |
949 | inv->destroy (); |
920 | inv->destroy (); |
… | |
… | |
1046 | |
1017 | |
1047 | freelist = li; |
1018 | freelist = li; |
1048 | ++free_count; |
1019 | ++free_count; |
1049 | } |
1020 | } |
1050 | |
1021 | |
1051 | static struct freed_map : maptile |
|
|
1052 | { |
|
|
1053 | freed_map () |
|
|
1054 | : maptile (3, 3) |
|
|
1055 | { |
|
|
1056 | path = "<freed objects map>"; |
|
|
1057 | name = "/internal/freed_objects_map"; |
|
|
1058 | no_drop = 1; |
|
|
1059 | no_reset = 1; |
|
|
1060 | |
|
|
1061 | in_memory = MAP_ACTIVE; |
|
|
1062 | } |
|
|
1063 | |
|
|
1064 | ~freed_map () |
|
|
1065 | { |
|
|
1066 | destroy (); |
|
|
1067 | } |
|
|
1068 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
1069 | |
|
|
1070 | void |
1022 | void |
1071 | object::do_destroy () |
1023 | object::do_destroy () |
1072 | { |
1024 | { |
1073 | if (flag [FLAG_IS_LINKED]) |
1025 | if (flag [FLAG_IS_LINKED]) |
1074 | remove_link (); |
1026 | remove_link (); |
… | |
… | |
1147 | flag [FLAG_REMOVED] = true; |
1099 | flag [FLAG_REMOVED] = true; |
1148 | |
1100 | |
1149 | if (more) |
1101 | if (more) |
1150 | more->remove (); |
1102 | more->remove (); |
1151 | |
1103 | |
1152 | /* |
1104 | /* |
1153 | * In this case, the object to be removed is in someones |
1105 | * In this case, the object to be removed is in someones |
1154 | * inventory. |
1106 | * inventory. |
1155 | */ |
1107 | */ |
1156 | if (env) |
1108 | if (env) |
1157 | { |
1109 | { |
… | |
… | |
1239 | |
1191 | |
1240 | above = 0; |
1192 | above = 0; |
1241 | below = 0; |
1193 | below = 0; |
1242 | |
1194 | |
1243 | ms.invalidate (); |
1195 | ms.invalidate (); |
1244 | |
|
|
1245 | if (map->in_memory == MAP_SAVING) |
|
|
1246 | return; |
|
|
1247 | |
1196 | |
1248 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1197 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1249 | |
1198 | |
1250 | if (object *pl = ms.player ()) |
1199 | if (object *pl = ms.player ()) |
1251 | { |
1200 | { |
… | |
… | |
1386 | { |
1335 | { |
1387 | op->remove (); |
1336 | op->remove (); |
1388 | |
1337 | |
1389 | if (m == &freed_map)//D TODO: remove soon |
1338 | if (m == &freed_map)//D TODO: remove soon |
1390 | {//D |
1339 | {//D |
1391 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1340 | LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D |
1392 | }//D |
1341 | }//D |
1393 | |
1342 | |
1394 | /* Ideally, the caller figures this out. However, it complicates a lot |
1343 | /* Ideally, the caller figures this out. However, it complicates a lot |
1395 | * of areas of callers (eg, anything that uses find_free_spot would now |
1344 | * of areas of callers (eg, anything that uses find_free_spot would now |
1396 | * need extra work |
1345 | * need extra work |
… | |
… | |
1465 | * We've already dealt with merging if appropriate. |
1414 | * We've already dealt with merging if appropriate. |
1466 | * Generally, we want to put the new object on top. But if |
1415 | * Generally, we want to put the new object on top. But if |
1467 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1416 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1468 | * floor, we want to insert above that and no further. |
1417 | * floor, we want to insert above that and no further. |
1469 | * Also, if there are spell objects on this space, we stop processing |
1418 | * Also, if there are spell objects on this space, we stop processing |
1470 | * once we get to them. This reduces the need to traverse over all of |
1419 | * once we get to them. This reduces the need to traverse over all of |
1471 | * them when adding another one - this saves quite a bit of cpu time |
1420 | * them when adding another one - this saves quite a bit of cpu time |
1472 | * when lots of spells are cast in one area. Currently, it is presumed |
1421 | * when lots of spells are cast in one area. Currently, it is presumed |
1473 | * that flying non pickable objects are spell objects. |
1422 | * that flying non pickable objects are spell objects. |
1474 | */ |
1423 | */ |
1475 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1424 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
… | |
… | |
1601 | |
1550 | |
1602 | return op; |
1551 | return op; |
1603 | } |
1552 | } |
1604 | |
1553 | |
1605 | /* this function inserts an object in the map, but if it |
1554 | /* this function inserts an object in the map, but if it |
1606 | * finds an object of its own type, it'll remove that one first. |
1555 | * finds an object of its own type, it'll remove that one first. |
1607 | * op is the object to insert it under: supplies x and the map. |
1556 | * op is the object to insert it under: supplies x and the map. |
1608 | */ |
1557 | */ |
1609 | void |
1558 | void |
1610 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1559 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1611 | { |
1560 | { |
… | |
… | |
1643 | if (!items // testing !items ensures we can drop at least one item |
1592 | if (!items // testing !items ensures we can drop at least one item |
1644 | || (items < m->max_items |
1593 | || (items < m->max_items |
1645 | && ms.volume () < m->max_volume)) |
1594 | && ms.volume () < m->max_volume)) |
1646 | return true; |
1595 | return true; |
1647 | |
1596 | |
1648 | if (originator && originator->is_player ()) |
1597 | if (originator) |
1649 | originator->contr->failmsgf ( |
1598 | originator->failmsgf ( |
1650 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1599 | "No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>", |
1651 | query_name () |
1600 | query_name () |
1652 | ); |
1601 | ); |
1653 | |
1602 | |
1654 | return false; |
1603 | return false; |
1655 | } |
1604 | } |
… | |
… | |
1669 | |
1618 | |
1670 | nr = min (nr, nrof); |
1619 | nr = min (nr, nrof); |
1671 | |
1620 | |
1672 | if (nrof > nr) |
1621 | if (nrof > nr) |
1673 | { |
1622 | { |
1674 | sint64 oweight = total_weight (); |
1623 | weight_t oweight = total_weight (); |
1675 | |
1624 | |
1676 | nrof -= nr; |
1625 | nrof -= nr; |
1677 | |
1626 | |
1678 | if (object *pl = visible_to ()) |
1627 | if (object *pl = visible_to ()) |
1679 | esrv_update_item (UPD_NROF, pl, this); |
1628 | esrv_update_item (UPD_NROF, pl, this); |
… | |
… | |
1740 | /* |
1689 | /* |
1741 | * env->insert (op) |
1690 | * env->insert (op) |
1742 | * This function inserts the object op in the linked list |
1691 | * This function inserts the object op in the linked list |
1743 | * inside the object environment. |
1692 | * inside the object environment. |
1744 | * |
1693 | * |
1745 | * The function returns now pointer to inserted item, and return value can |
1694 | * The function returns now pointer to inserted item, and return value can |
1746 | * be != op, if items are merged. -Tero |
1695 | * be != op, if items are merged. -Tero |
1747 | */ |
1696 | */ |
1748 | object * |
1697 | object * |
1749 | object::insert (object *op) |
1698 | object::insert (object *op) |
1750 | { |
1699 | { |
… | |
… | |
1763 | if (object::can_merge (tmp, op)) |
1712 | if (object::can_merge (tmp, op)) |
1764 | { |
1713 | { |
1765 | /* return the original object and remove inserted object |
1714 | /* return the original object and remove inserted object |
1766 | (client prefers the original object) */ |
1715 | (client prefers the original object) */ |
1767 | |
1716 | |
1768 | // carring must be 0 for mergable objects |
1717 | // carrying must be 0 for mergable objects |
1769 | sint64 oweight = tmp->weight * tmp->nrof; |
1718 | weight_t oweight = weight_t (tmp->weight) * tmp->nrof; |
1770 | |
1719 | |
1771 | tmp->nrof += op->nrof; |
1720 | tmp->nrof += op->nrof; |
1772 | |
1721 | |
1773 | if (object *pl = tmp->visible_to ()) |
1722 | if (object *pl = tmp->visible_to ()) |
1774 | esrv_update_item (UPD_NROF, pl, tmp); |
1723 | esrv_update_item (UPD_NROF, pl, tmp); |
1775 | |
1724 | |
1776 | adjust_weight (this, oweight, tmp->weight * tmp->nrof); |
1725 | adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof); |
1777 | |
1726 | |
1778 | op->destroy (); |
1727 | op->destroy (); |
1779 | op = tmp; |
1728 | op = tmp; |
1780 | goto inserted; |
1729 | goto inserted; |
1781 | } |
1730 | } |
… | |
… | |
1870 | */ |
1819 | */ |
1871 | if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0) |
1820 | if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0) |
1872 | return 0; |
1821 | return 0; |
1873 | |
1822 | |
1874 | /* The objects have to be checked from top to bottom. |
1823 | /* The objects have to be checked from top to bottom. |
1875 | * Hence, we first go to the top: |
1824 | * Hence, we first go to the top: |
1876 | */ |
1825 | */ |
1877 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1826 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1878 | { |
1827 | { |
1879 | next = tmp->below; |
1828 | next = tmp->below; |
1880 | |
1829 | |
… | |
… | |
2064 | * inform the caller. However, insert_ob_in_map will update as |
2013 | * inform the caller. However, insert_ob_in_map will update as |
2065 | * necessary, so the caller shouldn't need to do any special work. |
2014 | * necessary, so the caller shouldn't need to do any special work. |
2066 | * Note - updated to take an object instead of archetype - this is necessary |
2015 | * Note - updated to take an object instead of archetype - this is necessary |
2067 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2016 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2068 | * to know if the space in question will block the object. We can't use |
2017 | * to know if the space in question will block the object. We can't use |
2069 | * the archetype because that isn't correct if the monster has been |
2018 | * the archetype because that isn't correct if the monster has been |
2070 | * customized, changed states, etc. |
2019 | * customized, changed states, etc. |
2071 | */ |
2020 | */ |
2072 | int |
2021 | int |
2073 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2022 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2074 | { |
2023 | { |
2075 | int altern[SIZEOFFREE]; |
2024 | int altern[SIZEOFFREE]; |
2076 | int index = 0, flag; |
2025 | int index = 0; |
2077 | |
2026 | |
2078 | for (int i = start; i < stop; i++) |
2027 | for (int i = start; i < stop; i++) |
2079 | { |
2028 | { |
2080 | mapxy pos (m, x, y); pos.move (i); |
2029 | mapxy pos (m, x, y); pos.move (i); |
2081 | |
2030 | |
… | |
… | |
2097 | continue; |
2046 | continue; |
2098 | } |
2047 | } |
2099 | |
2048 | |
2100 | /* Basically, if we find a wall on a space, we cut down the search size. |
2049 | /* Basically, if we find a wall on a space, we cut down the search size. |
2101 | * In this way, we won't return spaces that are on another side of a wall. |
2050 | * In this way, we won't return spaces that are on another side of a wall. |
2102 | * This mostly work, but it cuts down the search size in all directions - |
2051 | * This mostly work, but it cuts down the search size in all directions - |
2103 | * if the space being examined only has a wall to the north and empty |
2052 | * if the space being examined only has a wall to the north and empty |
2104 | * spaces in all the other directions, this will reduce the search space |
2053 | * spaces in all the other directions, this will reduce the search space |
2105 | * to only the spaces immediately surrounding the target area, and |
2054 | * to only the spaces immediately surrounding the target area, and |
2106 | * won't look 2 spaces south of the target space. |
2055 | * won't look 2 spaces south of the target space. |
2107 | */ |
2056 | */ |
… | |
… | |
2137 | */ |
2086 | */ |
2138 | int |
2087 | int |
2139 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2088 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2140 | { |
2089 | { |
2141 | for (int i = 0; i < SIZEOFFREE; i++) |
2090 | for (int i = 0; i < SIZEOFFREE; i++) |
2142 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2091 | if (!ob->blocked (m, x + DIRX (i), y + DIRY (i))) |
2143 | return i; |
2092 | return i; |
2144 | |
2093 | |
2145 | return -1; |
2094 | return -1; |
2146 | } |
2095 | } |
2147 | |
2096 | |
… | |
… | |
2158 | |
2107 | |
2159 | while (--end) |
2108 | while (--end) |
2160 | swap (arr [end], arr [rndm (end + 1)]); |
2109 | swap (arr [end], arr [rndm (end + 1)]); |
2161 | } |
2110 | } |
2162 | |
2111 | |
2163 | /* new function to make monster searching more efficient, and effective! |
2112 | /* new function to make monster searching more efficient, and effective! |
2164 | * This basically returns a randomized array (in the passed pointer) of |
2113 | * This basically returns a randomized array (in the passed pointer) of |
2165 | * the spaces to find monsters. In this way, it won't always look for |
2114 | * the spaces to find monsters. In this way, it won't always look for |
2166 | * monsters to the north first. However, the size of the array passed |
2115 | * monsters to the north first. However, the size of the array passed |
2167 | * covers all the spaces, so within that size, all the spaces within |
2116 | * covers all the spaces, so within that size, all the spaces within |
2168 | * the 3x3 area will be searched, just not in a predictable order. |
2117 | * the 3x3 area will be searched, just not in a predictable order. |
… | |
… | |
2193 | * there is capable of. |
2142 | * there is capable of. |
2194 | */ |
2143 | */ |
2195 | int |
2144 | int |
2196 | find_dir (maptile *m, int x, int y, object *exclude) |
2145 | find_dir (maptile *m, int x, int y, object *exclude) |
2197 | { |
2146 | { |
2198 | int max = SIZEOFFREE, mflags; |
2147 | int max = SIZEOFFREE; |
2199 | MoveType move_type; |
2148 | MoveType move_type; |
2200 | |
2149 | |
2201 | if (exclude && exclude->head_ () != exclude) |
2150 | if (exclude && exclude->head_ () != exclude) |
2202 | { |
2151 | { |
2203 | exclude = exclude->head; |
2152 | exclude = exclude->head; |
… | |
… | |
2412 | int mflags; |
2361 | int mflags; |
2413 | |
2362 | |
2414 | if (dir < 0) |
2363 | if (dir < 0) |
2415 | return 0; /* exit condition: invalid direction */ |
2364 | return 0; /* exit condition: invalid direction */ |
2416 | |
2365 | |
2417 | dx = x + freearr_x[dir]; |
2366 | dx = x + DIRX (dir); |
2418 | dy = y + freearr_y[dir]; |
2367 | dy = y + DIRY (dir); |
2419 | |
2368 | |
2420 | mflags = get_map_flags (m, &m, dx, dy, &dx, &dy); |
2369 | mflags = get_map_flags (m, &m, dx, dy, &dx, &dy); |
2421 | |
2370 | |
2422 | /* This functional arguably was incorrect before - it was |
2371 | /* This functional arguably was incorrect before - it was |
2423 | * checking for P_WALL - that was basically seeing if |
2372 | * checking for P_WALL - that was basically seeing if |
… | |
… | |
2454 | return /*who->flag [FLAG_WIZ]|| */ |
2403 | return /*who->flag [FLAG_WIZ]|| */ |
2455 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2404 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2456 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2405 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2457 | } |
2406 | } |
2458 | |
2407 | |
|
|
2408 | //-GPL |
|
|
2409 | |
2459 | /* |
2410 | /* |
2460 | * create clone from object to another |
2411 | * create clone from object to another |
2461 | */ |
2412 | */ |
2462 | object * |
2413 | object * |
2463 | object::deep_clone () |
2414 | object::deep_clone () |
… | |
… | |
2493 | return tmp; |
2444 | return tmp; |
2494 | |
2445 | |
2495 | return 0; |
2446 | return 0; |
2496 | } |
2447 | } |
2497 | |
2448 | |
|
|
2449 | /* Zero the key_values on op, decrementing the shared-string |
|
|
2450 | * refcounts and freeing the links. |
|
|
2451 | */ |
|
|
2452 | void |
|
|
2453 | key_values::clear () |
|
|
2454 | { |
|
|
2455 | for (key_value *kvp = first; kvp; ) |
|
|
2456 | { |
|
|
2457 | key_value *next = kvp->next; |
|
|
2458 | delete kvp; |
|
|
2459 | kvp = next; |
|
|
2460 | } |
|
|
2461 | |
|
|
2462 | first = 0; |
|
|
2463 | } |
|
|
2464 | |
2498 | shstr_tmp |
2465 | shstr_tmp |
2499 | object::kv_get (shstr_tmp key) const |
2466 | key_values::get (shstr_tmp key) const |
2500 | { |
2467 | { |
2501 | for (key_value *kv = key_values; kv; kv = kv->next) |
2468 | for (key_value *kv = first; kv; kv = kv->next) |
2502 | if (kv->key == key) |
2469 | if (kv->key == key) |
2503 | return kv->value; |
2470 | return kv->value; |
2504 | |
2471 | |
2505 | return shstr (); |
2472 | return shstr (); |
2506 | } |
2473 | } |
2507 | |
2474 | |
2508 | void |
2475 | void |
|
|
2476 | key_values::add (shstr_tmp key, shstr_tmp value) |
|
|
2477 | { |
|
|
2478 | key_value *kv = new key_value; |
|
|
2479 | |
|
|
2480 | kv->next = first; |
|
|
2481 | kv->key = key; |
|
|
2482 | kv->value = value; |
|
|
2483 | |
|
|
2484 | first = kv; |
|
|
2485 | } |
|
|
2486 | |
|
|
2487 | void |
2509 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2488 | key_values::set (shstr_tmp key, shstr_tmp value) |
2510 | { |
2489 | { |
2511 | for (key_value *kv = key_values; kv; kv = kv->next) |
2490 | for (key_value *kv = first; kv; kv = kv->next) |
2512 | if (kv->key == key) |
2491 | if (kv->key == key) |
2513 | { |
2492 | { |
2514 | kv->value = value; |
2493 | kv->value = value; |
2515 | return; |
2494 | return; |
2516 | } |
2495 | } |
2517 | |
2496 | |
2518 | key_value *kv = new key_value; |
2497 | add (key, value); |
2519 | |
|
|
2520 | kv->next = key_values; |
|
|
2521 | kv->key = key; |
|
|
2522 | kv->value = value; |
|
|
2523 | |
|
|
2524 | key_values = kv; |
|
|
2525 | } |
2498 | } |
2526 | |
2499 | |
2527 | void |
2500 | void |
2528 | object::kv_del (shstr_tmp key) |
2501 | key_values::del (shstr_tmp key) |
2529 | { |
2502 | { |
2530 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2503 | for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next) |
2531 | if ((*kvp)->key == key) |
2504 | if ((*kvp)->key == key) |
2532 | { |
2505 | { |
2533 | key_value *kv = *kvp; |
2506 | key_value *kv = *kvp; |
2534 | *kvp = (*kvp)->next; |
2507 | *kvp = (*kvp)->next; |
2535 | delete kv; |
2508 | delete kv; |
2536 | return; |
2509 | return; |
2537 | } |
2510 | } |
|
|
2511 | } |
|
|
2512 | |
|
|
2513 | void |
|
|
2514 | key_values::reverse () |
|
|
2515 | { |
|
|
2516 | key_value *prev = 0; |
|
|
2517 | key_value *head = first; |
|
|
2518 | |
|
|
2519 | while (head) |
|
|
2520 | { |
|
|
2521 | key_value *node = head; |
|
|
2522 | head = head->next; |
|
|
2523 | node->next = prev; |
|
|
2524 | prev = node; |
|
|
2525 | } |
|
|
2526 | |
|
|
2527 | first = prev; |
|
|
2528 | } |
|
|
2529 | |
|
|
2530 | key_values & |
|
|
2531 | key_values::operator =(const key_values &kv) |
|
|
2532 | { |
|
|
2533 | clear (); |
|
|
2534 | |
|
|
2535 | for (key_value *kvp = kv.first; kvp; kvp = kvp->next) |
|
|
2536 | add (kvp->key, kvp->value); |
|
|
2537 | |
|
|
2538 | reverse (); |
2538 | } |
2539 | } |
2539 | |
2540 | |
2540 | object::depth_iterator::depth_iterator (object *container) |
2541 | object::depth_iterator::depth_iterator (object *container) |
2541 | : iterator_base (container) |
2542 | : iterator_base (container) |
2542 | { |
2543 | { |
… | |
… | |
2625 | object::region () const |
2626 | object::region () const |
2626 | { |
2627 | { |
2627 | return map ? map->region (x, y) |
2628 | return map ? map->region (x, y) |
2628 | : region::default_region (); |
2629 | : region::default_region (); |
2629 | } |
2630 | } |
|
|
2631 | |
|
|
2632 | //+GPL |
2630 | |
2633 | |
2631 | void |
2634 | void |
2632 | object::open_container (object *new_container) |
2635 | object::open_container (object *new_container) |
2633 | { |
2636 | { |
2634 | if (container == new_container) |
2637 | if (container == new_container) |
… | |
… | |
2692 | } |
2695 | } |
2693 | // else if (!old_container->env && contr && contr->ns) |
2696 | // else if (!old_container->env && contr && contr->ns) |
2694 | // contr->ns->floorbox_reset (); |
2697 | // contr->ns->floorbox_reset (); |
2695 | } |
2698 | } |
2696 | |
2699 | |
|
|
2700 | //-GPL |
|
|
2701 | |
|
|
2702 | // prefetch some flat area around the player |
|
|
2703 | static void |
|
|
2704 | prefetch_surrounding_area (object *op, maptile *map, int range) |
|
|
2705 | { |
|
|
2706 | for (maprect *rect = map->split_to_tiles (mapwalk_buf, |
|
|
2707 | op->x - range , op->y - range , |
|
|
2708 | op->x + range + 1, op->y + range + 1); |
|
|
2709 | rect->m; |
|
|
2710 | ++rect) |
|
|
2711 | { |
|
|
2712 | rect->m->touch (); |
|
|
2713 | rect->m->activate (); |
|
|
2714 | } |
|
|
2715 | } |
|
|
2716 | |
|
|
2717 | // prefetch a generous area around the player, also up and down |
|
|
2718 | void |
|
|
2719 | object::prefetch_surrounding_maps () |
|
|
2720 | { |
|
|
2721 | prefetch_surrounding_area (this, map, 40); |
|
|
2722 | |
|
|
2723 | if (maptile *m = map->tile_available (TILE_DOWN)) |
|
|
2724 | prefetch_surrounding_area (this, m, 20); |
|
|
2725 | |
|
|
2726 | if (maptile *m = map->tile_available (TILE_UP)) |
|
|
2727 | prefetch_surrounding_area (this, m, 20); |
|
|
2728 | } |
|
|
2729 | |
|
|
2730 | //+GPL |
|
|
2731 | |
2697 | object * |
2732 | object * |
2698 | object::force_find (shstr_tmp name) |
2733 | object::force_find (shstr_tmp name) |
2699 | { |
2734 | { |
2700 | /* cycle through his inventory to look for the MARK we want to |
2735 | /* cycle through his inventory to look for the MARK we want to |
2701 | * place |
2736 | * place |
2702 | */ |
2737 | */ |
2703 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2738 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2704 | if (tmp->type == FORCE && tmp->slaying == name) |
2739 | if (tmp->type == FORCE && tmp->slaying == name) |
2705 | return splay (tmp); |
2740 | return splay (tmp); |
2706 | |
2741 | |
2707 | return 0; |
2742 | return 0; |
2708 | } |
2743 | } |
2709 | |
2744 | |
2710 | //-GPL |
|
|
2711 | |
|
|
2712 | void |
2745 | void |
2713 | object::force_set_timer (int duration) |
2746 | object::force_set_timer (int duration) |
2714 | { |
2747 | { |
2715 | this->duration = 1; |
2748 | this->duration = 1; |
2716 | this->speed_left = -1.f; |
2749 | this->speed_left = -1.f; |
… | |
… | |
2722 | object::force_add (shstr_tmp name, int duration) |
2755 | object::force_add (shstr_tmp name, int duration) |
2723 | { |
2756 | { |
2724 | if (object *force = force_find (name)) |
2757 | if (object *force = force_find (name)) |
2725 | force->destroy (); |
2758 | force->destroy (); |
2726 | |
2759 | |
2727 | object *force = get_archetype (FORCE_NAME); |
2760 | object *force = archetype::get (FORCE_NAME); |
2728 | |
2761 | |
2729 | force->slaying = name; |
2762 | force->slaying = name; |
2730 | force->force_set_timer (duration); |
2763 | force->force_set_timer (duration); |
2731 | force->flag [FLAG_APPLIED] = true; |
2764 | force->flag [FLAG_APPLIED] = true; |
2732 | |
2765 | |
… | |
… | |
2816 | return contr->mark; |
2849 | return contr->mark; |
2817 | else |
2850 | else |
2818 | return 0; |
2851 | return 0; |
2819 | } |
2852 | } |
2820 | |
2853 | |
|
|
2854 | // put marked object first in the inventory |
|
|
2855 | // this is used by identify-like spells so players can influence |
|
|
2856 | // the order a bit. |
|
|
2857 | void |
|
|
2858 | object::splay_marked () |
|
|
2859 | { |
|
|
2860 | if (object *marked = mark ()) |
|
|
2861 | splay (marked); |
|
|
2862 | } |
|
|
2863 | |