1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | 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, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | variable. */ |
27 | variable. */ |
27 | #include <global.h> |
28 | #include <global.h> |
… | |
… | |
36 | |
37 | |
37 | int nrofallocobjects = 0; |
38 | int nrofallocobjects = 0; |
38 | static UUID uuid; |
39 | static UUID uuid; |
39 | const uint64 UUID_SKIP = 1<<19; |
40 | const uint64 UUID_SKIP = 1<<19; |
40 | |
41 | |
41 | object *active_objects; /* List of active objects that need to be processed */ |
42 | objectvec objects; |
|
|
43 | activevec actives; |
42 | |
44 | |
43 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
45 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
46 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
45 | }; |
47 | }; |
46 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
48 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
… | |
… | |
190 | * Check nrof variable *before* calling can_merge() |
192 | * Check nrof variable *before* calling can_merge() |
191 | * |
193 | * |
192 | * Improvements made with merge: Better checking on potion, and also |
194 | * Improvements made with merge: Better checking on potion, and also |
193 | * check weight |
195 | * check weight |
194 | */ |
196 | */ |
195 | |
|
|
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | { |
198 | { |
198 | /* A couple quicksanity checks */ |
199 | /* A couple quicksanity checks */ |
199 | if (ob1 == ob2 |
200 | if (ob1 == ob2 |
200 | || ob1->type != ob2->type |
201 | || ob1->type != ob2->type |
… | |
… | |
277 | |
278 | |
278 | /* Note sure why the following is the case - either the object has to |
279 | /* Note sure why the following is the case - either the object has to |
279 | * be animated or have a very low speed. Is this an attempted monster |
280 | * be animated or have a very low speed. Is this an attempted monster |
280 | * check? |
281 | * check? |
281 | */ |
282 | */ |
282 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
283 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
283 | return 0; |
284 | return 0; |
284 | |
285 | |
285 | switch (ob1->type) |
286 | switch (ob1->type) |
286 | { |
287 | { |
287 | case SCROLL: |
288 | case SCROLL: |
… | |
… | |
356 | /* |
357 | /* |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
358 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
358 | * Some error messages. |
359 | * Some error messages. |
359 | * The result of the dump is stored in the static global errmsg array. |
360 | * The result of the dump is stored in the static global errmsg array. |
360 | */ |
361 | */ |
361 | |
|
|
362 | char * |
362 | char * |
363 | dump_object (object *op) |
363 | dump_object (object *op) |
364 | { |
364 | { |
365 | if (!op) |
365 | if (!op) |
366 | return strdup ("[NULLOBJ]"); |
366 | return strdup ("[NULLOBJ]"); |
367 | |
367 | |
368 | object_freezer freezer; |
368 | object_freezer freezer; |
369 | save_object (freezer, op, 1); |
369 | op->write (freezer); |
370 | return freezer.as_string (); |
370 | return freezer.as_string (); |
371 | } |
371 | } |
372 | |
372 | |
373 | /* |
373 | /* |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
391 | } |
391 | } |
392 | |
392 | |
393 | /* |
393 | /* |
394 | * Returns the object which has the count-variable equal to the argument. |
394 | * Returns the object which has the count-variable equal to the argument. |
395 | */ |
395 | */ |
396 | |
|
|
397 | object * |
396 | object * |
398 | find_object (tag_t i) |
397 | find_object (tag_t i) |
399 | { |
398 | { |
400 | for (object *op = object::first; op; op = op->next) |
399 | for_all_objects (op) |
401 | if (op->count == i) |
400 | if (op->count == i) |
402 | return op; |
401 | return op; |
403 | |
402 | |
404 | return 0; |
403 | return 0; |
405 | } |
404 | } |
406 | |
405 | |
407 | /* |
406 | /* |
408 | * Returns the first object which has a name equal to the argument. |
407 | * Returns the first object which has a name equal to the argument. |
409 | * Used only by the patch command, but not all that useful. |
408 | * Used only by the patch command, but not all that useful. |
410 | * Enables features like "patch <name-of-other-player> food 999" |
409 | * Enables features like "patch <name-of-other-player> food 999" |
411 | */ |
410 | */ |
412 | |
|
|
413 | object * |
411 | object * |
414 | find_object_name (const char *str) |
412 | find_object_name (const char *str) |
415 | { |
413 | { |
416 | shstr_cmp str_ (str); |
414 | shstr_cmp str_ (str); |
417 | object *op; |
415 | object *op; |
418 | |
416 | |
419 | for (op = object::first; op != NULL; op = op->next) |
417 | for_all_objects (op) |
420 | if (op->name == str_) |
418 | if (op->name == str_) |
421 | break; |
419 | break; |
422 | |
420 | |
423 | return op; |
421 | return op; |
424 | } |
422 | } |
… | |
… | |
490 | |
488 | |
491 | if (is_removed) |
489 | if (is_removed) |
492 | SET_FLAG (dst, FLAG_REMOVED); |
490 | SET_FLAG (dst, FLAG_REMOVED); |
493 | |
491 | |
494 | if (speed < 0) |
492 | if (speed < 0) |
495 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
493 | dst->speed_left = speed_left - rndm (); |
496 | |
494 | |
497 | /* Copy over key_values, if any. */ |
495 | /* Copy over key_values, if any. */ |
498 | if (key_values) |
496 | if (key_values) |
499 | { |
497 | { |
500 | key_value *tail = 0; |
498 | key_value *tail = 0; |
… | |
… | |
525 | } |
523 | } |
526 | |
524 | |
527 | dst->set_speed (dst->speed); |
525 | dst->set_speed (dst->speed); |
528 | } |
526 | } |
529 | |
527 | |
|
|
528 | void |
|
|
529 | object::instantiate () |
|
|
530 | { |
|
|
531 | if (!uuid.seq) // HACK |
|
|
532 | uuid = gen_uuid (); |
|
|
533 | |
|
|
534 | speed_left = -0.1f; |
|
|
535 | /* copy the body_info to the body_used - this is only really |
|
|
536 | * need for monsters, but doesn't hurt to do it for everything. |
|
|
537 | * by doing so, when a monster is created, it has good starting |
|
|
538 | * values for the body_used info, so when items are created |
|
|
539 | * for it, they can be properly equipped. |
|
|
540 | */ |
|
|
541 | memcpy (body_used, body_info, sizeof (body_used)); |
|
|
542 | |
|
|
543 | attachable::instantiate (); |
|
|
544 | } |
|
|
545 | |
530 | object * |
546 | object * |
531 | object::clone () |
547 | object::clone () |
532 | { |
548 | { |
533 | object *neu = create (); |
549 | object *neu = create (); |
534 | copy_to (neu); |
550 | copy_to (neu); |
… | |
… | |
538 | /* |
554 | /* |
539 | * If an object with the IS_TURNABLE() flag needs to be turned due |
555 | * If an object with the IS_TURNABLE() flag needs to be turned due |
540 | * to the closest player being on the other side, this function can |
556 | * to the closest player being on the other side, this function can |
541 | * be called to update the face variable, _and_ how it looks on the map. |
557 | * be called to update the face variable, _and_ how it looks on the map. |
542 | */ |
558 | */ |
543 | |
|
|
544 | void |
559 | void |
545 | update_turn_face (object *op) |
560 | update_turn_face (object *op) |
546 | { |
561 | { |
547 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) |
562 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
548 | return; |
563 | return; |
|
|
564 | |
549 | SET_ANIMATION (op, op->direction); |
565 | SET_ANIMATION (op, op->direction); |
550 | update_object (op, UP_OBJ_FACE); |
566 | update_object (op, UP_OBJ_FACE); |
551 | } |
567 | } |
552 | |
568 | |
553 | /* |
569 | /* |
… | |
… | |
556 | * This function needs to be called whenever the speed of an object changes. |
572 | * This function needs to be called whenever the speed of an object changes. |
557 | */ |
573 | */ |
558 | void |
574 | void |
559 | object::set_speed (float speed) |
575 | object::set_speed (float speed) |
560 | { |
576 | { |
561 | extern int arch_init; |
|
|
562 | |
|
|
563 | /* No reason putting the archetypes objects on the speed list, |
|
|
564 | * since they never really need to be updated. |
|
|
565 | */ |
|
|
566 | if (flag [FLAG_FREED] && speed) |
577 | if (flag [FLAG_FREED] && speed) |
567 | { |
578 | { |
568 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
579 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
569 | speed = 0; |
580 | speed = 0; |
570 | } |
581 | } |
571 | |
582 | |
572 | this->speed = speed; |
583 | this->speed = speed; |
573 | |
584 | |
574 | if (arch_init) |
585 | if (has_active_speed ()) |
575 | return; |
586 | activate (); |
576 | |
|
|
577 | if (FABS (speed) > MIN_ACTIVE_SPEED) |
|
|
578 | { |
|
|
579 | /* If already on active list, don't do anything */ |
|
|
580 | if (active_next || active_prev || this == active_objects) |
|
|
581 | return; |
|
|
582 | |
|
|
583 | /* process_events() expects us to insert the object at the beginning |
|
|
584 | * of the list. */ |
|
|
585 | active_next = active_objects; |
|
|
586 | |
|
|
587 | if (active_next) |
|
|
588 | active_next->active_prev = this; |
|
|
589 | |
|
|
590 | active_objects = this; |
|
|
591 | } |
|
|
592 | else |
587 | else |
593 | { |
588 | deactivate (); |
594 | /* If not on the active list, nothing needs to be done */ |
|
|
595 | if (!active_next && !active_prev && this != active_objects) |
|
|
596 | return; |
|
|
597 | |
|
|
598 | if (!active_prev) |
|
|
599 | { |
|
|
600 | active_objects = active_next; |
|
|
601 | |
|
|
602 | if (active_next) |
|
|
603 | active_next->active_prev = 0; |
|
|
604 | } |
|
|
605 | else |
|
|
606 | { |
|
|
607 | active_prev->active_next = active_next; |
|
|
608 | |
|
|
609 | if (active_next) |
|
|
610 | active_next->active_prev = active_prev; |
|
|
611 | } |
|
|
612 | |
|
|
613 | active_next = 0; |
|
|
614 | active_prev = 0; |
|
|
615 | } |
|
|
616 | } |
|
|
617 | |
|
|
618 | /* This function removes object 'op' from the list of active |
|
|
619 | * objects. |
|
|
620 | * This should only be used for style maps or other such |
|
|
621 | * reference maps where you don't want an object that isn't |
|
|
622 | * in play chewing up cpu time getting processed. |
|
|
623 | * The reverse of this is to call update_ob_speed, which |
|
|
624 | * will do the right thing based on the speed of the object. |
|
|
625 | */ |
|
|
626 | void |
|
|
627 | remove_from_active_list (object *op) |
|
|
628 | { |
|
|
629 | /* If not on the active list, nothing needs to be done */ |
|
|
630 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
631 | return; |
|
|
632 | |
|
|
633 | if (op->active_prev == NULL) |
|
|
634 | { |
|
|
635 | active_objects = op->active_next; |
|
|
636 | if (op->active_next != NULL) |
|
|
637 | op->active_next->active_prev = NULL; |
|
|
638 | } |
|
|
639 | else |
|
|
640 | { |
|
|
641 | op->active_prev->active_next = op->active_next; |
|
|
642 | if (op->active_next) |
|
|
643 | op->active_next->active_prev = op->active_prev; |
|
|
644 | } |
|
|
645 | op->active_next = NULL; |
|
|
646 | op->active_prev = NULL; |
|
|
647 | } |
589 | } |
648 | |
590 | |
649 | /* |
591 | /* |
650 | * update_object() updates the the map. |
592 | * update_object() updates the the map. |
651 | * It takes into account invisible objects (and represent squares covered |
593 | * It takes into account invisible objects (and represent squares covered |
… | |
… | |
699 | return; |
641 | return; |
700 | } |
642 | } |
701 | |
643 | |
702 | mapspace &m = op->ms (); |
644 | mapspace &m = op->ms (); |
703 | |
645 | |
704 | if (m.flags_ & P_NEED_UPDATE) |
646 | if (!(m.flags_ & P_UPTODATE)) |
705 | /* nop */; |
647 | /* nop */; |
706 | else if (action == UP_OBJ_INSERT) |
648 | else if (action == UP_OBJ_INSERT) |
707 | { |
649 | { |
708 | // this is likely overkill, TODO: revisit (schmorp) |
650 | // this is likely overkill, TODO: revisit (schmorp) |
709 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
651 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
… | |
… | |
718 | /* This isn't perfect, but I don't expect a lot of objects to |
660 | /* This isn't perfect, but I don't expect a lot of objects to |
719 | * to have move_allow right now. |
661 | * to have move_allow right now. |
720 | */ |
662 | */ |
721 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
663 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
722 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
664 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
723 | m.flags_ = P_NEED_UPDATE; |
665 | m.flags_ = 0; |
724 | } |
666 | } |
725 | /* if the object is being removed, we can't make intelligent |
667 | /* if the object is being removed, we can't make intelligent |
726 | * decisions, because remove_ob can't really pass the object |
668 | * decisions, because remove_ob can't really pass the object |
727 | * that is being removed. |
669 | * that is being removed. |
728 | */ |
670 | */ |
729 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
671 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
730 | m.flags_ = P_NEED_UPDATE; |
672 | m.flags_ = 0; |
731 | else if (action == UP_OBJ_FACE) |
673 | else if (action == UP_OBJ_FACE) |
732 | /* Nothing to do for that case */ ; |
674 | /* Nothing to do for that case */ ; |
733 | else |
675 | else |
734 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
676 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
735 | |
677 | |
736 | if (op->more) |
678 | if (op->more) |
737 | update_object (op->more, action); |
679 | update_object (op->more, action); |
738 | } |
680 | } |
739 | |
681 | |
740 | object::vector object::objects; // not yet used |
|
|
741 | object *object::first; |
|
|
742 | |
|
|
743 | object::object () |
682 | object::object () |
744 | { |
683 | { |
745 | SET_FLAG (this, FLAG_REMOVED); |
684 | SET_FLAG (this, FLAG_REMOVED); |
746 | |
685 | |
747 | expmul = 1.0; |
686 | expmul = 1.0; |
748 | face = blank_face; |
687 | face = blank_face; |
749 | } |
688 | } |
750 | |
689 | |
751 | object::~object () |
690 | object::~object () |
752 | { |
691 | { |
|
|
692 | unlink (); |
|
|
693 | |
753 | free_key_values (this); |
694 | free_key_values (this); |
754 | } |
695 | } |
755 | |
696 | |
|
|
697 | static int object_count; |
|
|
698 | |
756 | void object::link () |
699 | void object::link () |
757 | { |
700 | { |
758 | count = ++ob_count; |
701 | assert (!index);//D |
759 | uuid = gen_uuid (); |
702 | uuid = gen_uuid (); |
|
|
703 | count = ++object_count; |
760 | |
704 | |
761 | prev = 0; |
705 | refcnt_inc (); |
762 | next = object::first; |
706 | objects.insert (this); |
763 | |
|
|
764 | if (object::first) |
|
|
765 | object::first->prev = this; |
|
|
766 | |
|
|
767 | object::first = this; |
|
|
768 | } |
707 | } |
769 | |
708 | |
770 | void object::unlink () |
709 | void object::unlink () |
771 | { |
710 | { |
772 | if (this == object::first) |
711 | if (!index) |
773 | object::first = next; |
712 | return; |
774 | |
713 | |
775 | /* Remove this object from the list of used objects */ |
714 | objects.erase (this); |
776 | if (prev) prev->next = next; |
715 | refcnt_dec (); |
777 | if (next) next->prev = prev; |
716 | } |
778 | |
717 | |
779 | prev = 0; |
718 | void |
780 | next = 0; |
719 | object::activate () |
|
|
720 | { |
|
|
721 | /* If already on active list, don't do anything */ |
|
|
722 | if (active) |
|
|
723 | return; |
|
|
724 | |
|
|
725 | if (has_active_speed ()) |
|
|
726 | actives.insert (this); |
|
|
727 | } |
|
|
728 | |
|
|
729 | void |
|
|
730 | object::activate_recursive () |
|
|
731 | { |
|
|
732 | activate (); |
|
|
733 | |
|
|
734 | for (object *op = inv; op; op = op->below) |
|
|
735 | op->activate_recursive (); |
|
|
736 | } |
|
|
737 | |
|
|
738 | /* This function removes object 'op' from the list of active |
|
|
739 | * objects. |
|
|
740 | * This should only be used for style maps or other such |
|
|
741 | * reference maps where you don't want an object that isn't |
|
|
742 | * in play chewing up cpu time getting processed. |
|
|
743 | * The reverse of this is to call update_ob_speed, which |
|
|
744 | * will do the right thing based on the speed of the object. |
|
|
745 | */ |
|
|
746 | void |
|
|
747 | object::deactivate () |
|
|
748 | { |
|
|
749 | /* If not on the active list, nothing needs to be done */ |
|
|
750 | if (!active) |
|
|
751 | return; |
|
|
752 | |
|
|
753 | actives.erase (this); |
|
|
754 | } |
|
|
755 | |
|
|
756 | void |
|
|
757 | object::deactivate_recursive () |
|
|
758 | { |
|
|
759 | for (object *op = inv; op; op = op->below) |
|
|
760 | op->deactivate_recursive (); |
|
|
761 | |
|
|
762 | deactivate (); |
|
|
763 | } |
|
|
764 | |
|
|
765 | void |
|
|
766 | object::set_flag_inv (int flag, int value) |
|
|
767 | { |
|
|
768 | for (object *op = inv; op; op = op->below) |
|
|
769 | { |
|
|
770 | op->flag [flag] = value; |
|
|
771 | op->set_flag_inv (flag, value); |
|
|
772 | } |
781 | } |
773 | } |
782 | |
774 | |
783 | /* |
775 | /* |
784 | * Remove and free all objects in the inventory of the given object. |
776 | * Remove and free all objects in the inventory of the given object. |
785 | * object.c ? |
777 | * object.c ? |
786 | */ |
778 | */ |
787 | void |
779 | void |
788 | object::destroy_inv (bool drop_to_ground) |
780 | object::destroy_inv (bool drop_to_ground) |
789 | { |
781 | { |
|
|
782 | // need to check first, because the checks below might segfault |
|
|
783 | // as we might be on an invalid mapspace and crossfire code |
|
|
784 | // is too buggy to ensure that the inventory is empty. |
|
|
785 | // corollary: if you create arrows etc. with stuff in tis inventory, |
|
|
786 | // cf will crash below with off-map x and y |
|
|
787 | if (!inv) |
|
|
788 | return; |
|
|
789 | |
790 | /* Only if the space blocks everything do we not process - |
790 | /* Only if the space blocks everything do we not process - |
791 | * if some form of movement is allowed, let objects |
791 | * if some form of movement is allowed, let objects |
792 | * drop on that space. |
792 | * drop on that space. |
793 | */ |
793 | */ |
794 | if (!drop_to_ground |
794 | if (!drop_to_ground |
795 | || !map |
795 | || !map |
796 | || map->in_memory != MAP_IN_MEMORY |
796 | || map->in_memory != MAP_IN_MEMORY |
|
|
797 | || map->nodrop |
797 | || map->at (x, y).move_block == MOVE_ALL) |
798 | || ms ().move_block == MOVE_ALL) |
798 | { |
799 | { |
799 | while (inv) |
800 | while (inv) |
800 | { |
801 | { |
801 | inv->destroy_inv (drop_to_ground); |
802 | inv->destroy_inv (drop_to_ground); |
802 | inv->destroy (); |
803 | inv->destroy (); |
… | |
… | |
810 | |
811 | |
811 | if (op->flag [FLAG_STARTEQUIP] |
812 | if (op->flag [FLAG_STARTEQUIP] |
812 | || op->flag [FLAG_NO_DROP] |
813 | || op->flag [FLAG_NO_DROP] |
813 | || op->type == RUNE |
814 | || op->type == RUNE |
814 | || op->type == TRAP |
815 | || op->type == TRAP |
815 | || op->flag [FLAG_IS_A_TEMPLATE]) |
816 | || op->flag [FLAG_IS_A_TEMPLATE] |
|
|
817 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
816 | op->destroy (); |
818 | op->destroy (); |
817 | else |
819 | else |
818 | { |
820 | map->insert (op, x, y); |
819 | op->remove (); |
|
|
820 | op->x = x; |
|
|
821 | op->y = y; |
|
|
822 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
823 | } |
|
|
824 | } |
821 | } |
825 | } |
822 | } |
826 | } |
823 | } |
827 | |
824 | |
828 | object *object::create () |
825 | object *object::create () |
… | |
… | |
833 | } |
830 | } |
834 | |
831 | |
835 | void |
832 | void |
836 | object::do_destroy () |
833 | object::do_destroy () |
837 | { |
834 | { |
|
|
835 | attachable::do_destroy (); |
|
|
836 | |
838 | if (flag [FLAG_IS_LINKED]) |
837 | if (flag [FLAG_IS_LINKED]) |
839 | remove_button_link (this); |
838 | remove_button_link (this); |
840 | |
839 | |
841 | if (flag [FLAG_FRIENDLY]) |
840 | if (flag [FLAG_FRIENDLY]) |
|
|
841 | { |
842 | remove_friendly_object (this); |
842 | remove_friendly_object (this); |
|
|
843 | |
|
|
844 | if (type == GOLEM |
|
|
845 | && owner |
|
|
846 | && owner->type == PLAYER |
|
|
847 | && owner->contr->ranges[range_golem] == this) |
|
|
848 | owner->contr->ranges[range_golem] = 0; |
|
|
849 | } |
843 | |
850 | |
844 | if (!flag [FLAG_REMOVED]) |
851 | if (!flag [FLAG_REMOVED]) |
845 | remove (); |
852 | remove (); |
846 | |
853 | |
847 | if (flag [FLAG_FREED]) |
854 | destroy_inv (true); |
848 | return; |
|
|
849 | |
855 | |
850 | set_speed (0); |
856 | deactivate (); |
|
|
857 | unlink (); |
851 | |
858 | |
852 | flag [FLAG_FREED] = 1; |
859 | flag [FLAG_FREED] = 1; |
853 | |
|
|
854 | attachable::do_destroy (); |
|
|
855 | |
|
|
856 | destroy_inv (true); |
|
|
857 | unlink (); |
|
|
858 | |
860 | |
859 | // hack to ensure that freed objects still have a valid map |
861 | // hack to ensure that freed objects still have a valid map |
860 | { |
862 | { |
861 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
863 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
862 | |
864 | |
… | |
… | |
866 | |
868 | |
867 | freed_map->name = "/internal/freed_objects_map"; |
869 | freed_map->name = "/internal/freed_objects_map"; |
868 | freed_map->width = 3; |
870 | freed_map->width = 3; |
869 | freed_map->height = 3; |
871 | freed_map->height = 3; |
870 | |
872 | |
871 | freed_map->allocate (); |
873 | freed_map->alloc (); |
|
|
874 | freed_map->in_memory = MAP_IN_MEMORY; |
872 | } |
875 | } |
873 | |
876 | |
874 | map = freed_map; |
877 | map = freed_map; |
875 | x = 1; |
878 | x = 1; |
876 | y = 1; |
879 | y = 1; |
… | |
… | |
886 | |
889 | |
887 | // clear those pointers that likely might have circular references to us |
890 | // clear those pointers that likely might have circular references to us |
888 | owner = 0; |
891 | owner = 0; |
889 | enemy = 0; |
892 | enemy = 0; |
890 | attacked_by = 0; |
893 | attacked_by = 0; |
891 | |
|
|
892 | // only relevant for players(?), but make sure of it anyways |
|
|
893 | contr = 0; |
|
|
894 | } |
894 | } |
895 | |
895 | |
896 | void |
896 | void |
897 | object::destroy (bool destroy_inventory) |
897 | object::destroy (bool destroy_inventory) |
898 | { |
898 | { |
… | |
… | |
926 | * This function removes the object op from the linked list of objects |
926 | * This function removes the object op from the linked list of objects |
927 | * which it is currently tied to. When this function is done, the |
927 | * which it is currently tied to. When this function is done, the |
928 | * object will have no environment. If the object previously had an |
928 | * object will have no environment. If the object previously had an |
929 | * environment, the x and y coordinates will be updated to |
929 | * environment, the x and y coordinates will be updated to |
930 | * the previous environment. |
930 | * the previous environment. |
931 | * Beware: This function is called from the editor as well! |
|
|
932 | */ |
931 | */ |
933 | void |
932 | void |
934 | object::remove () |
933 | object::do_remove () |
935 | { |
934 | { |
936 | object *tmp, *last = 0; |
935 | object *tmp, *last = 0; |
937 | object *otmp; |
936 | object *otmp; |
938 | |
937 | |
939 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
938 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
… | |
… | |
961 | * to save cpu time. |
960 | * to save cpu time. |
962 | */ |
961 | */ |
963 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
962 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
964 | otmp->update_stats (); |
963 | otmp->update_stats (); |
965 | |
964 | |
966 | if (above != NULL) |
965 | if (above) |
967 | above->below = below; |
966 | above->below = below; |
968 | else |
967 | else |
969 | env->inv = below; |
968 | env->inv = below; |
970 | |
969 | |
971 | if (below != NULL) |
970 | if (below) |
972 | below->above = above; |
971 | below->above = above; |
973 | |
972 | |
974 | /* we set up values so that it could be inserted into |
973 | /* we set up values so that it could be inserted into |
975 | * the map, but we don't actually do that - it is up |
974 | * the map, but we don't actually do that - it is up |
976 | * to the caller to decide what we want to do. |
975 | * to the caller to decide what we want to do. |
… | |
… | |
980 | above = 0, below = 0; |
979 | above = 0, below = 0; |
981 | env = 0; |
980 | env = 0; |
982 | } |
981 | } |
983 | else if (map) |
982 | else if (map) |
984 | { |
983 | { |
985 | /* Re did the following section of code - it looks like it had |
984 | if (type == PLAYER) |
986 | * lots of logic for things we no longer care about |
|
|
987 | */ |
985 | { |
|
|
986 | // leaving a spot always closes any open container on the ground |
|
|
987 | if (container && !container->env) |
|
|
988 | // this causes spurious floorbox updates, but it ensures |
|
|
989 | // that the CLOSE event is being sent. |
|
|
990 | close_container (); |
|
|
991 | |
|
|
992 | --map->players; |
|
|
993 | map->touch (); |
|
|
994 | } |
|
|
995 | |
|
|
996 | map->dirty = true; |
|
|
997 | mapspace &ms = this->ms (); |
988 | |
998 | |
989 | /* link the object above us */ |
999 | /* link the object above us */ |
990 | if (above) |
1000 | if (above) |
991 | above->below = below; |
1001 | above->below = below; |
992 | else |
1002 | else |
993 | map->at (x, y).top = below; /* we were top, set new top */ |
1003 | ms.top = below; /* we were top, set new top */ |
994 | |
1004 | |
995 | /* Relink the object below us, if there is one */ |
1005 | /* Relink the object below us, if there is one */ |
996 | if (below) |
1006 | if (below) |
997 | below->above = above; |
1007 | below->above = above; |
998 | else |
1008 | else |
… | |
… | |
1000 | /* Nothing below, which means we need to relink map object for this space |
1010 | /* Nothing below, which means we need to relink map object for this space |
1001 | * use translated coordinates in case some oddness with map tiling is |
1011 | * use translated coordinates in case some oddness with map tiling is |
1002 | * evident |
1012 | * evident |
1003 | */ |
1013 | */ |
1004 | if (GET_MAP_OB (map, x, y) != this) |
1014 | if (GET_MAP_OB (map, x, y) != this) |
1005 | { |
|
|
1006 | char *dump = dump_object (this); |
|
|
1007 | LOG (llevError, |
|
|
1008 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
1015 | 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 ()); |
1009 | free (dump); |
|
|
1010 | dump = dump_object (GET_MAP_OB (map, x, y)); |
|
|
1011 | LOG (llevError, "%s\n", dump); |
|
|
1012 | free (dump); |
|
|
1013 | } |
|
|
1014 | |
1016 | |
1015 | map->at (x, y).bot = above; /* goes on above it. */ |
1017 | ms.bot = above; /* goes on above it. */ |
1016 | } |
1018 | } |
1017 | |
1019 | |
1018 | above = 0; |
1020 | above = 0; |
1019 | below = 0; |
1021 | below = 0; |
1020 | |
1022 | |
1021 | if (map->in_memory == MAP_SAVING) |
1023 | if (map->in_memory == MAP_SAVING) |
1022 | return; |
1024 | return; |
1023 | |
1025 | |
1024 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1026 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1025 | |
1027 | |
1026 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1028 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1027 | { |
1029 | { |
1028 | /* No point updating the players look faces if he is the object |
1030 | /* No point updating the players look faces if he is the object |
1029 | * being removed. |
1031 | * being removed. |
1030 | */ |
1032 | */ |
1031 | |
1033 | |
… | |
… | |
1043 | |
1045 | |
1044 | if (tmp->contr->ns) |
1046 | if (tmp->contr->ns) |
1045 | tmp->contr->ns->floorbox_update (); |
1047 | tmp->contr->ns->floorbox_update (); |
1046 | } |
1048 | } |
1047 | |
1049 | |
1048 | /* See if player moving off should effect something */ |
1050 | /* See if object moving off should effect something */ |
1049 | if (check_walk_off |
1051 | if (check_walk_off |
1050 | && ((move_type & tmp->move_off) |
1052 | && ((move_type & tmp->move_off) |
1051 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1053 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1052 | { |
1054 | { |
1053 | move_apply (tmp, this, 0); |
1055 | move_apply (tmp, this, 0); |
… | |
… | |
1055 | if (destroyed ()) |
1057 | if (destroyed ()) |
1056 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1058 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1057 | } |
1059 | } |
1058 | |
1060 | |
1059 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1061 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1060 | |
1062 | //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp) |
1061 | if (tmp->above == tmp) |
1063 | if (tmp->above == tmp) |
1062 | tmp->above = 0; |
1064 | tmp->above = 0; |
1063 | |
1065 | |
1064 | last = tmp; |
1066 | last = tmp; |
1065 | } |
1067 | } |
1066 | |
1068 | |
1067 | /* last == NULL of there are no objects on this space */ |
1069 | /* last == NULL if there are no objects on this space */ |
|
|
1070 | //TODO: this makes little sense, why only update the topmost object? |
1068 | if (!last) |
1071 | if (!last) |
1069 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1072 | map->at (x, y).flags_ = 0; |
1070 | else |
1073 | else |
1071 | update_object (last, UP_OBJ_REMOVE); |
1074 | update_object (last, UP_OBJ_REMOVE); |
1072 | |
1075 | |
1073 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1076 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1074 | update_all_los (map, x, y); |
1077 | update_all_los (map, x, y); |
… | |
… | |
1111 | |
1114 | |
1112 | return 0; |
1115 | return 0; |
1113 | } |
1116 | } |
1114 | |
1117 | |
1115 | /* |
1118 | /* |
1116 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1119 | * same as insert_ob_in_map except it handles separate coordinates and does a clean |
1117 | * job preparing multi-part monsters |
1120 | * job preparing multi-part monsters. |
1118 | */ |
1121 | */ |
1119 | object * |
1122 | object * |
1120 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1123 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1121 | { |
1124 | { |
1122 | object *tmp; |
|
|
1123 | |
|
|
1124 | if (op->head) |
|
|
1125 | op = op->head; |
|
|
1126 | |
|
|
1127 | for (tmp = op; tmp; tmp = tmp->more) |
1125 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1128 | { |
1126 | { |
1129 | tmp->x = x + tmp->arch->clone.x; |
1127 | tmp->x = x + tmp->arch->clone.x; |
1130 | tmp->y = y + tmp->arch->clone.y; |
1128 | tmp->y = y + tmp->arch->clone.y; |
1131 | } |
1129 | } |
1132 | |
1130 | |
… | |
… | |
1155 | */ |
1153 | */ |
1156 | object * |
1154 | object * |
1157 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1155 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1158 | { |
1156 | { |
1159 | object *tmp, *top, *floor = NULL; |
1157 | object *tmp, *top, *floor = NULL; |
1160 | sint16 x, y; |
|
|
1161 | |
1158 | |
1162 | if (QUERY_FLAG (op, FLAG_FREED)) |
1159 | if (QUERY_FLAG (op, FLAG_FREED)) |
1163 | { |
1160 | { |
1164 | LOG (llevError, "Trying to insert freed object!\n"); |
1161 | LOG (llevError, "Trying to insert freed object!\n"); |
1165 | return NULL; |
1162 | return NULL; |
1166 | } |
1163 | } |
1167 | |
1164 | |
1168 | if (m == NULL) |
1165 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1166 | LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ()); |
|
|
1167 | |
|
|
1168 | op->remove (); |
|
|
1169 | |
|
|
1170 | if (!m) |
1169 | { |
1171 | { |
1170 | char *dump = dump_object (op); |
1172 | char *dump = dump_object (op); |
1171 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1173 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1172 | free (dump); |
1174 | free (dump); |
1173 | return op; |
1175 | return op; |
… | |
… | |
1186 | #endif |
1188 | #endif |
1187 | free (dump); |
1189 | free (dump); |
1188 | return op; |
1190 | return op; |
1189 | } |
1191 | } |
1190 | |
1192 | |
1191 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1192 | { |
|
|
1193 | char *dump = dump_object (op); |
|
|
1194 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1195 | free (dump); |
|
|
1196 | return op; |
|
|
1197 | } |
|
|
1198 | |
|
|
1199 | if (op->more) |
|
|
1200 | { |
|
|
1201 | /* The part may be on a different map. */ |
|
|
1202 | |
|
|
1203 | object *more = op->more; |
1193 | if (object *more = op->more) |
1204 | |
1194 | { |
1205 | /* We really need the caller to normalize coordinates - if |
|
|
1206 | * we set the map, that doesn't work if the location is within |
|
|
1207 | * a map and this is straddling an edge. So only if coordinate |
|
|
1208 | * is clear wrong do we normalize it. |
|
|
1209 | */ |
|
|
1210 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
|
|
1211 | more->map = get_map_from_coord (m, &more->x, &more->y); |
|
|
1212 | else if (!more->map) |
|
|
1213 | { |
|
|
1214 | /* For backwards compatibility - when not dealing with tiled maps, |
|
|
1215 | * more->map should always point to the parent. |
|
|
1216 | */ |
|
|
1217 | more->map = m; |
|
|
1218 | } |
|
|
1219 | |
|
|
1220 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1195 | if (!insert_ob_in_map (more, m, originator, flag)) |
1221 | { |
1196 | { |
1222 | if (!op->head) |
1197 | if (!op->head) |
1223 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1198 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1224 | |
1199 | |
1225 | return 0; |
1200 | return 0; |
… | |
… | |
1230 | |
1205 | |
1231 | /* Ideally, the caller figures this out. However, it complicates a lot |
1206 | /* Ideally, the caller figures this out. However, it complicates a lot |
1232 | * of areas of callers (eg, anything that uses find_free_spot would now |
1207 | * of areas of callers (eg, anything that uses find_free_spot would now |
1233 | * need extra work |
1208 | * need extra work |
1234 | */ |
1209 | */ |
1235 | op->map = get_map_from_coord (m, &op->x, &op->y); |
1210 | if (!xy_normalise (m, op->x, op->y)) |
1236 | x = op->x; |
1211 | return 0; |
1237 | y = op->y; |
1212 | |
|
|
1213 | op->map = m; |
|
|
1214 | mapspace &ms = op->ms (); |
1238 | |
1215 | |
1239 | /* this has to be done after we translate the coordinates. |
1216 | /* this has to be done after we translate the coordinates. |
1240 | */ |
1217 | */ |
1241 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1218 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1242 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1219 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1243 | if (object::can_merge (op, tmp)) |
1220 | if (object::can_merge (op, tmp)) |
1244 | { |
1221 | { |
1245 | op->nrof += tmp->nrof; |
1222 | op->nrof += tmp->nrof; |
1246 | tmp->destroy (); |
1223 | tmp->destroy (); |
1247 | } |
1224 | } |
… | |
… | |
1264 | op->below = originator->below; |
1241 | op->below = originator->below; |
1265 | |
1242 | |
1266 | if (op->below) |
1243 | if (op->below) |
1267 | op->below->above = op; |
1244 | op->below->above = op; |
1268 | else |
1245 | else |
1269 | op->ms ().bot = op; |
1246 | ms.bot = op; |
1270 | |
1247 | |
1271 | /* since *below* originator, no need to update top */ |
1248 | /* since *below* originator, no need to update top */ |
1272 | originator->below = op; |
1249 | originator->below = op; |
1273 | } |
1250 | } |
1274 | else |
1251 | else |
1275 | { |
1252 | { |
|
|
1253 | top = ms.bot; |
|
|
1254 | |
1276 | /* If there are other objects, then */ |
1255 | /* If there are other objects, then */ |
1277 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1256 | if ((!(flag & INS_MAP_LOAD)) && top) |
1278 | { |
1257 | { |
1279 | object *last = NULL; |
1258 | object *last = 0; |
1280 | |
1259 | |
1281 | /* |
1260 | /* |
1282 | * If there are multiple objects on this space, we do some trickier handling. |
1261 | * If there are multiple objects on this space, we do some trickier handling. |
1283 | * We've already dealt with merging if appropriate. |
1262 | * We've already dealt with merging if appropriate. |
1284 | * Generally, we want to put the new object on top. But if |
1263 | * Generally, we want to put the new object on top. But if |
… | |
… | |
1288 | * once we get to them. This reduces the need to traverse over all of |
1267 | * once we get to them. This reduces the need to traverse over all of |
1289 | * them when adding another one - this saves quite a bit of cpu time |
1268 | * them when adding another one - this saves quite a bit of cpu time |
1290 | * when lots of spells are cast in one area. Currently, it is presumed |
1269 | * when lots of spells are cast in one area. Currently, it is presumed |
1291 | * that flying non pickable objects are spell objects. |
1270 | * that flying non pickable objects are spell objects. |
1292 | */ |
1271 | */ |
1293 | |
1272 | for (top = ms.bot; top; top = top->above) |
1294 | while (top != NULL) |
|
|
1295 | { |
1273 | { |
1296 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1274 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1297 | floor = top; |
1275 | floor = top; |
1298 | |
1276 | |
1299 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1277 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1302 | top = top->below; |
1280 | top = top->below; |
1303 | break; |
1281 | break; |
1304 | } |
1282 | } |
1305 | |
1283 | |
1306 | last = top; |
1284 | last = top; |
1307 | top = top->above; |
|
|
1308 | } |
1285 | } |
1309 | |
1286 | |
1310 | /* Don't want top to be NULL, so set it to the last valid object */ |
1287 | /* Don't want top to be NULL, so set it to the last valid object */ |
1311 | top = last; |
1288 | top = last; |
1312 | |
1289 | |
… | |
… | |
1319 | * Unless those objects are exits, type 66 |
1296 | * Unless those objects are exits, type 66 |
1320 | * If INS_ON_TOP is used, don't do this processing |
1297 | * If INS_ON_TOP is used, don't do this processing |
1321 | * Need to find the object that in fact blocks view, otherwise |
1298 | * Need to find the object that in fact blocks view, otherwise |
1322 | * stacking is a bit odd. |
1299 | * stacking is a bit odd. |
1323 | */ |
1300 | */ |
1324 | if (!(flag & INS_ON_TOP) && |
1301 | if (!(flag & INS_ON_TOP) |
1325 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1302 | && ms.flags () & P_BLOCKSVIEW |
|
|
1303 | && (op->face && !op->face->visibility)) |
1326 | { |
1304 | { |
1327 | for (last = top; last != floor; last = last->below) |
1305 | for (last = top; last != floor; last = last->below) |
1328 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1306 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1329 | break; |
1307 | break; |
|
|
1308 | |
1330 | /* Check to see if we found the object that blocks view, |
1309 | /* Check to see if we found the object that blocks view, |
1331 | * and make sure we have a below pointer for it so that |
1310 | * and make sure we have a below pointer for it so that |
1332 | * we can get inserted below this one, which requires we |
1311 | * we can get inserted below this one, which requires we |
1333 | * set top to the object below us. |
1312 | * set top to the object below us. |
1334 | */ |
1313 | */ |
… | |
… | |
1336 | top = last->below; |
1315 | top = last->below; |
1337 | } |
1316 | } |
1338 | } /* If objects on this space */ |
1317 | } /* If objects on this space */ |
1339 | |
1318 | |
1340 | if (flag & INS_MAP_LOAD) |
1319 | if (flag & INS_MAP_LOAD) |
1341 | top = GET_MAP_TOP (op->map, op->x, op->y); |
1320 | top = ms.top; |
1342 | |
1321 | |
1343 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1322 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1344 | top = floor; |
1323 | top = floor; |
1345 | |
1324 | |
1346 | /* Top is the object that our object (op) is going to get inserted above. |
1325 | /* Top is the object that our object (op) is going to get inserted above. |
1347 | */ |
1326 | */ |
1348 | |
1327 | |
1349 | /* First object on this space */ |
1328 | /* First object on this space */ |
1350 | if (!top) |
1329 | if (!top) |
1351 | { |
1330 | { |
1352 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1331 | op->above = ms.bot; |
1353 | |
1332 | |
1354 | if (op->above) |
1333 | if (op->above) |
1355 | op->above->below = op; |
1334 | op->above->below = op; |
1356 | |
1335 | |
1357 | op->below = NULL; |
1336 | op->below = 0; |
1358 | op->ms ().bot = op; |
1337 | ms.bot = op; |
1359 | } |
1338 | } |
1360 | else |
1339 | else |
1361 | { /* get inserted into the stack above top */ |
1340 | { /* get inserted into the stack above top */ |
1362 | op->above = top->above; |
1341 | op->above = top->above; |
1363 | |
1342 | |
… | |
… | |
1366 | |
1345 | |
1367 | op->below = top; |
1346 | op->below = top; |
1368 | top->above = op; |
1347 | top->above = op; |
1369 | } |
1348 | } |
1370 | |
1349 | |
1371 | if (op->above == NULL) |
1350 | if (!op->above) |
1372 | op->ms ().top = op; |
1351 | ms.top = op; |
1373 | } /* else not INS_BELOW_ORIGINATOR */ |
1352 | } /* else not INS_BELOW_ORIGINATOR */ |
1374 | |
1353 | |
1375 | if (op->type == PLAYER) |
1354 | if (op->type == PLAYER) |
|
|
1355 | { |
1376 | op->contr->do_los = 1; |
1356 | op->contr->do_los = 1; |
|
|
1357 | ++op->map->players; |
|
|
1358 | op->map->touch (); |
|
|
1359 | } |
|
|
1360 | |
|
|
1361 | op->map->dirty = true; |
1377 | |
1362 | |
1378 | /* If we have a floor, we know the player, if any, will be above |
1363 | /* If we have a floor, we know the player, if any, will be above |
1379 | * it, so save a few ticks and start from there. |
1364 | * it, so save a few ticks and start from there. |
1380 | */ |
1365 | */ |
1381 | if (!(flag & INS_MAP_LOAD)) |
1366 | if (!(flag & INS_MAP_LOAD)) |
1382 | if (object *pl = op->ms ().player ()) |
1367 | if (object *pl = ms.player ()) |
1383 | if (pl->contr->ns) |
1368 | if (pl->contr->ns) |
1384 | pl->contr->ns->floorbox_update (); |
1369 | pl->contr->ns->floorbox_update (); |
1385 | |
1370 | |
1386 | /* If this object glows, it may affect lighting conditions that are |
1371 | /* If this object glows, it may affect lighting conditions that are |
1387 | * visible to others on this map. But update_all_los is really |
1372 | * visible to others on this map. But update_all_los is really |
1388 | * an inefficient way to do this, as it means los for all players |
1373 | * an inefficient way to do this, as it means los for all players |
1389 | * on the map will get recalculated. The players could very well |
1374 | * on the map will get recalculated. The players could very well |
1390 | * be far away from this change and not affected in any way - |
1375 | * be far away from this change and not affected in any way - |
1391 | * this should get redone to only look for players within range, |
1376 | * this should get redone to only look for players within range, |
1392 | * or just updating the P_NEED_UPDATE for spaces within this area |
1377 | * or just updating the P_UPTODATE for spaces within this area |
1393 | * of effect may be sufficient. |
1378 | * of effect may be sufficient. |
1394 | */ |
1379 | */ |
1395 | if (op->map->darkness && (op->glow_radius != 0)) |
1380 | if (op->map->darkness && (op->glow_radius != 0)) |
1396 | update_all_los (op->map, op->x, op->y); |
1381 | update_all_los (op->map, op->x, op->y); |
1397 | |
1382 | |
… | |
… | |
1435 | { |
1420 | { |
1436 | object *tmp, *tmp1; |
1421 | object *tmp, *tmp1; |
1437 | |
1422 | |
1438 | /* first search for itself and remove any old instances */ |
1423 | /* first search for itself and remove any old instances */ |
1439 | |
1424 | |
1440 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1425 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1441 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1426 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1442 | tmp->destroy (); |
1427 | tmp->destroy (); |
1443 | |
1428 | |
1444 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1429 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1445 | |
1430 | |
1446 | tmp1->x = op->x; |
1431 | tmp1->x = op->x; |
1447 | tmp1->y = op->y; |
1432 | tmp1->y = op->y; |
1448 | insert_ob_in_map (tmp1, op->map, op, 0); |
1433 | insert_ob_in_map (tmp1, op->map, op, 0); |
|
|
1434 | } |
|
|
1435 | |
|
|
1436 | object * |
|
|
1437 | object::insert_at (object *where, object *originator, int flags) |
|
|
1438 | { |
|
|
1439 | where->map->insert (this, where->x, where->y, originator, flags); |
1449 | } |
1440 | } |
1450 | |
1441 | |
1451 | /* |
1442 | /* |
1452 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1443 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1453 | * is returned contains nr objects, and the remaining parts contains |
1444 | * is returned contains nr objects, and the remaining parts contains |
1454 | * the rest (or is removed and freed if that number is 0). |
1445 | * the rest (or is removed and freed if that number is 0). |
1455 | * On failure, NULL is returned, and the reason put into the |
1446 | * On failure, NULL is returned, and the reason put into the |
1456 | * global static errmsg array. |
1447 | * global static errmsg array. |
1457 | */ |
1448 | */ |
1458 | |
|
|
1459 | object * |
1449 | object * |
1460 | get_split_ob (object *orig_ob, uint32 nr) |
1450 | get_split_ob (object *orig_ob, uint32 nr) |
1461 | { |
1451 | { |
1462 | object *newob; |
1452 | object *newob; |
1463 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1453 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
… | |
… | |
1727 | * |
1717 | * |
1728 | * MSW 2001-07-08: Check all objects on space, not just those below |
1718 | * MSW 2001-07-08: Check all objects on space, not just those below |
1729 | * object being inserted. insert_ob_in_map may not put new objects |
1719 | * object being inserted. insert_ob_in_map may not put new objects |
1730 | * on top. |
1720 | * on top. |
1731 | */ |
1721 | */ |
1732 | |
|
|
1733 | int |
1722 | int |
1734 | check_move_on (object *op, object *originator) |
1723 | check_move_on (object *op, object *originator) |
1735 | { |
1724 | { |
1736 | object *tmp; |
1725 | object *tmp; |
1737 | maptile *m = op->map; |
1726 | maptile *m = op->map; |
… | |
… | |
1764 | |
1753 | |
1765 | /* The objects have to be checked from top to bottom. |
1754 | /* The objects have to be checked from top to bottom. |
1766 | * Hence, we first go to the top: |
1755 | * Hence, we first go to the top: |
1767 | */ |
1756 | */ |
1768 | |
1757 | |
1769 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1758 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
1770 | { |
1759 | { |
1771 | /* Trim the search when we find the first other spell effect |
1760 | /* Trim the search when we find the first other spell effect |
1772 | * this helps performance so that if a space has 50 spell objects, |
1761 | * this helps performance so that if a space has 50 spell objects, |
1773 | * we don't need to check all of them. |
1762 | * we don't need to check all of them. |
1774 | */ |
1763 | */ |
… | |
… | |
1792 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1781 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1793 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1782 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1794 | { |
1783 | { |
1795 | |
1784 | |
1796 | float |
1785 | float |
1797 | diff = tmp->move_slow_penalty * FABS (op->speed); |
1786 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1798 | |
1787 | |
1799 | if (op->type == PLAYER) |
1788 | if (op->type == PLAYER) |
1800 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1789 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1801 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1790 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1802 | diff /= 4.0; |
1791 | diff /= 4.0; |
… | |
… | |
1832 | * The first matching object is returned, or NULL if none. |
1821 | * The first matching object is returned, or NULL if none. |
1833 | */ |
1822 | */ |
1834 | object * |
1823 | object * |
1835 | present_arch (const archetype *at, maptile *m, int x, int y) |
1824 | present_arch (const archetype *at, maptile *m, int x, int y) |
1836 | { |
1825 | { |
1837 | if (m == NULL || out_of_map (m, x, y)) |
1826 | if (!m || out_of_map (m, x, y)) |
1838 | { |
1827 | { |
1839 | LOG (llevError, "Present_arch called outside map.\n"); |
1828 | LOG (llevError, "Present_arch called outside map.\n"); |
1840 | return NULL; |
1829 | return NULL; |
1841 | } |
1830 | } |
1842 | |
1831 | |
1843 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1832 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1844 | if (tmp->arch == at) |
1833 | if (tmp->arch == at) |
1845 | return tmp; |
1834 | return tmp; |
1846 | |
1835 | |
1847 | return NULL; |
1836 | return NULL; |
1848 | } |
1837 | } |
… | |
… | |
1859 | { |
1848 | { |
1860 | LOG (llevError, "Present called outside map.\n"); |
1849 | LOG (llevError, "Present called outside map.\n"); |
1861 | return NULL; |
1850 | return NULL; |
1862 | } |
1851 | } |
1863 | |
1852 | |
1864 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1853 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1865 | if (tmp->type == type) |
1854 | if (tmp->type == type) |
1866 | return tmp; |
1855 | return tmp; |
1867 | |
1856 | |
1868 | return NULL; |
1857 | return NULL; |
1869 | } |
1858 | } |
… | |
… | |
2009 | } |
1998 | } |
2010 | |
1999 | |
2011 | if (!index) |
2000 | if (!index) |
2012 | return -1; |
2001 | return -1; |
2013 | |
2002 | |
2014 | return altern[RANDOM () % index]; |
2003 | return altern [rndm (index)]; |
2015 | } |
2004 | } |
2016 | |
2005 | |
2017 | /* |
2006 | /* |
2018 | * find_first_free_spot(archetype, maptile, x, y) works like |
2007 | * find_first_free_spot(archetype, maptile, x, y) works like |
2019 | * find_free_spot(), but it will search max number of squares. |
2008 | * find_free_spot(), but it will search max number of squares. |
… | |
… | |
2040 | { |
2029 | { |
2041 | arr += begin; |
2030 | arr += begin; |
2042 | end -= begin; |
2031 | end -= begin; |
2043 | |
2032 | |
2044 | while (--end) |
2033 | while (--end) |
2045 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2034 | swap (arr [end], arr [rndm (end + 1)]); |
2046 | } |
2035 | } |
2047 | |
2036 | |
2048 | /* new function to make monster searching more efficient, and effective! |
2037 | /* new function to make monster searching more efficient, and effective! |
2049 | * This basically returns a randomized array (in the passed pointer) of |
2038 | * This basically returns a randomized array (in the passed pointer) of |
2050 | * the spaces to find monsters. In this way, it won't always look for |
2039 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2184 | |
2173 | |
2185 | return 3; |
2174 | return 3; |
2186 | } |
2175 | } |
2187 | |
2176 | |
2188 | /* |
2177 | /* |
2189 | * absdir(int): Returns a number between 1 and 8, which represent |
|
|
2190 | * the "absolute" direction of a number (it actually takes care of |
|
|
2191 | * "overflow" in previous calculations of a direction). |
|
|
2192 | */ |
|
|
2193 | |
|
|
2194 | int |
|
|
2195 | absdir (int d) |
|
|
2196 | { |
|
|
2197 | while (d < 1) |
|
|
2198 | d += 8; |
|
|
2199 | |
|
|
2200 | while (d > 8) |
|
|
2201 | d -= 8; |
|
|
2202 | |
|
|
2203 | return d; |
|
|
2204 | } |
|
|
2205 | |
|
|
2206 | /* |
|
|
2207 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2178 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2208 | * between two directions (which are expected to be absolute (see absdir()) |
2179 | * between two directions (which are expected to be absolute (see absdir()) |
2209 | */ |
2180 | */ |
2210 | |
|
|
2211 | int |
2181 | int |
2212 | dirdiff (int dir1, int dir2) |
2182 | dirdiff (int dir1, int dir2) |
2213 | { |
2183 | { |
2214 | int d; |
2184 | int d; |
2215 | |
2185 | |
… | |
… | |
2381 | insert_ob_in_ob (object_create_clone (item), dst); |
2351 | insert_ob_in_ob (object_create_clone (item), dst); |
2382 | |
2352 | |
2383 | return dst; |
2353 | return dst; |
2384 | } |
2354 | } |
2385 | |
2355 | |
2386 | /* GROS - Creates an object using a string representing its content. */ |
|
|
2387 | /* Basically, we save the content of the string to a temp file, then call */ |
|
|
2388 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
|
|
2389 | /* but it was simple to make and allows reusing the load_object function. */ |
|
|
2390 | /* Remember not to use load_object_str in a time-critical situation. */ |
|
|
2391 | /* Also remember that multiparts objects are not supported for now. */ |
|
|
2392 | object * |
|
|
2393 | load_object_str (const char *obstr) |
|
|
2394 | { |
|
|
2395 | object *op; |
|
|
2396 | char filename[MAX_BUF]; |
|
|
2397 | |
|
|
2398 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
|
|
2399 | |
|
|
2400 | FILE *tempfile = fopen (filename, "w"); |
|
|
2401 | |
|
|
2402 | if (tempfile == NULL) |
|
|
2403 | { |
|
|
2404 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
|
|
2405 | return NULL; |
|
|
2406 | } |
|
|
2407 | |
|
|
2408 | fprintf (tempfile, obstr); |
|
|
2409 | fclose (tempfile); |
|
|
2410 | |
|
|
2411 | op = object::create (); |
|
|
2412 | |
|
|
2413 | object_thawer thawer (filename); |
|
|
2414 | |
|
|
2415 | if (thawer) |
|
|
2416 | load_object (thawer, op, 0); |
|
|
2417 | |
|
|
2418 | LOG (llevDebug, " load str completed, object=%s\n", &op->name); |
|
|
2419 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
2420 | |
|
|
2421 | return op; |
|
|
2422 | } |
|
|
2423 | |
|
|
2424 | /* This returns the first object in who's inventory that |
2356 | /* This returns the first object in who's inventory that |
2425 | * has the same type and subtype match. |
2357 | * has the same type and subtype match. |
2426 | * returns NULL if no match. |
2358 | * returns NULL if no match. |
2427 | */ |
2359 | */ |
2428 | object * |
2360 | object * |
… | |
… | |
2594 | } |
2526 | } |
2595 | else |
2527 | else |
2596 | item = item->env; |
2528 | item = item->env; |
2597 | } |
2529 | } |
2598 | |
2530 | |
|
|
2531 | |
|
|
2532 | const char * |
|
|
2533 | object::flag_desc (char *desc, int len) const |
|
|
2534 | { |
|
|
2535 | char *p = desc; |
|
|
2536 | bool first = true; |
|
|
2537 | |
|
|
2538 | *p = 0; |
|
|
2539 | |
|
|
2540 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2541 | { |
|
|
2542 | if (len <= 10) // magic constant! |
|
|
2543 | { |
|
|
2544 | snprintf (p, len, ",..."); |
|
|
2545 | break; |
|
|
2546 | } |
|
|
2547 | |
|
|
2548 | if (flag [i]) |
|
|
2549 | { |
|
|
2550 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2551 | len -= cnt; |
|
|
2552 | p += cnt; |
|
|
2553 | first = false; |
|
|
2554 | } |
|
|
2555 | } |
|
|
2556 | |
|
|
2557 | return desc; |
|
|
2558 | } |
|
|
2559 | |
2599 | // return a suitable string describing an objetc in enough detail to find it |
2560 | // return a suitable string describing an object in enough detail to find it |
2600 | const char * |
2561 | const char * |
2601 | object::debug_desc (char *info) const |
2562 | object::debug_desc (char *info) const |
2602 | { |
2563 | { |
|
|
2564 | char flagdesc[512]; |
2603 | char info2[256 * 3]; |
2565 | char info2[256 * 4]; |
2604 | char *p = info; |
2566 | char *p = info; |
2605 | |
2567 | |
2606 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2568 | p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2607 | count, |
2569 | count, uuid.seq, |
2608 | &name, |
2570 | &name, |
2609 | title ? " " : "", |
2571 | title ? "\",title:\"" : "", |
2610 | title ? (const char *)title : ""); |
2572 | title ? (const char *)title : "", |
|
|
2573 | flag_desc (flagdesc, 512), type); |
2611 | |
2574 | |
2612 | if (env) |
2575 | if (env) |
2613 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2576 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2614 | |
2577 | |
2615 | if (map) |
2578 | if (map) |
2616 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2579 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2617 | |
2580 | |
2618 | return info; |
2581 | return info; |
2619 | } |
2582 | } |
2620 | |
2583 | |
2621 | const char * |
2584 | const char * |
2622 | object::debug_desc () const |
2585 | object::debug_desc () const |
2623 | { |
2586 | { |
2624 | static char info[256 * 3]; |
2587 | static char info[256 * 4]; |
2625 | return debug_desc (info); |
2588 | return debug_desc (info); |
2626 | } |
2589 | } |
2627 | |
2590 | |
|
|
2591 | const char * |
|
|
2592 | object::debug_desc2 () const |
|
|
2593 | { |
|
|
2594 | static char info[256 * 4]; |
|
|
2595 | return debug_desc (info); |
|
|
2596 | } |
|
|
2597 | |
|
|
2598 | struct region * |
|
|
2599 | object::region () const |
|
|
2600 | { |
|
|
2601 | return map ? map->region (x, y) |
|
|
2602 | : region::default_region (); |
|
|
2603 | } |
|
|
2604 | |
|
|
2605 | const materialtype_t * |
|
|
2606 | object::dominant_material () const |
|
|
2607 | { |
|
|
2608 | if (materialtype_t *mat = name_to_material (materialname)) |
|
|
2609 | return mat; |
|
|
2610 | |
|
|
2611 | // omfg this is slow, this has to be temporary :) |
|
|
2612 | shstr unknown ("unknown"); |
|
|
2613 | |
|
|
2614 | return name_to_material (unknown); |
|
|
2615 | } |
|
|
2616 | |
|
|
2617 | void |
|
|
2618 | object::open_container (object *new_container) |
|
|
2619 | { |
|
|
2620 | if (container == new_container) |
|
|
2621 | return; |
|
|
2622 | |
|
|
2623 | if (object *old_container = container) |
|
|
2624 | { |
|
|
2625 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
|
|
2626 | return; |
|
|
2627 | |
|
|
2628 | #if 0 |
|
|
2629 | // remove the "Close old_container" object. |
|
|
2630 | if (object *closer = old_container->inv) |
|
|
2631 | if (closer->type == CLOSE_CON) |
|
|
2632 | closer->destroy (); |
|
|
2633 | #endif |
|
|
2634 | |
|
|
2635 | old_container->flag [FLAG_APPLIED] = 0; |
|
|
2636 | container = 0; |
|
|
2637 | |
|
|
2638 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2639 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2640 | } |
|
|
2641 | |
|
|
2642 | if (new_container) |
|
|
2643 | { |
|
|
2644 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
|
|
2645 | return; |
|
|
2646 | |
|
|
2647 | // TODO: this does not seem to serve any purpose anymore? |
|
|
2648 | #if 0 |
|
|
2649 | // insert the "Close Container" object. |
|
|
2650 | if (archetype *closer = new_container->other_arch) |
|
|
2651 | { |
|
|
2652 | object *closer = arch_to_object (new_container->other_arch); |
|
|
2653 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
|
|
2654 | new_container->insert (closer); |
|
|
2655 | } |
|
|
2656 | #endif |
|
|
2657 | |
|
|
2658 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
|
|
2659 | |
|
|
2660 | new_container->flag [FLAG_APPLIED] = 1; |
|
|
2661 | container = new_container; |
|
|
2662 | |
|
|
2663 | esrv_update_item (UPD_FLAGS, this, new_container); |
|
|
2664 | esrv_send_inventory (this, new_container); |
|
|
2665 | } |
|
|
2666 | } |
|
|
2667 | |
|
|
2668 | |