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 |
… | |
… | |
664 | * UP_OBJ_FACE: only the objects face has changed. |
606 | * UP_OBJ_FACE: only the objects face has changed. |
665 | */ |
607 | */ |
666 | void |
608 | void |
667 | update_object (object *op, int action) |
609 | update_object (object *op, int action) |
668 | { |
610 | { |
669 | MoveType move_on, move_off, move_block, move_slow; |
|
|
670 | |
|
|
671 | if (op == NULL) |
611 | if (op == NULL) |
672 | { |
612 | { |
673 | /* this should never happen */ |
613 | /* this should never happen */ |
674 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
614 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
675 | return; |
615 | return; |
… | |
… | |
699 | return; |
639 | return; |
700 | } |
640 | } |
701 | |
641 | |
702 | mapspace &m = op->ms (); |
642 | mapspace &m = op->ms (); |
703 | |
643 | |
704 | if (m.flags_ & P_NEED_UPDATE) |
644 | if (!(m.flags_ & P_UPTODATE)) |
705 | /* nop */; |
645 | /* nop */; |
706 | else if (action == UP_OBJ_INSERT) |
646 | else if (action == UP_OBJ_INSERT) |
707 | { |
647 | { |
708 | // this is likely overkill, TODO: revisit (schmorp) |
648 | // this is likely overkill, TODO: revisit (schmorp) |
709 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
649 | 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 |
658 | /* This isn't perfect, but I don't expect a lot of objects to |
719 | * to have move_allow right now. |
659 | * to have move_allow right now. |
720 | */ |
660 | */ |
721 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
661 | || ((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) |
662 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
723 | m.flags_ = P_NEED_UPDATE; |
663 | m.flags_ = 0; |
724 | } |
664 | } |
725 | /* if the object is being removed, we can't make intelligent |
665 | /* if the object is being removed, we can't make intelligent |
726 | * decisions, because remove_ob can't really pass the object |
666 | * decisions, because remove_ob can't really pass the object |
727 | * that is being removed. |
667 | * that is being removed. |
728 | */ |
668 | */ |
729 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
669 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
730 | m.flags_ = P_NEED_UPDATE; |
670 | m.flags_ = 0; |
731 | else if (action == UP_OBJ_FACE) |
671 | else if (action == UP_OBJ_FACE) |
732 | /* Nothing to do for that case */ ; |
672 | /* Nothing to do for that case */ ; |
733 | else |
673 | else |
734 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
674 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
735 | |
675 | |
736 | if (op->more) |
676 | if (op->more) |
737 | update_object (op->more, action); |
677 | update_object (op->more, action); |
738 | } |
678 | } |
739 | |
679 | |
740 | object::vector object::objects; // not yet used |
|
|
741 | object *object::first; |
|
|
742 | |
|
|
743 | object::object () |
680 | object::object () |
744 | { |
681 | { |
745 | SET_FLAG (this, FLAG_REMOVED); |
682 | SET_FLAG (this, FLAG_REMOVED); |
746 | |
683 | |
747 | expmul = 1.0; |
684 | expmul = 1.0; |
748 | face = blank_face; |
685 | face = blank_face; |
749 | } |
686 | } |
750 | |
687 | |
751 | object::~object () |
688 | object::~object () |
752 | { |
689 | { |
|
|
690 | unlink (); |
|
|
691 | |
753 | free_key_values (this); |
692 | free_key_values (this); |
754 | } |
693 | } |
755 | |
694 | |
|
|
695 | static int object_count; |
|
|
696 | |
756 | void object::link () |
697 | void object::link () |
757 | { |
698 | { |
758 | count = ++ob_count; |
699 | assert (!index);//D |
759 | uuid = gen_uuid (); |
700 | uuid = gen_uuid (); |
|
|
701 | count = ++object_count; |
760 | |
702 | |
761 | prev = 0; |
703 | refcnt_inc (); |
762 | next = object::first; |
704 | objects.insert (this); |
763 | |
|
|
764 | if (object::first) |
|
|
765 | object::first->prev = this; |
|
|
766 | |
|
|
767 | object::first = this; |
|
|
768 | } |
705 | } |
769 | |
706 | |
770 | void object::unlink () |
707 | void object::unlink () |
771 | { |
708 | { |
772 | if (this == object::first) |
709 | if (!index) |
773 | object::first = next; |
710 | return; |
774 | |
711 | |
775 | /* Remove this object from the list of used objects */ |
712 | objects.erase (this); |
776 | if (prev) prev->next = next; |
713 | refcnt_dec (); |
777 | if (next) next->prev = prev; |
714 | } |
778 | |
715 | |
779 | prev = 0; |
716 | void |
780 | next = 0; |
717 | object::activate () |
|
|
718 | { |
|
|
719 | /* If already on active list, don't do anything */ |
|
|
720 | if (active) |
|
|
721 | return; |
|
|
722 | |
|
|
723 | if (has_active_speed ()) |
|
|
724 | actives.insert (this); |
|
|
725 | } |
|
|
726 | |
|
|
727 | void |
|
|
728 | object::activate_recursive () |
|
|
729 | { |
|
|
730 | activate (); |
|
|
731 | |
|
|
732 | for (object *op = inv; op; op = op->below) |
|
|
733 | op->activate_recursive (); |
|
|
734 | } |
|
|
735 | |
|
|
736 | /* This function removes object 'op' from the list of active |
|
|
737 | * objects. |
|
|
738 | * This should only be used for style maps or other such |
|
|
739 | * reference maps where you don't want an object that isn't |
|
|
740 | * in play chewing up cpu time getting processed. |
|
|
741 | * The reverse of this is to call update_ob_speed, which |
|
|
742 | * will do the right thing based on the speed of the object. |
|
|
743 | */ |
|
|
744 | void |
|
|
745 | object::deactivate () |
|
|
746 | { |
|
|
747 | /* If not on the active list, nothing needs to be done */ |
|
|
748 | if (!active) |
|
|
749 | return; |
|
|
750 | |
|
|
751 | actives.erase (this); |
|
|
752 | } |
|
|
753 | |
|
|
754 | void |
|
|
755 | object::deactivate_recursive () |
|
|
756 | { |
|
|
757 | for (object *op = inv; op; op = op->below) |
|
|
758 | op->deactivate_recursive (); |
|
|
759 | |
|
|
760 | deactivate (); |
|
|
761 | } |
|
|
762 | |
|
|
763 | void |
|
|
764 | object::set_flag_inv (int flag, int value) |
|
|
765 | { |
|
|
766 | for (object *op = inv; op; op = op->below) |
|
|
767 | { |
|
|
768 | op->flag [flag] = value; |
|
|
769 | op->set_flag_inv (flag, value); |
|
|
770 | } |
781 | } |
771 | } |
782 | |
772 | |
783 | /* |
773 | /* |
784 | * Remove and free all objects in the inventory of the given object. |
774 | * Remove and free all objects in the inventory of the given object. |
785 | * object.c ? |
775 | * object.c ? |
786 | */ |
776 | */ |
787 | void |
777 | void |
788 | object::destroy_inv (bool drop_to_ground) |
778 | object::destroy_inv (bool drop_to_ground) |
789 | { |
779 | { |
|
|
780 | // need to check first, because the checks below might segfault |
|
|
781 | // as we might be on an invalid mapspace and crossfire code |
|
|
782 | // is too buggy to ensure that the inventory is empty. |
|
|
783 | // corollary: if you create arrows etc. with stuff in tis inventory, |
|
|
784 | // cf will crash below with off-map x and y |
|
|
785 | if (!inv) |
|
|
786 | return; |
|
|
787 | |
790 | /* Only if the space blocks everything do we not process - |
788 | /* Only if the space blocks everything do we not process - |
791 | * if some form of movement is allowed, let objects |
789 | * if some form of movement is allowed, let objects |
792 | * drop on that space. |
790 | * drop on that space. |
793 | */ |
791 | */ |
794 | if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
792 | if (!drop_to_ground |
|
|
793 | || !map |
|
|
794 | || map->in_memory != MAP_IN_MEMORY |
|
|
795 | || map->nodrop |
|
|
796 | || ms ().move_block == MOVE_ALL) |
795 | { |
797 | { |
796 | while (inv) |
798 | while (inv) |
|
|
799 | { |
|
|
800 | inv->destroy_inv (drop_to_ground); |
797 | inv->destroy (); |
801 | inv->destroy (); |
|
|
802 | } |
798 | } |
803 | } |
799 | else |
804 | else |
800 | { /* Put objects in inventory onto this space */ |
805 | { /* Put objects in inventory onto this space */ |
801 | while (inv) |
806 | while (inv) |
802 | { |
807 | { |
… | |
… | |
804 | |
809 | |
805 | if (op->flag [FLAG_STARTEQUIP] |
810 | if (op->flag [FLAG_STARTEQUIP] |
806 | || op->flag [FLAG_NO_DROP] |
811 | || op->flag [FLAG_NO_DROP] |
807 | || op->type == RUNE |
812 | || op->type == RUNE |
808 | || op->type == TRAP |
813 | || op->type == TRAP |
809 | || op->flag [FLAG_IS_A_TEMPLATE]) |
814 | || op->flag [FLAG_IS_A_TEMPLATE] |
|
|
815 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
810 | op->destroy (); |
816 | op->destroy (); |
811 | else |
817 | else |
812 | { |
818 | map->insert (op, x, y); |
813 | op->remove (); |
|
|
814 | op->x = x; |
|
|
815 | op->y = y; |
|
|
816 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
817 | } |
|
|
818 | } |
819 | } |
819 | } |
820 | } |
820 | } |
821 | } |
821 | |
822 | |
822 | object *object::create () |
823 | object *object::create () |
… | |
… | |
827 | } |
828 | } |
828 | |
829 | |
829 | void |
830 | void |
830 | object::do_destroy () |
831 | object::do_destroy () |
831 | { |
832 | { |
|
|
833 | attachable::do_destroy (); |
|
|
834 | |
832 | if (flag [FLAG_IS_LINKED]) |
835 | if (flag [FLAG_IS_LINKED]) |
833 | remove_button_link (this); |
836 | remove_button_link (this); |
834 | |
837 | |
835 | if (flag [FLAG_FRIENDLY]) |
838 | if (flag [FLAG_FRIENDLY]) |
|
|
839 | { |
836 | remove_friendly_object (this); |
840 | remove_friendly_object (this); |
|
|
841 | |
|
|
842 | if (type == GOLEM |
|
|
843 | && owner |
|
|
844 | && owner->type == PLAYER |
|
|
845 | && owner->contr->ranges[range_golem] == this) |
|
|
846 | owner->contr->ranges[range_golem] = 0; |
|
|
847 | } |
837 | |
848 | |
838 | if (!flag [FLAG_REMOVED]) |
849 | if (!flag [FLAG_REMOVED]) |
839 | remove (); |
850 | remove (); |
840 | |
851 | |
841 | if (flag [FLAG_FREED]) |
852 | destroy_inv (true); |
842 | return; |
853 | |
|
|
854 | deactivate (); |
|
|
855 | unlink (); |
843 | |
856 | |
844 | flag [FLAG_FREED] = 1; |
857 | flag [FLAG_FREED] = 1; |
845 | |
|
|
846 | attachable::do_destroy (); |
|
|
847 | |
|
|
848 | destroy_inv (true); |
|
|
849 | set_speed (0); |
|
|
850 | unlink (); |
|
|
851 | |
858 | |
852 | // hack to ensure that freed objects still have a valid map |
859 | // hack to ensure that freed objects still have a valid map |
853 | { |
860 | { |
854 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
861 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
855 | |
862 | |
… | |
… | |
859 | |
866 | |
860 | freed_map->name = "/internal/freed_objects_map"; |
867 | freed_map->name = "/internal/freed_objects_map"; |
861 | freed_map->width = 3; |
868 | freed_map->width = 3; |
862 | freed_map->height = 3; |
869 | freed_map->height = 3; |
863 | |
870 | |
864 | freed_map->allocate (); |
871 | freed_map->alloc (); |
|
|
872 | freed_map->in_memory = MAP_IN_MEMORY; |
865 | } |
873 | } |
866 | |
874 | |
867 | map = freed_map; |
875 | map = freed_map; |
868 | x = 1; |
876 | x = 1; |
869 | y = 1; |
877 | y = 1; |
… | |
… | |
879 | |
887 | |
880 | // clear those pointers that likely might have circular references to us |
888 | // clear those pointers that likely might have circular references to us |
881 | owner = 0; |
889 | owner = 0; |
882 | enemy = 0; |
890 | enemy = 0; |
883 | attacked_by = 0; |
891 | attacked_by = 0; |
884 | |
|
|
885 | // only relevant for players(?), but make sure of it anyways |
|
|
886 | contr = 0; |
|
|
887 | } |
892 | } |
888 | |
893 | |
889 | void |
894 | void |
890 | object::destroy (bool destroy_inventory) |
895 | object::destroy (bool destroy_inventory) |
891 | { |
896 | { |
… | |
… | |
919 | * This function removes the object op from the linked list of objects |
924 | * This function removes the object op from the linked list of objects |
920 | * which it is currently tied to. When this function is done, the |
925 | * which it is currently tied to. When this function is done, the |
921 | * object will have no environment. If the object previously had an |
926 | * object will have no environment. If the object previously had an |
922 | * environment, the x and y coordinates will be updated to |
927 | * environment, the x and y coordinates will be updated to |
923 | * the previous environment. |
928 | * the previous environment. |
924 | * Beware: This function is called from the editor as well! |
|
|
925 | */ |
929 | */ |
926 | void |
930 | void |
927 | object::remove () |
931 | object::do_remove () |
928 | { |
932 | { |
929 | object *tmp, *last = 0; |
933 | object *tmp, *last = 0; |
930 | object *otmp; |
934 | object *otmp; |
931 | |
935 | |
932 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
936 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
… | |
… | |
954 | * to save cpu time. |
958 | * to save cpu time. |
955 | */ |
959 | */ |
956 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
960 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
957 | otmp->update_stats (); |
961 | otmp->update_stats (); |
958 | |
962 | |
959 | if (above != NULL) |
963 | if (above) |
960 | above->below = below; |
964 | above->below = below; |
961 | else |
965 | else |
962 | env->inv = below; |
966 | env->inv = below; |
963 | |
967 | |
964 | if (below != NULL) |
968 | if (below) |
965 | below->above = above; |
969 | below->above = above; |
966 | |
970 | |
967 | /* we set up values so that it could be inserted into |
971 | /* we set up values so that it could be inserted into |
968 | * the map, but we don't actually do that - it is up |
972 | * the map, but we don't actually do that - it is up |
969 | * to the caller to decide what we want to do. |
973 | * to the caller to decide what we want to do. |
… | |
… | |
973 | above = 0, below = 0; |
977 | above = 0, below = 0; |
974 | env = 0; |
978 | env = 0; |
975 | } |
979 | } |
976 | else if (map) |
980 | else if (map) |
977 | { |
981 | { |
978 | /* Re did the following section of code - it looks like it had |
982 | if (type == PLAYER) |
979 | * lots of logic for things we no longer care about |
|
|
980 | */ |
983 | { |
|
|
984 | // leaving a spot always closes any open container on the ground |
|
|
985 | if (container && !container->env) |
|
|
986 | // this causes spurious floorbox updates, but it ensures |
|
|
987 | // that the CLOSE event is being sent. |
|
|
988 | close_container (); |
|
|
989 | |
|
|
990 | --map->players; |
|
|
991 | map->touch (); |
|
|
992 | } |
|
|
993 | |
|
|
994 | map->dirty = true; |
|
|
995 | mapspace &ms = this->ms (); |
981 | |
996 | |
982 | /* link the object above us */ |
997 | /* link the object above us */ |
983 | if (above) |
998 | if (above) |
984 | above->below = below; |
999 | above->below = below; |
985 | else |
1000 | else |
986 | map->at (x, y).top = below; /* we were top, set new top */ |
1001 | ms.top = below; /* we were top, set new top */ |
987 | |
1002 | |
988 | /* Relink the object below us, if there is one */ |
1003 | /* Relink the object below us, if there is one */ |
989 | if (below) |
1004 | if (below) |
990 | below->above = above; |
1005 | below->above = above; |
991 | else |
1006 | else |
… | |
… | |
993 | /* Nothing below, which means we need to relink map object for this space |
1008 | /* Nothing below, which means we need to relink map object for this space |
994 | * use translated coordinates in case some oddness with map tiling is |
1009 | * use translated coordinates in case some oddness with map tiling is |
995 | * evident |
1010 | * evident |
996 | */ |
1011 | */ |
997 | if (GET_MAP_OB (map, x, y) != this) |
1012 | if (GET_MAP_OB (map, x, y) != this) |
998 | { |
|
|
999 | char *dump = dump_object (this); |
|
|
1000 | LOG (llevError, |
|
|
1001 | "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); |
1013 | 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 ()); |
1002 | free (dump); |
|
|
1003 | dump = dump_object (GET_MAP_OB (map, x, y)); |
|
|
1004 | LOG (llevError, "%s\n", dump); |
|
|
1005 | free (dump); |
|
|
1006 | } |
|
|
1007 | |
1014 | |
1008 | map->at (x, y).bot = above; /* goes on above it. */ |
1015 | ms.bot = above; /* goes on above it. */ |
1009 | } |
1016 | } |
1010 | |
1017 | |
1011 | above = 0; |
1018 | above = 0; |
1012 | below = 0; |
1019 | below = 0; |
1013 | |
1020 | |
1014 | if (map->in_memory == MAP_SAVING) |
1021 | if (map->in_memory == MAP_SAVING) |
1015 | return; |
1022 | return; |
1016 | |
1023 | |
1017 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1024 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1018 | |
1025 | |
1019 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1026 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1020 | { |
1027 | { |
1021 | /* No point updating the players look faces if he is the object |
1028 | /* No point updating the players look faces if he is the object |
1022 | * being removed. |
1029 | * being removed. |
1023 | */ |
1030 | */ |
1024 | |
1031 | |
… | |
… | |
1036 | |
1043 | |
1037 | if (tmp->contr->ns) |
1044 | if (tmp->contr->ns) |
1038 | tmp->contr->ns->floorbox_update (); |
1045 | tmp->contr->ns->floorbox_update (); |
1039 | } |
1046 | } |
1040 | |
1047 | |
1041 | /* See if player moving off should effect something */ |
1048 | /* See if object moving off should effect something */ |
1042 | if (check_walk_off |
1049 | if (check_walk_off |
1043 | && ((move_type & tmp->move_off) |
1050 | && ((move_type & tmp->move_off) |
1044 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1051 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1045 | { |
1052 | { |
1046 | move_apply (tmp, this, 0); |
1053 | move_apply (tmp, this, 0); |
1047 | |
1054 | |
1048 | if (destroyed ()) |
1055 | if (destroyed ()) |
1049 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1056 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1050 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1051 | } |
1057 | } |
1052 | |
1058 | |
1053 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1059 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1054 | |
1060 | //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp) |
1055 | if (tmp->above == tmp) |
1061 | if (tmp->above == tmp) |
1056 | tmp->above = 0; |
1062 | tmp->above = 0; |
1057 | |
1063 | |
1058 | last = tmp; |
1064 | last = tmp; |
1059 | } |
1065 | } |
1060 | |
1066 | |
1061 | /* last == NULL of there are no objects on this space */ |
1067 | /* last == NULL if there are no objects on this space */ |
|
|
1068 | //TODO: this makes little sense, why only update the topmost object? |
1062 | if (!last) |
1069 | if (!last) |
1063 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1070 | map->at (x, y).flags_ = 0; |
1064 | else |
1071 | else |
1065 | update_object (last, UP_OBJ_REMOVE); |
1072 | update_object (last, UP_OBJ_REMOVE); |
1066 | |
1073 | |
1067 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1074 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1068 | update_all_los (map, x, y); |
1075 | update_all_los (map, x, y); |
… | |
… | |
1105 | |
1112 | |
1106 | return 0; |
1113 | return 0; |
1107 | } |
1114 | } |
1108 | |
1115 | |
1109 | /* |
1116 | /* |
1110 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1117 | * same as insert_ob_in_map except it handles separate coordinates and does a clean |
1111 | * job preparing multi-part monsters |
1118 | * job preparing multi-part monsters. |
1112 | */ |
1119 | */ |
1113 | object * |
1120 | object * |
1114 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1121 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1115 | { |
1122 | { |
1116 | object *tmp; |
|
|
1117 | |
|
|
1118 | if (op->head) |
|
|
1119 | op = op->head; |
|
|
1120 | |
|
|
1121 | for (tmp = op; tmp; tmp = tmp->more) |
1123 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1122 | { |
1124 | { |
1123 | tmp->x = x + tmp->arch->clone.x; |
1125 | tmp->x = x + tmp->arch->clone.x; |
1124 | tmp->y = y + tmp->arch->clone.y; |
1126 | tmp->y = y + tmp->arch->clone.y; |
1125 | } |
1127 | } |
1126 | |
1128 | |
… | |
… | |
1149 | */ |
1151 | */ |
1150 | object * |
1152 | object * |
1151 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1153 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1152 | { |
1154 | { |
1153 | object *tmp, *top, *floor = NULL; |
1155 | object *tmp, *top, *floor = NULL; |
1154 | sint16 x, y; |
|
|
1155 | |
1156 | |
1156 | if (QUERY_FLAG (op, FLAG_FREED)) |
1157 | if (QUERY_FLAG (op, FLAG_FREED)) |
1157 | { |
1158 | { |
1158 | LOG (llevError, "Trying to insert freed object!\n"); |
1159 | LOG (llevError, "Trying to insert freed object!\n"); |
1159 | return NULL; |
1160 | return NULL; |
1160 | } |
1161 | } |
1161 | |
1162 | |
1162 | if (m == NULL) |
1163 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1164 | LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ()); |
|
|
1165 | |
|
|
1166 | op->remove (); |
|
|
1167 | |
|
|
1168 | if (!m) |
1163 | { |
1169 | { |
1164 | char *dump = dump_object (op); |
1170 | char *dump = dump_object (op); |
1165 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1171 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1166 | free (dump); |
1172 | free (dump); |
1167 | return op; |
1173 | return op; |
… | |
… | |
1180 | #endif |
1186 | #endif |
1181 | free (dump); |
1187 | free (dump); |
1182 | return op; |
1188 | return op; |
1183 | } |
1189 | } |
1184 | |
1190 | |
1185 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1186 | { |
|
|
1187 | char *dump = dump_object (op); |
|
|
1188 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1189 | free (dump); |
|
|
1190 | return op; |
|
|
1191 | } |
|
|
1192 | |
|
|
1193 | if (op->more) |
|
|
1194 | { |
|
|
1195 | /* The part may be on a different map. */ |
|
|
1196 | |
|
|
1197 | object *more = op->more; |
1191 | if (object *more = op->more) |
1198 | |
1192 | { |
1199 | /* We really need the caller to normalize coordinates - if |
|
|
1200 | * we set the map, that doesn't work if the location is within |
|
|
1201 | * a map and this is straddling an edge. So only if coordinate |
|
|
1202 | * is clear wrong do we normalize it. |
|
|
1203 | */ |
|
|
1204 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
|
|
1205 | more->map = get_map_from_coord (m, &more->x, &more->y); |
|
|
1206 | else if (!more->map) |
|
|
1207 | { |
|
|
1208 | /* For backwards compatibility - when not dealing with tiled maps, |
|
|
1209 | * more->map should always point to the parent. |
|
|
1210 | */ |
|
|
1211 | more->map = m; |
|
|
1212 | } |
|
|
1213 | |
|
|
1214 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1193 | if (!insert_ob_in_map (more, m, originator, flag)) |
1215 | { |
1194 | { |
1216 | if (!op->head) |
1195 | if (!op->head) |
1217 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1196 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1218 | |
1197 | |
1219 | return 0; |
1198 | return 0; |
… | |
… | |
1224 | |
1203 | |
1225 | /* Ideally, the caller figures this out. However, it complicates a lot |
1204 | /* Ideally, the caller figures this out. However, it complicates a lot |
1226 | * of areas of callers (eg, anything that uses find_free_spot would now |
1205 | * of areas of callers (eg, anything that uses find_free_spot would now |
1227 | * need extra work |
1206 | * need extra work |
1228 | */ |
1207 | */ |
1229 | op->map = get_map_from_coord (m, &op->x, &op->y); |
1208 | if (!xy_normalise (m, op->x, op->y)) |
1230 | x = op->x; |
1209 | return 0; |
1231 | y = op->y; |
1210 | |
|
|
1211 | op->map = m; |
|
|
1212 | mapspace &ms = op->ms (); |
1232 | |
1213 | |
1233 | /* this has to be done after we translate the coordinates. |
1214 | /* this has to be done after we translate the coordinates. |
1234 | */ |
1215 | */ |
1235 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1216 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1236 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1217 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1237 | if (object::can_merge (op, tmp)) |
1218 | if (object::can_merge (op, tmp)) |
1238 | { |
1219 | { |
1239 | op->nrof += tmp->nrof; |
1220 | op->nrof += tmp->nrof; |
1240 | tmp->destroy (); |
1221 | tmp->destroy (); |
1241 | } |
1222 | } |
… | |
… | |
1258 | op->below = originator->below; |
1239 | op->below = originator->below; |
1259 | |
1240 | |
1260 | if (op->below) |
1241 | if (op->below) |
1261 | op->below->above = op; |
1242 | op->below->above = op; |
1262 | else |
1243 | else |
1263 | op->ms ().bot = op; |
1244 | ms.bot = op; |
1264 | |
1245 | |
1265 | /* since *below* originator, no need to update top */ |
1246 | /* since *below* originator, no need to update top */ |
1266 | originator->below = op; |
1247 | originator->below = op; |
1267 | } |
1248 | } |
1268 | else |
1249 | else |
1269 | { |
1250 | { |
|
|
1251 | top = ms.bot; |
|
|
1252 | |
1270 | /* If there are other objects, then */ |
1253 | /* If there are other objects, then */ |
1271 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1254 | if ((!(flag & INS_MAP_LOAD)) && top) |
1272 | { |
1255 | { |
1273 | object *last = NULL; |
1256 | object *last = 0; |
1274 | |
1257 | |
1275 | /* |
1258 | /* |
1276 | * If there are multiple objects on this space, we do some trickier handling. |
1259 | * If there are multiple objects on this space, we do some trickier handling. |
1277 | * We've already dealt with merging if appropriate. |
1260 | * We've already dealt with merging if appropriate. |
1278 | * Generally, we want to put the new object on top. But if |
1261 | * Generally, we want to put the new object on top. But if |
… | |
… | |
1282 | * once we get to them. This reduces the need to traverse over all of |
1265 | * once we get to them. This reduces the need to traverse over all of |
1283 | * them when adding another one - this saves quite a bit of cpu time |
1266 | * them when adding another one - this saves quite a bit of cpu time |
1284 | * when lots of spells are cast in one area. Currently, it is presumed |
1267 | * when lots of spells are cast in one area. Currently, it is presumed |
1285 | * that flying non pickable objects are spell objects. |
1268 | * that flying non pickable objects are spell objects. |
1286 | */ |
1269 | */ |
1287 | |
1270 | for (top = ms.bot; top; top = top->above) |
1288 | while (top != NULL) |
|
|
1289 | { |
1271 | { |
1290 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1272 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1291 | floor = top; |
1273 | floor = top; |
1292 | |
1274 | |
1293 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1275 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1296 | top = top->below; |
1278 | top = top->below; |
1297 | break; |
1279 | break; |
1298 | } |
1280 | } |
1299 | |
1281 | |
1300 | last = top; |
1282 | last = top; |
1301 | top = top->above; |
|
|
1302 | } |
1283 | } |
1303 | |
1284 | |
1304 | /* Don't want top to be NULL, so set it to the last valid object */ |
1285 | /* Don't want top to be NULL, so set it to the last valid object */ |
1305 | top = last; |
1286 | top = last; |
1306 | |
1287 | |
… | |
… | |
1313 | * Unless those objects are exits, type 66 |
1294 | * Unless those objects are exits, type 66 |
1314 | * If INS_ON_TOP is used, don't do this processing |
1295 | * If INS_ON_TOP is used, don't do this processing |
1315 | * Need to find the object that in fact blocks view, otherwise |
1296 | * Need to find the object that in fact blocks view, otherwise |
1316 | * stacking is a bit odd. |
1297 | * stacking is a bit odd. |
1317 | */ |
1298 | */ |
1318 | if (!(flag & INS_ON_TOP) && |
1299 | if (!(flag & INS_ON_TOP) |
1319 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1300 | && ms.flags () & P_BLOCKSVIEW |
|
|
1301 | && (op->face && !op->face->visibility)) |
1320 | { |
1302 | { |
1321 | for (last = top; last != floor; last = last->below) |
1303 | for (last = top; last != floor; last = last->below) |
1322 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1304 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1323 | break; |
1305 | break; |
|
|
1306 | |
1324 | /* Check to see if we found the object that blocks view, |
1307 | /* Check to see if we found the object that blocks view, |
1325 | * and make sure we have a below pointer for it so that |
1308 | * and make sure we have a below pointer for it so that |
1326 | * we can get inserted below this one, which requires we |
1309 | * we can get inserted below this one, which requires we |
1327 | * set top to the object below us. |
1310 | * set top to the object below us. |
1328 | */ |
1311 | */ |
… | |
… | |
1330 | top = last->below; |
1313 | top = last->below; |
1331 | } |
1314 | } |
1332 | } /* If objects on this space */ |
1315 | } /* If objects on this space */ |
1333 | |
1316 | |
1334 | if (flag & INS_MAP_LOAD) |
1317 | if (flag & INS_MAP_LOAD) |
1335 | top = GET_MAP_TOP (op->map, op->x, op->y); |
1318 | top = ms.top; |
1336 | |
1319 | |
1337 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1320 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1338 | top = floor; |
1321 | top = floor; |
1339 | |
1322 | |
1340 | /* Top is the object that our object (op) is going to get inserted above. |
1323 | /* Top is the object that our object (op) is going to get inserted above. |
1341 | */ |
1324 | */ |
1342 | |
1325 | |
1343 | /* First object on this space */ |
1326 | /* First object on this space */ |
1344 | if (!top) |
1327 | if (!top) |
1345 | { |
1328 | { |
1346 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1329 | op->above = ms.bot; |
1347 | |
1330 | |
1348 | if (op->above) |
1331 | if (op->above) |
1349 | op->above->below = op; |
1332 | op->above->below = op; |
1350 | |
1333 | |
1351 | op->below = NULL; |
1334 | op->below = 0; |
1352 | op->ms ().bot = op; |
1335 | ms.bot = op; |
1353 | } |
1336 | } |
1354 | else |
1337 | else |
1355 | { /* get inserted into the stack above top */ |
1338 | { /* get inserted into the stack above top */ |
1356 | op->above = top->above; |
1339 | op->above = top->above; |
1357 | |
1340 | |
… | |
… | |
1360 | |
1343 | |
1361 | op->below = top; |
1344 | op->below = top; |
1362 | top->above = op; |
1345 | top->above = op; |
1363 | } |
1346 | } |
1364 | |
1347 | |
1365 | if (op->above == NULL) |
1348 | if (!op->above) |
1366 | op->ms ().top = op; |
1349 | ms.top = op; |
1367 | } /* else not INS_BELOW_ORIGINATOR */ |
1350 | } /* else not INS_BELOW_ORIGINATOR */ |
1368 | |
1351 | |
1369 | if (op->type == PLAYER) |
1352 | if (op->type == PLAYER) |
|
|
1353 | { |
1370 | op->contr->do_los = 1; |
1354 | op->contr->do_los = 1; |
|
|
1355 | ++op->map->players; |
|
|
1356 | op->map->touch (); |
|
|
1357 | } |
|
|
1358 | |
|
|
1359 | op->map->dirty = true; |
1371 | |
1360 | |
1372 | /* If we have a floor, we know the player, if any, will be above |
1361 | /* If we have a floor, we know the player, if any, will be above |
1373 | * it, so save a few ticks and start from there. |
1362 | * it, so save a few ticks and start from there. |
1374 | */ |
1363 | */ |
1375 | if (!(flag & INS_MAP_LOAD)) |
1364 | if (!(flag & INS_MAP_LOAD)) |
1376 | if (object *pl = op->ms ().player ()) |
1365 | if (object *pl = ms.player ()) |
1377 | if (pl->contr->ns) |
1366 | if (pl->contr->ns) |
1378 | pl->contr->ns->floorbox_update (); |
1367 | pl->contr->ns->floorbox_update (); |
1379 | |
1368 | |
1380 | /* If this object glows, it may affect lighting conditions that are |
1369 | /* If this object glows, it may affect lighting conditions that are |
1381 | * visible to others on this map. But update_all_los is really |
1370 | * visible to others on this map. But update_all_los is really |
1382 | * an inefficient way to do this, as it means los for all players |
1371 | * an inefficient way to do this, as it means los for all players |
1383 | * on the map will get recalculated. The players could very well |
1372 | * on the map will get recalculated. The players could very well |
1384 | * be far away from this change and not affected in any way - |
1373 | * be far away from this change and not affected in any way - |
1385 | * this should get redone to only look for players within range, |
1374 | * this should get redone to only look for players within range, |
1386 | * or just updating the P_NEED_UPDATE for spaces within this area |
1375 | * or just updating the P_UPTODATE for spaces within this area |
1387 | * of effect may be sufficient. |
1376 | * of effect may be sufficient. |
1388 | */ |
1377 | */ |
1389 | if (op->map->darkness && (op->glow_radius != 0)) |
1378 | if (op->map->darkness && (op->glow_radius != 0)) |
1390 | update_all_los (op->map, op->x, op->y); |
1379 | update_all_los (op->map, op->x, op->y); |
1391 | |
1380 | |
… | |
… | |
1429 | { |
1418 | { |
1430 | object *tmp, *tmp1; |
1419 | object *tmp, *tmp1; |
1431 | |
1420 | |
1432 | /* first search for itself and remove any old instances */ |
1421 | /* first search for itself and remove any old instances */ |
1433 | |
1422 | |
1434 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1423 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1435 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1424 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1436 | tmp->destroy (); |
1425 | tmp->destroy (); |
1437 | |
1426 | |
1438 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1427 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1439 | |
1428 | |
1440 | tmp1->x = op->x; |
1429 | tmp1->x = op->x; |
1441 | tmp1->y = op->y; |
1430 | tmp1->y = op->y; |
1442 | insert_ob_in_map (tmp1, op->map, op, 0); |
1431 | insert_ob_in_map (tmp1, op->map, op, 0); |
|
|
1432 | } |
|
|
1433 | |
|
|
1434 | // XXX: function not returning object* |
|
|
1435 | object * |
|
|
1436 | object::insert_at (object *where, object *originator, int flags) |
|
|
1437 | { |
|
|
1438 | where->map->insert (this, where->x, where->y, originator, flags); |
1443 | } |
1439 | } |
1444 | |
1440 | |
1445 | /* |
1441 | /* |
1446 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1442 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1447 | * is returned contains nr objects, and the remaining parts contains |
1443 | * is returned contains nr objects, and the remaining parts contains |
1448 | * the rest (or is removed and freed if that number is 0). |
1444 | * the rest (or is removed and freed if that number is 0). |
1449 | * On failure, NULL is returned, and the reason put into the |
1445 | * On failure, NULL is returned, and the reason put into the |
1450 | * global static errmsg array. |
1446 | * global static errmsg array. |
1451 | */ |
1447 | */ |
1452 | |
|
|
1453 | object * |
1448 | object * |
1454 | get_split_ob (object *orig_ob, uint32 nr) |
1449 | get_split_ob (object *orig_ob, uint32 nr) |
1455 | { |
1450 | { |
1456 | object *newob; |
1451 | object *newob; |
1457 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1452 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
… | |
… | |
1721 | * |
1716 | * |
1722 | * MSW 2001-07-08: Check all objects on space, not just those below |
1717 | * MSW 2001-07-08: Check all objects on space, not just those below |
1723 | * object being inserted. insert_ob_in_map may not put new objects |
1718 | * object being inserted. insert_ob_in_map may not put new objects |
1724 | * on top. |
1719 | * on top. |
1725 | */ |
1720 | */ |
1726 | |
|
|
1727 | int |
1721 | int |
1728 | check_move_on (object *op, object *originator) |
1722 | check_move_on (object *op, object *originator) |
1729 | { |
1723 | { |
1730 | object *tmp; |
1724 | object *tmp; |
1731 | maptile *m = op->map; |
1725 | maptile *m = op->map; |
… | |
… | |
1758 | |
1752 | |
1759 | /* The objects have to be checked from top to bottom. |
1753 | /* The objects have to be checked from top to bottom. |
1760 | * Hence, we first go to the top: |
1754 | * Hence, we first go to the top: |
1761 | */ |
1755 | */ |
1762 | |
1756 | |
1763 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1757 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
1764 | { |
1758 | { |
1765 | /* Trim the search when we find the first other spell effect |
1759 | /* Trim the search when we find the first other spell effect |
1766 | * this helps performance so that if a space has 50 spell objects, |
1760 | * this helps performance so that if a space has 50 spell objects, |
1767 | * we don't need to check all of them. |
1761 | * we don't need to check all of them. |
1768 | */ |
1762 | */ |
… | |
… | |
1786 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1780 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1787 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1781 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1788 | { |
1782 | { |
1789 | |
1783 | |
1790 | float |
1784 | float |
1791 | diff = tmp->move_slow_penalty * FABS (op->speed); |
1785 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1792 | |
1786 | |
1793 | if (op->type == PLAYER) |
1787 | if (op->type == PLAYER) |
1794 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1788 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1795 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1789 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1796 | diff /= 4.0; |
1790 | diff /= 4.0; |
… | |
… | |
1826 | * The first matching object is returned, or NULL if none. |
1820 | * The first matching object is returned, or NULL if none. |
1827 | */ |
1821 | */ |
1828 | object * |
1822 | object * |
1829 | present_arch (const archetype *at, maptile *m, int x, int y) |
1823 | present_arch (const archetype *at, maptile *m, int x, int y) |
1830 | { |
1824 | { |
1831 | if (m == NULL || out_of_map (m, x, y)) |
1825 | if (!m || out_of_map (m, x, y)) |
1832 | { |
1826 | { |
1833 | LOG (llevError, "Present_arch called outside map.\n"); |
1827 | LOG (llevError, "Present_arch called outside map.\n"); |
1834 | return NULL; |
1828 | return NULL; |
1835 | } |
1829 | } |
1836 | |
1830 | |
1837 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1831 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1838 | if (tmp->arch == at) |
1832 | if (tmp->arch == at) |
1839 | return tmp; |
1833 | return tmp; |
1840 | |
1834 | |
1841 | return NULL; |
1835 | return NULL; |
1842 | } |
1836 | } |
… | |
… | |
1853 | { |
1847 | { |
1854 | LOG (llevError, "Present called outside map.\n"); |
1848 | LOG (llevError, "Present called outside map.\n"); |
1855 | return NULL; |
1849 | return NULL; |
1856 | } |
1850 | } |
1857 | |
1851 | |
1858 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1852 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1859 | if (tmp->type == type) |
1853 | if (tmp->type == type) |
1860 | return tmp; |
1854 | return tmp; |
1861 | |
1855 | |
1862 | return NULL; |
1856 | return NULL; |
1863 | } |
1857 | } |
… | |
… | |
2003 | } |
1997 | } |
2004 | |
1998 | |
2005 | if (!index) |
1999 | if (!index) |
2006 | return -1; |
2000 | return -1; |
2007 | |
2001 | |
2008 | return altern[RANDOM () % index]; |
2002 | return altern [rndm (index)]; |
2009 | } |
2003 | } |
2010 | |
2004 | |
2011 | /* |
2005 | /* |
2012 | * find_first_free_spot(archetype, maptile, x, y) works like |
2006 | * find_first_free_spot(archetype, maptile, x, y) works like |
2013 | * find_free_spot(), but it will search max number of squares. |
2007 | * find_free_spot(), but it will search max number of squares. |
… | |
… | |
2034 | { |
2028 | { |
2035 | arr += begin; |
2029 | arr += begin; |
2036 | end -= begin; |
2030 | end -= begin; |
2037 | |
2031 | |
2038 | while (--end) |
2032 | while (--end) |
2039 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2033 | swap (arr [end], arr [rndm (end + 1)]); |
2040 | } |
2034 | } |
2041 | |
2035 | |
2042 | /* new function to make monster searching more efficient, and effective! |
2036 | /* new function to make monster searching more efficient, and effective! |
2043 | * This basically returns a randomized array (in the passed pointer) of |
2037 | * This basically returns a randomized array (in the passed pointer) of |
2044 | * the spaces to find monsters. In this way, it won't always look for |
2038 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2178 | |
2172 | |
2179 | return 3; |
2173 | return 3; |
2180 | } |
2174 | } |
2181 | |
2175 | |
2182 | /* |
2176 | /* |
2183 | * absdir(int): Returns a number between 1 and 8, which represent |
|
|
2184 | * the "absolute" direction of a number (it actually takes care of |
|
|
2185 | * "overflow" in previous calculations of a direction). |
|
|
2186 | */ |
|
|
2187 | |
|
|
2188 | int |
|
|
2189 | absdir (int d) |
|
|
2190 | { |
|
|
2191 | while (d < 1) |
|
|
2192 | d += 8; |
|
|
2193 | |
|
|
2194 | while (d > 8) |
|
|
2195 | d -= 8; |
|
|
2196 | |
|
|
2197 | return d; |
|
|
2198 | } |
|
|
2199 | |
|
|
2200 | /* |
|
|
2201 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2177 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2202 | * between two directions (which are expected to be absolute (see absdir()) |
2178 | * between two directions (which are expected to be absolute (see absdir()) |
2203 | */ |
2179 | */ |
2204 | |
|
|
2205 | int |
2180 | int |
2206 | dirdiff (int dir1, int dir2) |
2181 | dirdiff (int dir1, int dir2) |
2207 | { |
2182 | { |
2208 | int d; |
2183 | int d; |
2209 | |
2184 | |
… | |
… | |
2375 | insert_ob_in_ob (object_create_clone (item), dst); |
2350 | insert_ob_in_ob (object_create_clone (item), dst); |
2376 | |
2351 | |
2377 | return dst; |
2352 | return dst; |
2378 | } |
2353 | } |
2379 | |
2354 | |
2380 | /* GROS - Creates an object using a string representing its content. */ |
|
|
2381 | /* Basically, we save the content of the string to a temp file, then call */ |
|
|
2382 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
|
|
2383 | /* but it was simple to make and allows reusing the load_object function. */ |
|
|
2384 | /* Remember not to use load_object_str in a time-critical situation. */ |
|
|
2385 | /* Also remember that multiparts objects are not supported for now. */ |
|
|
2386 | object * |
|
|
2387 | load_object_str (const char *obstr) |
|
|
2388 | { |
|
|
2389 | object *op; |
|
|
2390 | char filename[MAX_BUF]; |
|
|
2391 | |
|
|
2392 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
|
|
2393 | |
|
|
2394 | FILE *tempfile = fopen (filename, "w"); |
|
|
2395 | |
|
|
2396 | if (tempfile == NULL) |
|
|
2397 | { |
|
|
2398 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
|
|
2399 | return NULL; |
|
|
2400 | } |
|
|
2401 | |
|
|
2402 | fprintf (tempfile, obstr); |
|
|
2403 | fclose (tempfile); |
|
|
2404 | |
|
|
2405 | op = object::create (); |
|
|
2406 | |
|
|
2407 | object_thawer thawer (filename); |
|
|
2408 | |
|
|
2409 | if (thawer) |
|
|
2410 | load_object (thawer, op, 0); |
|
|
2411 | |
|
|
2412 | LOG (llevDebug, " load str completed, object=%s\n", &op->name); |
|
|
2413 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
2414 | |
|
|
2415 | return op; |
|
|
2416 | } |
|
|
2417 | |
|
|
2418 | /* This returns the first object in who's inventory that |
2355 | /* This returns the first object in who's inventory that |
2419 | * has the same type and subtype match. |
2356 | * has the same type and subtype match. |
2420 | * returns NULL if no match. |
2357 | * returns NULL if no match. |
2421 | */ |
2358 | */ |
2422 | object * |
2359 | object * |
… | |
… | |
2588 | } |
2525 | } |
2589 | else |
2526 | else |
2590 | item = item->env; |
2527 | item = item->env; |
2591 | } |
2528 | } |
2592 | |
2529 | |
|
|
2530 | |
|
|
2531 | const char * |
|
|
2532 | object::flag_desc (char *desc, int len) const |
|
|
2533 | { |
|
|
2534 | char *p = desc; |
|
|
2535 | bool first = true; |
|
|
2536 | |
|
|
2537 | *p = 0; |
|
|
2538 | |
|
|
2539 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2540 | { |
|
|
2541 | if (len <= 10) // magic constant! |
|
|
2542 | { |
|
|
2543 | snprintf (p, len, ",..."); |
|
|
2544 | break; |
|
|
2545 | } |
|
|
2546 | |
|
|
2547 | if (flag [i]) |
|
|
2548 | { |
|
|
2549 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2550 | len -= cnt; |
|
|
2551 | p += cnt; |
|
|
2552 | first = false; |
|
|
2553 | } |
|
|
2554 | } |
|
|
2555 | |
|
|
2556 | return desc; |
|
|
2557 | } |
|
|
2558 | |
2593 | // return a suitable string describing an objetc in enough detail to find it |
2559 | // return a suitable string describing an object in enough detail to find it |
2594 | const char * |
2560 | const char * |
2595 | object::debug_desc (char *info) const |
2561 | object::debug_desc (char *info) const |
2596 | { |
2562 | { |
|
|
2563 | char flagdesc[512]; |
2597 | char info2[256 * 3]; |
2564 | char info2[256 * 4]; |
2598 | char *p = info; |
2565 | char *p = info; |
2599 | |
2566 | |
2600 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2567 | p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2601 | count, |
2568 | count, uuid.seq, |
2602 | &name, |
2569 | &name, |
2603 | title ? " " : "", |
2570 | title ? "\",title:\"" : "", |
2604 | title ? (const char *)title : ""); |
2571 | title ? (const char *)title : "", |
|
|
2572 | flag_desc (flagdesc, 512), type); |
2605 | |
2573 | |
2606 | if (env) |
2574 | if (env) |
2607 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2575 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2608 | |
2576 | |
2609 | if (map) |
2577 | if (map) |
2610 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2578 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2611 | |
2579 | |
2612 | return info; |
2580 | return info; |
2613 | } |
2581 | } |
2614 | |
2582 | |
2615 | const char * |
2583 | const char * |
2616 | object::debug_desc () const |
2584 | object::debug_desc () const |
2617 | { |
2585 | { |
2618 | static char info[256 * 3]; |
2586 | static char info[256 * 4]; |
2619 | return debug_desc (info); |
2587 | return debug_desc (info); |
2620 | } |
2588 | } |
2621 | |
2589 | |
|
|
2590 | const char * |
|
|
2591 | object::debug_desc2 () const |
|
|
2592 | { |
|
|
2593 | static char info[256 * 4]; |
|
|
2594 | return debug_desc (info); |
|
|
2595 | } |
|
|
2596 | |
|
|
2597 | struct region * |
|
|
2598 | object::region () const |
|
|
2599 | { |
|
|
2600 | return map ? map->region (x, y) |
|
|
2601 | : region::default_region (); |
|
|
2602 | } |
|
|
2603 | |
|
|
2604 | const materialtype_t * |
|
|
2605 | object::dominant_material () const |
|
|
2606 | { |
|
|
2607 | if (materialtype_t *mat = name_to_material (materialname)) |
|
|
2608 | return mat; |
|
|
2609 | |
|
|
2610 | // omfg this is slow, this has to be temporary :) |
|
|
2611 | shstr unknown ("unknown"); |
|
|
2612 | |
|
|
2613 | return name_to_material (unknown); |
|
|
2614 | } |
|
|
2615 | |
|
|
2616 | void |
|
|
2617 | object::open_container (object *new_container) |
|
|
2618 | { |
|
|
2619 | if (container == new_container) |
|
|
2620 | return; |
|
|
2621 | |
|
|
2622 | if (object *old_container = container) |
|
|
2623 | { |
|
|
2624 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
|
|
2625 | return; |
|
|
2626 | |
|
|
2627 | #if 0 |
|
|
2628 | // remove the "Close old_container" object. |
|
|
2629 | if (object *closer = old_container->inv) |
|
|
2630 | if (closer->type == CLOSE_CON) |
|
|
2631 | closer->destroy (); |
|
|
2632 | #endif |
|
|
2633 | |
|
|
2634 | old_container->flag [FLAG_APPLIED] = 0; |
|
|
2635 | container = 0; |
|
|
2636 | |
|
|
2637 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2638 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2639 | } |
|
|
2640 | |
|
|
2641 | if (new_container) |
|
|
2642 | { |
|
|
2643 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
|
|
2644 | return; |
|
|
2645 | |
|
|
2646 | // TODO: this does not seem to serve any purpose anymore? |
|
|
2647 | #if 0 |
|
|
2648 | // insert the "Close Container" object. |
|
|
2649 | if (archetype *closer = new_container->other_arch) |
|
|
2650 | { |
|
|
2651 | object *closer = arch_to_object (new_container->other_arch); |
|
|
2652 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
|
|
2653 | new_container->insert (closer); |
|
|
2654 | } |
|
|
2655 | #endif |
|
|
2656 | |
|
|
2657 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
|
|
2658 | |
|
|
2659 | new_container->flag [FLAG_APPLIED] = 1; |
|
|
2660 | container = new_container; |
|
|
2661 | |
|
|
2662 | esrv_update_item (UPD_FLAGS, this, new_container); |
|
|
2663 | esrv_send_inventory (this, new_container); |
|
|
2664 | } |
|
|
2665 | } |
|
|
2666 | |
|
|
2667 | |