ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.109 by root, Sun Jan 7 21:54:59 2007 UTC

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
… …
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short 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, 45short 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};
46short 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, 48short 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,
… …
141 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
143 */ 145 */
144 146
145 /* For each field in wants, */ 147 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 149 {
148 key_value *has_field; 150 key_value *has_field;
149 151
150 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
… …
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
196bool object::can_merge_slow (object *ob1, object *ob2) 197bool 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
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 222 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 223
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 225 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 226
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 228 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 229 || ob1->name != ob2->name
229 || ob1->title != ob2->title 230 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 231 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 232 || ob1->weight != ob2->weight
… …
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:
… …
364{ 365{
365 if (!op) 366 if (!op)
366 return strdup ("[NULLOBJ]"); 367 return strdup ("[NULLOBJ]");
367 368
368 object_freezer freezer; 369 object_freezer freezer;
369 save_object (freezer, op, 3); 370 save_object (freezer, op, 1);
370 return freezer.as_string (); 371 return freezer.as_string ();
371} 372}
372 373
373/* 374/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
… …
391} 392}
392 393
393/* 394/*
394 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
395 */ 396 */
396
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 for (object *op = object::first; op; op = op->next) 400 return ((unsigned int)i) < objects.size ()
401 if (op->count == i) 401 ? objects [i]
402 return op; 402 : 0;
403
404 return 0;
405} 403}
406 404
407/* 405/*
408 * Returns the first object which has a name equal to the argument. 406 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 407 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 408 * Enables features like "patch <name-of-other-player> food 999"
411 */ 409 */
412
413object * 410object *
414find_object_name (const char *str) 411find_object_name (const char *str)
415{ 412{
416 shstr_cmp str_ (str); 413 shstr_cmp str_ (str);
417 object *op; 414 object *op;
418 415
419 for (op = object::first; op != NULL; op = op->next) 416 for_all_objects (op)
420 if (op->name == str_) 417 if (op->name == str_)
421 break; 418 break;
422 419
423 return op; 420 return op;
424} 421}
… …
467 } 464 }
468 465
469 op->key_values = 0; 466 op->key_values = 0;
470} 467}
471 468
472void object::clear ()
473{
474 attachable_base::clear ();
475
476 free_key_values (this);
477
478 owner = 0;
479 name = 0;
480 name_pl = 0;
481 title = 0;
482 race = 0;
483 slaying = 0;
484 skill = 0;
485 msg = 0;
486 lore = 0;
487 custom_name = 0;
488 materialname = 0;
489 contr = 0;
490 below = 0;
491 above = 0;
492 inv = 0;
493 container = 0;
494 env = 0;
495 more = 0;
496 head = 0;
497 map = 0;
498 active_next = 0;
499 active_prev = 0;
500
501 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503 SET_FLAG (this, FLAG_REMOVED);
504
505 /* What is not cleared is next, prev, and count */
506
507 expmul = 1.0;
508 face = blank_face;
509
510 if (settings.casting_time)
511 casting_time = -1;
512}
513
514/* 469/*
515 * copy_to first frees everything allocated by the dst object, 470 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second 471 * and then copies the contents of itself into the second
517 * object, allocating what needs to be allocated. Basically, any 472 * object, allocating what needs to be allocated. Basically, any
518 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 473 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
… …
524{ 479{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527 482
528 *(object_copy *)dst = *this; 483 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533 484
534 if (is_freed) 485 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED); 486 SET_FLAG (dst, FLAG_FREED);
536 487
537 if (is_removed) 488 if (is_removed)
… …
568 tail = new_link; 519 tail = new_link;
569 } 520 }
570 } 521 }
571 } 522 }
572 523
573 update_ob_speed (dst); 524 dst->set_speed (dst->speed);
574} 525}
575 526
576object * 527object *
577object::clone () 528object::clone ()
578{ 529{
… …
584/* 535/*
585 * If an object with the IS_TURNABLE() flag needs to be turned due 536 * If an object with the IS_TURNABLE() flag needs to be turned due
586 * to the closest player being on the other side, this function can 537 * to the closest player being on the other side, this function can
587 * be called to update the face variable, _and_ how it looks on the map. 538 * be called to update the face variable, _and_ how it looks on the map.
588 */ 539 */
589
590void 540void
591update_turn_face (object *op) 541update_turn_face (object *op)
592{ 542{
593 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 543 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594 return; 544 return;
545
595 SET_ANIMATION (op, op->direction); 546 SET_ANIMATION (op, op->direction);
596 update_object (op, UP_OBJ_FACE); 547 update_object (op, UP_OBJ_FACE);
597} 548}
598 549
599/* 550/*
600 * Updates the speed of an object. If the speed changes from 0 to another 551 * Updates the speed of an object. If the speed changes from 0 to another
601 * value, or vice versa, then add/remove the object from the active list. 552 * value, or vice versa, then add/remove the object from the active list.
602 * This function needs to be called whenever the speed of an object changes. 553 * This function needs to be called whenever the speed of an object changes.
603 */ 554 */
604void 555void
605update_ob_speed (object *op) 556object::set_speed (float speed)
606{ 557{
607 extern int arch_init; 558 if (flag [FLAG_FREED] && speed)
608
609 /* No reason putting the archetypes objects on the speed list,
610 * since they never really need to be updated.
611 */
612
613 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614 { 559 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 560 LOG (llevError, "Object %s is freed but has speed.\n", &name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0; 561 speed = 0;
620#endif
621 }
622
623 if (arch_init)
624 return;
625
626 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627 { 562 }
628 /* If already on active list, don't do anything */
629 if (op->active_next || op->active_prev || op == active_objects)
630 return;
631 563
632 /* process_events() expects us to insert the object at the beginning 564 this->speed = speed;
633 * of the list. */
634 op->active_next = active_objects;
635 565
636 if (op->active_next != NULL) 566 if (has_active_speed ())
637 op->active_next->active_prev = op; 567 activate ();
638
639 active_objects = op;
640 }
641 else 568 else
642 { 569 deactivate ();
643 /* If not on the active list, nothing needs to be done */
644 if (!op->active_next && !op->active_prev && op != active_objects)
645 return;
646
647 if (op->active_prev == NULL)
648 {
649 active_objects = op->active_next;
650
651 if (op->active_next != NULL)
652 op->active_next->active_prev = NULL;
653 }
654 else
655 {
656 op->active_prev->active_next = op->active_next;
657
658 if (op->active_next)
659 op->active_next->active_prev = op->active_prev;
660 }
661
662 op->active_next = NULL;
663 op->active_prev = NULL;
664 }
665} 570}
666 571
667/* This function removes object 'op' from the list of active
668 * objects.
669 * This should only be used for style maps or other such
670 * reference maps where you don't want an object that isn't
671 * in play chewing up cpu time getting processed.
672 * The reverse of this is to call update_ob_speed, which
673 * will do the right thing based on the speed of the object.
674 */
675void
676remove_from_active_list (object *op)
677{
678 /* If not on the active list, nothing needs to be done */
679 if (!op->active_next && !op->active_prev && op != active_objects)
680 return;
681
682 if (op->active_prev == NULL)
683 {
684 active_objects = op->active_next;
685 if (op->active_next != NULL)
686 op->active_next->active_prev = NULL;
687 }
688 else
689 {
690 op->active_prev->active_next = op->active_next;
691 if (op->active_next)
692 op->active_next->active_prev = op->active_prev;
693 }
694 op->active_next = NULL;
695 op->active_prev = NULL;
696}
697
698/* 572/*
699 * update_object() updates the array which represents the map. 573 * update_object() updates the the map.
700 * It takes into account invisible objects (and represent squares covered 574 * It takes into account invisible objects (and represent squares covered
701 * by invisible objects by whatever is below them (unless it's another 575 * by invisible objects by whatever is below them (unless it's another
702 * invisible object, etc...) 576 * invisible object, etc...)
703 * If the object being updated is beneath a player, the look-window 577 * If the object being updated is beneath a player, the look-window
704 * of that player is updated (this might be a suboptimal way of 578 * of that player is updated (this might be a suboptimal way of
705 * updating that window, though, since update_object() is called _often_) 579 * updating that window, though, since update_object() is called _often_)
706 * 580 *
707 * action is a hint of what the caller believes need to be done. 581 * action is a hint of what the caller believes need to be done.
708 * For example, if the only thing that has changed is the face (due to
709 * an animation), we don't need to call update_position until that actually
710 * comes into view of a player. OTOH, many other things, like addition/removal
711 * of walls or living creatures may need us to update the flags now.
712 * current action are: 582 * current action are:
713 * UP_OBJ_INSERT: op was inserted 583 * UP_OBJ_INSERT: op was inserted
714 * UP_OBJ_REMOVE: op was removed 584 * UP_OBJ_REMOVE: op was removed
715 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 585 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
716 * as that is easier than trying to look at what may have changed. 586 * as that is easier than trying to look at what may have changed.
717 * UP_OBJ_FACE: only the objects face has changed. 587 * UP_OBJ_FACE: only the objects face has changed.
718 */ 588 */
719
720void 589void
721update_object (object *op, int action) 590update_object (object *op, int action)
722{ 591{
723 int update_now = 0, flags;
724 MoveType move_on, move_off, move_block, move_slow; 592 MoveType move_on, move_off, move_block, move_slow;
725 593
726 if (op == NULL) 594 if (op == NULL)
727 { 595 {
728 /* this should never happen */ 596 /* this should never happen */
729 LOG (llevDebug, "update_object() called for NULL object.\n"); 597 LOG (llevDebug, "update_object() called for NULL object.\n");
730 return; 598 return;
731 } 599 }
732 600
733 if (op->env != NULL) 601 if (op->env)
734 { 602 {
735 /* Animation is currently handled by client, so nothing 603 /* Animation is currently handled by client, so nothing
736 * to do in this case. 604 * to do in this case.
737 */ 605 */
738 return; 606 return;
… …
743 */ 611 */
744 if (!op->map || op->map->in_memory == MAP_SAVING) 612 if (!op->map || op->map->in_memory == MAP_SAVING)
745 return; 613 return;
746 614
747 /* make sure the object is within map boundaries */ 615 /* make sure the object is within map boundaries */
748 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 616 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
749 { 617 {
750 LOG (llevError, "update_object() called for object out of map!\n"); 618 LOG (llevError, "update_object() called for object out of map!\n");
751#ifdef MANY_CORES 619#ifdef MANY_CORES
752 abort (); 620 abort ();
753#endif 621#endif
754 return; 622 return;
755 } 623 }
756 624
757 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 625 mapspace &m = op->ms ();
758 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
759 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
760 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
761 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
762 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
763 626
627 if (!(m.flags_ & P_UPTODATE))
628 /* nop */;
764 if (action == UP_OBJ_INSERT) 629 else if (action == UP_OBJ_INSERT)
765 { 630 {
631 // this is likely overkill, TODO: revisit (schmorp)
766 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 632 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
767 update_now = 1;
768
769 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 633 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770 update_now = 1; 634 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
771 635 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
636 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
772 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 637 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
773 update_now = 1;
774
775 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
776 update_now = 1;
777
778 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
779 update_now = 1;
780
781 if ((move_on | op->move_on) != move_on) 638 || (m.move_on | op->move_on ) != m.move_on
782 update_now = 1;
783
784 if ((move_off | op->move_off) != move_off) 639 || (m.move_off | op->move_off ) != m.move_off
785 update_now = 1; 640 || (m.move_slow | op->move_slow) != m.move_slow
786
787 /* This isn't perfect, but I don't expect a lot of objects to 641 /* This isn't perfect, but I don't expect a lot of objects to
788 * to have move_allow right now. 642 * to have move_allow right now.
789 */ 643 */
790 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 644 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
791 update_now = 1; 645 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
792 646 m.flags_ = 0;
793 if ((move_slow | op->move_slow) != move_slow)
794 update_now = 1;
795 } 647 }
796
797 /* if the object is being removed, we can't make intelligent 648 /* if the object is being removed, we can't make intelligent
798 * decisions, because remove_ob can't really pass the object 649 * decisions, because remove_ob can't really pass the object
799 * that is being removed. 650 * that is being removed.
800 */ 651 */
801 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 652 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
802 update_now = 1; 653 m.flags_ = 0;
803 else if (action == UP_OBJ_FACE) 654 else if (action == UP_OBJ_FACE)
804 /* Nothing to do for that case */ ; 655 /* Nothing to do for that case */ ;
805 else 656 else
806 LOG (llevError, "update_object called with invalid action: %d\n", action); 657 LOG (llevError, "update_object called with invalid action: %d\n", action);
807 658
808 if (update_now)
809 {
810 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
811 update_position (op->map, op->x, op->y);
812 }
813
814 if (op->more != NULL) 659 if (op->more)
815 update_object (op->more, action); 660 update_object (op->more, action);
816} 661}
817 662
818object::vector object::mortals;
819object::vector object::objects; // not yet used
820object *object::first; 663object *object::first;
821
822void object::free_mortals ()
823{
824 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
825 if ((*i)->refcnt)
826 ++i; // further delay freeing
827 else
828 {
829 delete *i;
830 mortals.erase (i);
831 }
832}
833 664
834object::object () 665object::object ()
835{ 666{
836 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
837 668
… …
844 free_key_values (this); 675 free_key_values (this);
845} 676}
846 677
847void object::link () 678void object::link ()
848{ 679{
849 count = ++ob_count;
850 uuid = gen_uuid (); 680 uuid = gen_uuid ();
851 681
852 prev = 0; 682 refcnt_inc ();
853 next = object::first; 683 objects.insert (this);
854
855 if (object::first)
856 object::first->prev = this;
857
858 object::first = this;
859} 684}
860 685
861void object::unlink () 686void object::unlink ()
862{ 687{
863 if (this == object::first) 688 objects.erase (this);
864 object::first = next; 689 refcnt_dec ();
690}
865 691
866 /* Remove this object from the list of used objects */ 692void
867 if (prev) prev->next = next; 693object::activate ()
868 if (next) next->prev = prev; 694{
695 /* If already on active list, don't do anything */
696 if (active)
697 return;
869 698
870 prev = 0; 699 if (has_active_speed ())
871 next = 0; 700 actives.insert (this);
701}
702
703void
704object::activate_recursive ()
705{
706 activate ();
707
708 for (object *op = inv; op; op = op->below)
709 op->activate_recursive ();
710}
711
712/* This function removes object 'op' from the list of active
713 * objects.
714 * This should only be used for style maps or other such
715 * reference maps where you don't want an object that isn't
716 * in play chewing up cpu time getting processed.
717 * The reverse of this is to call update_ob_speed, which
718 * will do the right thing based on the speed of the object.
719 */
720void
721object::deactivate ()
722{
723 /* If not on the active list, nothing needs to be done */
724 if (!active)
725 return;
726
727 actives.erase (this);
728}
729
730void
731object::deactivate_recursive ()
732{
733 for (object *op = inv; op; op = op->below)
734 op->deactivate_recursive ();
735
736 deactivate ();
737}
738
739void
740object::set_flag_inv (int flag, int value)
741{
742 for (object *op = inv; op; op = op->below)
743 {
744 op->flag [flag] = value;
745 op->set_flag_inv (flag, value);
746 }
747}
748
749/*
750 * Remove and free all objects in the inventory of the given object.
751 * object.c ?
752 */
753void
754object::destroy_inv (bool drop_to_ground)
755{
756 // need to check first, because the checks below might segfault
757 // as we might be on an invalid mapspace and crossfire code
758 // is too buggy to ensure that the inventory is empty.
759 // corollary: if you create arrows etc. with stuff in tis inventory,
760 // cf will crash below with off-map x and y
761 if (!inv)
762 return;
763
764 /* Only if the space blocks everything do we not process -
765 * if some form of movement is allowed, let objects
766 * drop on that space.
767 */
768 if (!drop_to_ground
769 || !map
770 || map->in_memory != MAP_IN_MEMORY
771 || ms ().move_block == MOVE_ALL)
772 {
773 while (inv)
774 {
775 inv->destroy_inv (drop_to_ground);
776 inv->destroy ();
777 }
778 }
779 else
780 { /* Put objects in inventory onto this space */
781 while (inv)
782 {
783 object *op = inv;
784
785 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE
788 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE])
790 op->destroy ();
791 else
792 map->insert (op, x, y);
793 }
794 }
872} 795}
873 796
874object *object::create () 797object *object::create ()
875{ 798{
876 object *op = new object; 799 object *op = new object;
877 op->link (); 800 op->link ();
878 return op; 801 return op;
879} 802}
880 803
881/* 804void
882 * free_object() frees everything allocated by an object, removes 805object::do_destroy ()
883 * it from the list of used objects, and puts it on the list of
884 * free objects. The IS_FREED() flag is set in the object.
885 * The object must have been removed by remove_ob() first for
886 * this function to succeed.
887 *
888 * If destroy_inventory is set, free inventory as well. Else drop items in
889 * inventory to the ground.
890 */
891void object::destroy (bool destroy_inventory)
892{ 806{
893 if (QUERY_FLAG (this, FLAG_FREED)) 807 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this);
809
810 if (flag [FLAG_FRIENDLY])
811 remove_friendly_object (this);
812
813 if (!flag [FLAG_REMOVED])
814 remove ();
815
816 if (flag [FLAG_FREED])
894 return; 817 return;
895 818
896 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 819 set_speed (0);
897 remove_friendly_object (this);
898 820
899 if (!QUERY_FLAG (this, FLAG_REMOVED)) 821 flag [FLAG_FREED] = 1;
900 remove ();
901 822
902 SET_FLAG (this, FLAG_FREED); 823 attachable::do_destroy ();
903 824
904 if (more) 825 destroy_inv (true);
905 { 826 unlink ();
906 more->destroy (destroy_inventory);
907 more = 0;
908 }
909
910 if (inv)
911 {
912 /* Only if the space blocks everything do we not process -
913 * if some form of movement is allowed, let objects
914 * drop on that space.
915 */
916 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
917 {
918 object *op = inv;
919
920 while (op)
921 {
922 object *tmp = op->below;
923 op->destroy (destroy_inventory);
924 op = tmp;
925 }
926 }
927 else
928 { /* Put objects in inventory onto this space */
929 object *op = inv;
930
931 while (op)
932 {
933 object *tmp = op->below;
934
935 op->remove ();
936
937 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
938 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
939 op->destroy ();
940 else
941 {
942 op->x = x;
943 op->y = y;
944 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
945 }
946
947 op = tmp;
948 }
949 }
950 }
951 827
952 // hack to ensure that freed objects still have a valid map 828 // hack to ensure that freed objects still have a valid map
953 { 829 {
954 static maptile *freed_map; // freed objects are moved here to avoid crashes 830 static maptile *freed_map; // freed objects are moved here to avoid crashes
955 831
… …
959 835
960 freed_map->name = "/internal/freed_objects_map"; 836 freed_map->name = "/internal/freed_objects_map";
961 freed_map->width = 3; 837 freed_map->width = 3;
962 freed_map->height = 3; 838 freed_map->height = 3;
963 839
964 freed_map->allocate (); 840 freed_map->alloc ();
841 freed_map->in_memory = MAP_IN_MEMORY;
965 } 842 }
966 843
967 map = freed_map; 844 map = freed_map;
968 x = 1; 845 x = 1;
969 y = 1; 846 y = 1;
970 } 847 }
971 848
849 head = 0;
850
851 if (more)
852 {
853 more->destroy ();
854 more = 0;
855 }
856
972 // clear those pointers that likely might have circular references to us 857 // clear those pointers that likely might have circular references to us
973 owner = 0; 858 owner = 0;
974 enemy = 0; 859 enemy = 0;
975 attacked_by = 0; 860 attacked_by = 0;
861}
976 862
977 // only relevant for players(?), but make sure of it anyways 863void
978 contr = 0; 864object::destroy (bool destroy_inventory)
865{
866 if (destroyed ())
867 return;
979 868
980 /* Remove object from the active list */ 869 if (destroy_inventory)
981 speed = 0; 870 destroy_inv (false);
982 update_ob_speed (this);
983 871
984 unlink (); 872 attachable::destroy ();
985
986 mortals.push_back (this);
987} 873}
988 874
989/* 875/*
990 * sub_weight() recursively (outwards) subtracts a number from the 876 * sub_weight() recursively (outwards) subtracts a number from the
991 * weight of an object (and what is carried by it's environment(s)). 877 * weight of an object (and what is carried by it's environment(s)).
… …
1015object::remove () 901object::remove ()
1016{ 902{
1017 object *tmp, *last = 0; 903 object *tmp, *last = 0;
1018 object *otmp; 904 object *otmp;
1019 905
1020 int check_walk_off;
1021
1022 if (QUERY_FLAG (this, FLAG_REMOVED)) 906 if (QUERY_FLAG (this, FLAG_REMOVED))
1023 return; 907 return;
1024 908
1025 SET_FLAG (this, FLAG_REMOVED); 909 SET_FLAG (this, FLAG_REMOVED);
910 INVOKE_OBJECT (REMOVE, this);
1026 911
1027 if (more) 912 if (more)
1028 more->remove (); 913 more->remove ();
1029 914
1030 /* 915 /*
… …
1041 /* NO_FIX_PLAYER is set when a great many changes are being 926 /* NO_FIX_PLAYER is set when a great many changes are being
1042 * made to players inventory. If set, avoiding the call 927 * made to players inventory. If set, avoiding the call
1043 * to save cpu time. 928 * to save cpu time.
1044 */ 929 */
1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 930 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046 fix_player (otmp); 931 otmp->update_stats ();
1047 932
1048 if (above != NULL) 933 if (above)
1049 above->below = below; 934 above->below = below;
1050 else 935 else
1051 env->inv = below; 936 env->inv = below;
1052 937
1053 if (below != NULL) 938 if (below)
1054 below->above = above; 939 below->above = above;
1055 940
1056 /* we set up values so that it could be inserted into 941 /* we set up values so that it could be inserted into
1057 * the map, but we don't actually do that - it is up 942 * the map, but we don't actually do that - it is up
1058 * to the caller to decide what we want to do. 943 * to the caller to decide what we want to do.
… …
1062 above = 0, below = 0; 947 above = 0, below = 0;
1063 env = 0; 948 env = 0;
1064 } 949 }
1065 else if (map) 950 else if (map)
1066 { 951 {
1067 /* Re did the following section of code - it looks like it had 952 if (type == PLAYER)
1068 * lots of logic for things we no longer care about
1069 */ 953 {
954 --map->players;
955 map->touch ();
956 }
957
958 map->dirty = true;
1070 959
1071 /* link the object above us */ 960 /* link the object above us */
1072 if (above) 961 if (above)
1073 above->below = below; 962 above->below = below;
1074 else 963 else
1075 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ 964 map->at (x, y).top = below; /* we were top, set new top */
1076 965
1077 /* Relink the object below us, if there is one */ 966 /* Relink the object below us, if there is one */
1078 if (below) 967 if (below)
1079 below->above = above; 968 below->above = above;
1080 else 969 else
… …
1092 dump = dump_object (GET_MAP_OB (map, x, y)); 981 dump = dump_object (GET_MAP_OB (map, x, y));
1093 LOG (llevError, "%s\n", dump); 982 LOG (llevError, "%s\n", dump);
1094 free (dump); 983 free (dump);
1095 } 984 }
1096 985
1097 SET_MAP_OB (map, x, y, above); /* goes on above it. */ 986 map->at (x, y).bot = above; /* goes on above it. */
1098 } 987 }
1099 988
1100 above = 0; 989 above = 0;
1101 below = 0; 990 below = 0;
1102 991
1103 if (map->in_memory == MAP_SAVING) 992 if (map->in_memory == MAP_SAVING)
1104 return; 993 return;
1105 994
1106 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 995 int check_walk_off = !flag [FLAG_NO_APPLY];
1107 996
1108 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1109 { 998 {
1110 /* No point updating the players look faces if he is the object 999 /* No point updating the players look faces if he is the object
1111 * being removed. 1000 * being removed.
1112 */ 1001 */
1113 1002
… …
1117 * removed (most likely destroyed), update the player view 1006 * removed (most likely destroyed), update the player view
1118 * appropriately. 1007 * appropriately.
1119 */ 1008 */
1120 if (tmp->container == this) 1009 if (tmp->container == this)
1121 { 1010 {
1122 CLEAR_FLAG (this, FLAG_APPLIED); 1011 flag [FLAG_APPLIED] = 0;
1123 tmp->container = 0; 1012 tmp->container = 0;
1124 } 1013 }
1125 1014
1015 if (tmp->contr->ns)
1126 tmp->contr->socket->floorbox_update (); 1016 tmp->contr->ns->floorbox_update ();
1127 } 1017 }
1128 1018
1129 /* See if player moving off should effect something */ 1019 /* See if object moving off should effect something */
1130 if (check_walk_off 1020 if (check_walk_off
1131 && ((move_type & tmp->move_off) 1021 && ((move_type & tmp->move_off)
1132 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1022 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1133 { 1023 {
1134 move_apply (tmp, this, 0); 1024 move_apply (tmp, this, 0);
… …
1136 if (destroyed ()) 1026 if (destroyed ())
1137 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1027 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1138 } 1028 }
1139 1029
1140 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1030 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1141 1031 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1142 if (tmp->above == tmp) 1032 if (tmp->above == tmp)
1143 tmp->above = 0; 1033 tmp->above = 0;
1144 1034
1145 last = tmp; 1035 last = tmp;
1146 } 1036 }
1147 1037
1148 /* last == NULL of there are no objects on this space */ 1038 /* last == NULL if there are no objects on this space */
1039 //TODO: this makes little sense, why only update the topmost object?
1149 if (!last) 1040 if (!last)
1150 { 1041 map->at (x, y).flags_ = 0;
1151 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1152 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1153 * those out anyways, and if there are any flags set right now, they won't
1154 * be correct anyways.
1155 */
1156 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1157 update_position (map, x, y);
1158 }
1159 else 1042 else
1160 update_object (last, UP_OBJ_REMOVE); 1043 update_object (last, UP_OBJ_REMOVE);
1161 1044
1162 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1045 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1163 update_all_los (map, x, y); 1046 update_all_los (map, x, y);
1164 } 1047 }
1165} 1048}
1166 1049
1167/* 1050/*
… …
1176merge_ob (object *op, object *top) 1059merge_ob (object *op, object *top)
1177{ 1060{
1178 if (!op->nrof) 1061 if (!op->nrof)
1179 return 0; 1062 return 0;
1180 1063
1181 if (top == NULL) 1064 if (top)
1182 for (top = op; top != NULL && top->above != NULL; top = top->above); 1065 for (top = op; top && top->above; top = top->above)
1066 ;
1183 1067
1184 for (; top != NULL; top = top->below) 1068 for (; top; top = top->below)
1185 { 1069 {
1186 if (top == op) 1070 if (top == op)
1187 continue; 1071 continue;
1188 1072
1189 if (object::can_merge (op, top)) 1073 if (object::can_merge (op, top))
… …
1205 * job preparing multi-part monsters 1089 * job preparing multi-part monsters
1206 */ 1090 */
1207object * 1091object *
1208insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1209{ 1093{
1210 object *tmp;
1211
1212 if (op->head)
1213 op = op->head;
1214
1215 for (tmp = op; tmp; tmp = tmp->more) 1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1216 { 1095 {
1217 tmp->x = x + tmp->arch->clone.x; 1096 tmp->x = x + tmp->arch->clone.x;
1218 tmp->y = y + tmp->arch->clone.y; 1097 tmp->y = y + tmp->arch->clone.y;
1219 } 1098 }
1220 1099
… …
1239 * Return value: 1118 * Return value:
1240 * new object if 'op' was merged with other object 1119 * new object if 'op' was merged with other object
1241 * NULL if 'op' was destroyed 1120 * NULL if 'op' was destroyed
1242 * just 'op' otherwise 1121 * just 'op' otherwise
1243 */ 1122 */
1244
1245object * 1123object *
1246insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1247{ 1125{
1248 object *tmp, *top, *floor = NULL; 1126 object *tmp, *top, *floor = NULL;
1249 sint16 x, y; 1127 sint16 x, y;
… …
1252 { 1130 {
1253 LOG (llevError, "Trying to insert freed object!\n"); 1131 LOG (llevError, "Trying to insert freed object!\n");
1254 return NULL; 1132 return NULL;
1255 } 1133 }
1256 1134
1257 if (m == NULL) 1135 if (!m)
1258 { 1136 {
1259 char *dump = dump_object (op); 1137 char *dump = dump_object (op);
1260 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1261 free (dump); 1139 free (dump);
1262 return op; 1140 return op;
… …
1283 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1161 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1284 free (dump); 1162 free (dump);
1285 return op; 1163 return op;
1286 } 1164 }
1287 1165
1288 if (op->more != NULL) 1166 if (op->more)
1289 { 1167 {
1290 /* The part may be on a different map. */ 1168 /* The part may be on a different map. */
1291 1169
1292 object *more = op->more; 1170 object *more = op->more;
1293 1171
1294 /* We really need the caller to normalize coordinates - if 1172 /* We really need the caller to normalise coordinates - if
1295 * we set the map, that doesn't work if the location is within 1173 * we set the map, that doesn't work if the location is within
1296 * a map and this is straddling an edge. So only if coordinate 1174 * a map and this is straddling an edge. So only if coordinate
1297 * is clear wrong do we normalize it. 1175 * is clear wrong do we normalise it.
1298 */ 1176 */
1299 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1300 more->map = get_map_from_coord (m, &more->x, &more->y); 1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1301 else if (!more->map) 1179 else if (!more->map)
1302 { 1180 {
… …
1309 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1187 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1310 { 1188 {
1311 if (!op->head) 1189 if (!op->head)
1312 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1190 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1313 1191
1314 return NULL; 1192 return 0;
1315 } 1193 }
1316 } 1194 }
1317 1195
1318 CLEAR_FLAG (op, FLAG_REMOVED); 1196 CLEAR_FLAG (op, FLAG_REMOVED);
1319 1197
… …
1326 y = op->y; 1204 y = op->y;
1327 1205
1328 /* this has to be done after we translate the coordinates. 1206 /* this has to be done after we translate the coordinates.
1329 */ 1207 */
1330 if (op->nrof && !(flag & INS_NO_MERGE)) 1208 if (op->nrof && !(flag & INS_NO_MERGE))
1331 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1332 if (object::can_merge (op, tmp)) 1210 if (object::can_merge (op, tmp))
1333 { 1211 {
1334 op->nrof += tmp->nrof; 1212 op->nrof += tmp->nrof;
1335 tmp->destroy (); 1213 tmp->destroy ();
1336 } 1214 }
… …
1353 op->below = originator->below; 1231 op->below = originator->below;
1354 1232
1355 if (op->below) 1233 if (op->below)
1356 op->below->above = op; 1234 op->below->above = op;
1357 else 1235 else
1358 SET_MAP_OB (op->map, op->x, op->y, op); 1236 op->ms ().bot = op;
1359 1237
1360 /* since *below* originator, no need to update top */ 1238 /* since *below* originator, no need to update top */
1361 originator->below = op; 1239 originator->below = op;
1362 } 1240 }
1363 else 1241 else
1364 { 1242 {
1365 /* If there are other objects, then */ 1243 /* If there are other objects, then */
1366 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1367 { 1245 {
1368 object *last = NULL; 1246 object *last = 0;
1369 1247
1370 /* 1248 /*
1371 * If there are multiple objects on this space, we do some trickier handling. 1249 * If there are multiple objects on this space, we do some trickier handling.
1372 * We've already dealt with merging if appropriate. 1250 * We've already dealt with merging if appropriate.
1373 * Generally, we want to put the new object on top. But if 1251 * Generally, we want to put the new object on top. But if
… …
1377 * once we get to them. This reduces the need to traverse over all of 1255 * once we get to them. This reduces the need to traverse over all of
1378 * them when adding another one - this saves quite a bit of cpu time 1256 * them when adding another one - this saves quite a bit of cpu time
1379 * when lots of spells are cast in one area. Currently, it is presumed 1257 * when lots of spells are cast in one area. Currently, it is presumed
1380 * that flying non pickable objects are spell objects. 1258 * that flying non pickable objects are spell objects.
1381 */ 1259 */
1382
1383 while (top != NULL) 1260 while (top)
1384 { 1261 {
1385 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1262 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1386 floor = top; 1263 floor = top;
1387 1264
1388 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1265 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1409 * If INS_ON_TOP is used, don't do this processing 1286 * If INS_ON_TOP is used, don't do this processing
1410 * Need to find the object that in fact blocks view, otherwise 1287 * Need to find the object that in fact blocks view, otherwise
1411 * stacking is a bit odd. 1288 * stacking is a bit odd.
1412 */ 1289 */
1413 if (!(flag & INS_ON_TOP) && 1290 if (!(flag & INS_ON_TOP) &&
1414 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1291 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1415 { 1292 {
1416 for (last = top; last != floor; last = last->below) 1293 for (last = top; last != floor; last = last->below)
1417 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418 break; 1295 break;
1419 /* Check to see if we found the object that blocks view, 1296 /* Check to see if we found the object that blocks view,
… …
1441 op->above = GET_MAP_OB (op->map, op->x, op->y); 1318 op->above = GET_MAP_OB (op->map, op->x, op->y);
1442 1319
1443 if (op->above) 1320 if (op->above)
1444 op->above->below = op; 1321 op->above->below = op;
1445 1322
1446 op->below = NULL; 1323 op->below = 0;
1447 SET_MAP_OB (op->map, op->x, op->y, op); 1324 op->ms ().bot = op;
1448 } 1325 }
1449 else 1326 else
1450 { /* get inserted into the stack above top */ 1327 { /* get inserted into the stack above top */
1451 op->above = top->above; 1328 op->above = top->above;
1452 1329
… …
1455 1332
1456 op->below = top; 1333 op->below = top;
1457 top->above = op; 1334 top->above = op;
1458 } 1335 }
1459 1336
1460 if (op->above == NULL) 1337 if (!op->above)
1461 SET_MAP_TOP (op->map, op->x, op->y, op); 1338 op->ms ().top = op;
1462 } /* else not INS_BELOW_ORIGINATOR */ 1339 } /* else not INS_BELOW_ORIGINATOR */
1463 1340
1464 if (op->type == PLAYER) 1341 if (op->type == PLAYER)
1342 {
1465 op->contr->do_los = 1; 1343 op->contr->do_los = 1;
1344 ++op->map->players;
1345 op->map->touch ();
1346 }
1347
1348 op->map->dirty = true;
1466 1349
1467 /* If we have a floor, we know the player, if any, will be above 1350 /* If we have a floor, we know the player, if any, will be above
1468 * it, so save a few ticks and start from there. 1351 * it, so save a few ticks and start from there.
1469 */ 1352 */
1470 if (!(flag & INS_MAP_LOAD)) 1353 if (!(flag & INS_MAP_LOAD))
1471 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1354 if (object *pl = op->ms ().player ())
1472 if (tmp->type == PLAYER) 1355 if (pl->contr->ns)
1473 tmp->contr->socket->floorbox_update (); 1356 pl->contr->ns->floorbox_update ();
1474 1357
1475 /* If this object glows, it may affect lighting conditions that are 1358 /* If this object glows, it may affect lighting conditions that are
1476 * visible to others on this map. But update_all_los is really 1359 * visible to others on this map. But update_all_los is really
1477 * an inefficient way to do this, as it means los for all players 1360 * an inefficient way to do this, as it means los for all players
1478 * on the map will get recalculated. The players could very well 1361 * on the map will get recalculated. The players could very well
1479 * be far away from this change and not affected in any way - 1362 * be far away from this change and not affected in any way -
1480 * this should get redone to only look for players within range, 1363 * this should get redone to only look for players within range,
1481 * or just updating the P_NEED_UPDATE for spaces within this area 1364 * or just updating the P_UPTODATE for spaces within this area
1482 * of effect may be sufficient. 1365 * of effect may be sufficient.
1483 */ 1366 */
1484 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1367 if (op->map->darkness && (op->glow_radius != 0))
1485 update_all_los (op->map, op->x, op->y); 1368 update_all_los (op->map, op->x, op->y);
1486 1369
1487 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1370 /* updates flags (blocked, alive, no magic, etc) for this map space */
1488 update_object (op, UP_OBJ_INSERT); 1371 update_object (op, UP_OBJ_INSERT);
1372
1373 INVOKE_OBJECT (INSERT, op);
1489 1374
1490 /* Don't know if moving this to the end will break anything. However, 1375 /* Don't know if moving this to the end will break anything. However,
1491 * we want to have floorbox_update called before calling this. 1376 * we want to have floorbox_update called before calling this.
1492 * 1377 *
1493 * check_move_on() must be after this because code called from 1378 * check_move_on() must be after this because code called from
… …
1498 1383
1499 /* if this is not the head or flag has been passed, don't check walk on status */ 1384 /* if this is not the head or flag has been passed, don't check walk on status */
1500 if (!(flag & INS_NO_WALK_ON) && !op->head) 1385 if (!(flag & INS_NO_WALK_ON) && !op->head)
1501 { 1386 {
1502 if (check_move_on (op, originator)) 1387 if (check_move_on (op, originator))
1503 return NULL; 1388 return 0;
1504 1389
1505 /* If we are a multi part object, lets work our way through the check 1390 /* If we are a multi part object, lets work our way through the check
1506 * walk on's. 1391 * walk on's.
1507 */ 1392 */
1508 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1393 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1509 if (check_move_on (tmp, originator)) 1394 if (check_move_on (tmp, originator))
1510 return NULL; 1395 return 0;
1511 } 1396 }
1512 1397
1513 return op; 1398 return op;
1514} 1399}
1515 1400
1516/* this function inserts an object in the map, but if it 1401/* this function inserts an object in the map, but if it
1517 * finds an object of its own type, it'll remove that one first. 1402 * finds an object of its own type, it'll remove that one first.
1518 * op is the object to insert it under: supplies x and the map. 1403 * op is the object to insert it under: supplies x and the map.
1519 */ 1404 */
1520void 1405void
1521replace_insert_ob_in_map (const char *arch_string, object *op) 1406replace_insert_ob_in_map (const char *arch_string, object *op)
1522{ 1407{
1523 object * 1408 object *tmp, *tmp1;
1524 tmp;
1525 object *
1526 tmp1;
1527 1409
1528 /* first search for itself and remove any old instances */ 1410 /* first search for itself and remove any old instances */
1529 1411
1530 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1412 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1531 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1413 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1532 tmp->destroy (); 1414 tmp->destroy ();
1533 1415
1534 tmp1 = arch_to_object (archetype::find (arch_string)); 1416 tmp1 = arch_to_object (archetype::find (arch_string));
1535 1417
1536 tmp1->x = op->x; 1418 tmp1->x = op->x;
1537 tmp1->y = op->y; 1419 tmp1->y = op->y;
1538 insert_ob_in_map (tmp1, op->map, op, 0); 1420 insert_ob_in_map (tmp1, op->map, op, 0);
1421}
1422
1423object *
1424object::insert_at (object *where, object *originator, int flags)
1425{
1426 where->map->insert (this, where->x, where->y, originator, flags);
1539} 1427}
1540 1428
1541/* 1429/*
1542 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1430 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1543 * is returned contains nr objects, and the remaining parts contains 1431 * is returned contains nr objects, and the remaining parts contains
1544 * the rest (or is removed and freed if that number is 0). 1432 * the rest (or is removed and freed if that number is 0).
1545 * On failure, NULL is returned, and the reason put into the 1433 * On failure, NULL is returned, and the reason put into the
1546 * global static errmsg array. 1434 * global static errmsg array.
1547 */ 1435 */
1548
1549object * 1436object *
1550get_split_ob (object *orig_ob, uint32 nr) 1437get_split_ob (object *orig_ob, uint32 nr)
1551{ 1438{
1552 object *newob; 1439 object *newob;
1553 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1440 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1589 1476
1590object * 1477object *
1591decrease_ob_nr (object *op, uint32 i) 1478decrease_ob_nr (object *op, uint32 i)
1592{ 1479{
1593 object *tmp; 1480 object *tmp;
1594 player *pl;
1595 1481
1596 if (i == 0) /* objects with op->nrof require this check */ 1482 if (i == 0) /* objects with op->nrof require this check */
1597 return op; 1483 return op;
1598 1484
1599 if (i > op->nrof) 1485 if (i > op->nrof)
… …
1612 * IMO, searching through all the players will mostly 1498 * IMO, searching through all the players will mostly
1613 * likely be quicker than following op->env to the map, 1499 * likely be quicker than following op->env to the map,
1614 * and then searching the map for a player. 1500 * and then searching the map for a player.
1615 */ 1501 */
1616 if (!tmp) 1502 if (!tmp)
1617 { 1503 for_all_players (pl)
1618 for (pl = first_player; pl; pl = pl->next)
1619 if (pl->ob->container == op->env) 1504 if (pl->ob->container == op->env)
1620 { 1505 {
1621 tmp = pl->ob; 1506 tmp = pl->ob;
1622 break; 1507 break;
1623 } 1508 }
1624 }
1625 1509
1626 if (i < op->nrof) 1510 if (i < op->nrof)
1627 { 1511 {
1628 sub_weight (op->env, op->weight * i); 1512 sub_weight (op->env, op->weight * i);
1629 op->nrof -= i; 1513 op->nrof -= i;
… …
1765 add_weight (this, (op->weight + op->carrying)); 1649 add_weight (this, (op->weight + op->carrying));
1766 1650
1767 otmp = this->in_player (); 1651 otmp = this->in_player ();
1768 if (otmp && otmp->contr) 1652 if (otmp && otmp->contr)
1769 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1653 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1770 fix_player (otmp); 1654 otmp->update_stats ();
1771 1655
1772 op->map = 0; 1656 op->map = 0;
1773 op->env = this; 1657 op->env = this;
1774 op->above = 0; 1658 op->above = 0;
1775 op->below = 0; 1659 op->below = 0;
… …
1779 if ((op->glow_radius != 0) && map) 1663 if ((op->glow_radius != 0) && map)
1780 { 1664 {
1781#ifdef DEBUG_LIGHTS 1665#ifdef DEBUG_LIGHTS
1782 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1666 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1783#endif /* DEBUG_LIGHTS */ 1667#endif /* DEBUG_LIGHTS */
1784 if (MAP_DARKNESS (map)) 1668 if (map->darkness)
1785 update_all_los (map, x, y); 1669 update_all_los (map, x, y);
1786 } 1670 }
1787 1671
1788 /* Client has no idea of ordering so lets not bother ordering it here. 1672 /* Client has no idea of ordering so lets not bother ordering it here.
1789 * It sure simplifies this function... 1673 * It sure simplifies this function...
… …
1794 { 1678 {
1795 op->below = inv; 1679 op->below = inv;
1796 op->below->above = op; 1680 op->below->above = op;
1797 inv = op; 1681 inv = op;
1798 } 1682 }
1683
1684 INVOKE_OBJECT (INSERT, this);
1799 1685
1800 return op; 1686 return op;
1801} 1687}
1802 1688
1803/* 1689/*
… …
1818 * 1704 *
1819 * MSW 2001-07-08: Check all objects on space, not just those below 1705 * MSW 2001-07-08: Check all objects on space, not just those below
1820 * object being inserted. insert_ob_in_map may not put new objects 1706 * object being inserted. insert_ob_in_map may not put new objects
1821 * on top. 1707 * on top.
1822 */ 1708 */
1823
1824int 1709int
1825check_move_on (object *op, object *originator) 1710check_move_on (object *op, object *originator)
1826{ 1711{
1827 object *tmp; 1712 object *tmp;
1828 maptile *m = op->map; 1713 maptile *m = op->map;
… …
1855 1740
1856 /* The objects have to be checked from top to bottom. 1741 /* The objects have to be checked from top to bottom.
1857 * Hence, we first go to the top: 1742 * Hence, we first go to the top:
1858 */ 1743 */
1859 1744
1860 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1745 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1861 { 1746 {
1862 /* Trim the search when we find the first other spell effect 1747 /* Trim the search when we find the first other spell effect
1863 * this helps performance so that if a space has 50 spell objects, 1748 * this helps performance so that if a space has 50 spell objects,
1864 * we don't need to check all of them. 1749 * we don't need to check all of them.
1865 */ 1750 */
… …
1920/* 1805/*
1921 * present_arch(arch, map, x, y) searches for any objects with 1806 * present_arch(arch, map, x, y) searches for any objects with
1922 * a matching archetype at the given map and coordinates. 1807 * a matching archetype at the given map and coordinates.
1923 * The first matching object is returned, or NULL if none. 1808 * The first matching object is returned, or NULL if none.
1924 */ 1809 */
1925
1926object * 1810object *
1927present_arch (const archetype *at, maptile *m, int x, int y) 1811present_arch (const archetype *at, maptile *m, int x, int y)
1928{ 1812{
1929 object *
1930 tmp;
1931
1932 if (m == NULL || out_of_map (m, x, y)) 1813 if (!m || out_of_map (m, x, y))
1933 { 1814 {
1934 LOG (llevError, "Present_arch called outside map.\n"); 1815 LOG (llevError, "Present_arch called outside map.\n");
1935 return NULL; 1816 return NULL;
1936 } 1817 }
1937 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1818
1819 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1938 if (tmp->arch == at) 1820 if (tmp->arch == at)
1939 return tmp; 1821 return tmp;
1822
1940 return NULL; 1823 return NULL;
1941} 1824}
1942 1825
1943/* 1826/*
1944 * present(type, map, x, y) searches for any objects with 1827 * present(type, map, x, y) searches for any objects with
1945 * a matching type variable at the given map and coordinates. 1828 * a matching type variable at the given map and coordinates.
1946 * The first matching object is returned, or NULL if none. 1829 * The first matching object is returned, or NULL if none.
1947 */ 1830 */
1948
1949object * 1831object *
1950present (unsigned char type, maptile *m, int x, int y) 1832present (unsigned char type, maptile *m, int x, int y)
1951{ 1833{
1952 object *
1953 tmp;
1954
1955 if (out_of_map (m, x, y)) 1834 if (out_of_map (m, x, y))
1956 { 1835 {
1957 LOG (llevError, "Present called outside map.\n"); 1836 LOG (llevError, "Present called outside map.\n");
1958 return NULL; 1837 return NULL;
1959 } 1838 }
1960 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1839
1840 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1961 if (tmp->type == type) 1841 if (tmp->type == type)
1962 return tmp; 1842 return tmp;
1843
1963 return NULL; 1844 return NULL;
1964} 1845}
1965 1846
1966/* 1847/*
1967 * present_in_ob(type, object) searches for any objects with 1848 * present_in_ob(type, object) searches for any objects with
1968 * a matching type variable in the inventory of the given object. 1849 * a matching type variable in the inventory of the given object.
1969 * The first matching object is returned, or NULL if none. 1850 * The first matching object is returned, or NULL if none.
1970 */ 1851 */
1971
1972object * 1852object *
1973present_in_ob (unsigned char type, const object *op) 1853present_in_ob (unsigned char type, const object *op)
1974{ 1854{
1975 object *
1976 tmp;
1977
1978 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1855 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1979 if (tmp->type == type) 1856 if (tmp->type == type)
1980 return tmp; 1857 return tmp;
1858
1981 return NULL; 1859 return NULL;
1982} 1860}
1983 1861
1984/* 1862/*
1985 * present_in_ob (type, str, object) searches for any objects with 1863 * present_in_ob (type, str, object) searches for any objects with
… …
1993 * str is the string to match against. Note that we match against 1871 * str is the string to match against. Note that we match against
1994 * the object name, not the archetype name. this is so that the 1872 * the object name, not the archetype name. this is so that the
1995 * spell code can use one object type (force), but change it's name 1873 * spell code can use one object type (force), but change it's name
1996 * to be unique. 1874 * to be unique.
1997 */ 1875 */
1998
1999object * 1876object *
2000present_in_ob_by_name (int type, const char *str, const object *op) 1877present_in_ob_by_name (int type, const char *str, const object *op)
2001{ 1878{
2002 object *
2003 tmp;
2004
2005 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1879 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006 {
2007 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1880 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2008 return tmp; 1881 return tmp;
2009 } 1882
2010 return NULL; 1883 return 0;
2011} 1884}
2012 1885
2013/* 1886/*
2014 * present_arch_in_ob(archetype, object) searches for any objects with 1887 * present_arch_in_ob(archetype, object) searches for any objects with
2015 * a matching archetype in the inventory of the given object. 1888 * a matching archetype in the inventory of the given object.
2016 * The first matching object is returned, or NULL if none. 1889 * The first matching object is returned, or NULL if none.
2017 */ 1890 */
2018
2019object * 1891object *
2020present_arch_in_ob (const archetype *at, const object *op) 1892present_arch_in_ob (const archetype *at, const object *op)
2021{ 1893{
2022 object *
2023 tmp;
2024
2025 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1894 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2026 if (tmp->arch == at) 1895 if (tmp->arch == at)
2027 return tmp; 1896 return tmp;
1897
2028 return NULL; 1898 return NULL;
2029} 1899}
2030 1900
2031/* 1901/*
2032 * activate recursively a flag on an object inventory 1902 * activate recursively a flag on an object inventory
2033 */ 1903 */
2034void 1904void
2035flag_inv (object *op, int flag) 1905flag_inv (object *op, int flag)
2036{ 1906{
2037 object *
2038 tmp;
2039
2040 if (op->inv) 1907 if (op->inv)
2041 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1908 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2042 { 1909 {
2043 SET_FLAG (tmp, flag); 1910 SET_FLAG (tmp, flag);
2044 flag_inv (tmp, flag); 1911 flag_inv (tmp, flag);
2045 } 1912 }
2046} /* 1913}
1914
1915/*
2047 * desactivate recursively a flag on an object inventory 1916 * deactivate recursively a flag on an object inventory
2048 */ 1917 */
2049void 1918void
2050unflag_inv (object *op, int flag) 1919unflag_inv (object *op, int flag)
2051{ 1920{
2052 object *
2053 tmp;
2054
2055 if (op->inv) 1921 if (op->inv)
2056 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1922 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2057 { 1923 {
2058 CLEAR_FLAG (tmp, flag); 1924 CLEAR_FLAG (tmp, flag);
2059 unflag_inv (tmp, flag); 1925 unflag_inv (tmp, flag);
2060 } 1926 }
2061} 1927}
… …
2064 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1930 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2065 * all it's inventory (recursively). 1931 * all it's inventory (recursively).
2066 * If checksums are used, a player will get set_cheat called for 1932 * If checksums are used, a player will get set_cheat called for
2067 * him/her-self and all object carried by a call to this function. 1933 * him/her-self and all object carried by a call to this function.
2068 */ 1934 */
2069
2070void 1935void
2071set_cheat (object *op) 1936set_cheat (object *op)
2072{ 1937{
2073 SET_FLAG (op, FLAG_WAS_WIZ); 1938 SET_FLAG (op, FLAG_WAS_WIZ);
2074 flag_inv (op, FLAG_WAS_WIZ); 1939 flag_inv (op, FLAG_WAS_WIZ);
… …
2093 * because arch_blocked (now ob_blocked) needs to know the movement type 1958 * because arch_blocked (now ob_blocked) needs to know the movement type
2094 * to know if the space in question will block the object. We can't use 1959 * to know if the space in question will block the object. We can't use
2095 * the archetype because that isn't correct if the monster has been 1960 * the archetype because that isn't correct if the monster has been
2096 * customized, changed states, etc. 1961 * customized, changed states, etc.
2097 */ 1962 */
2098
2099int 1963int
2100find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1964find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2101{ 1965{
2102 int
2103 i,
2104 index = 0, flag; 1966 int index = 0, flag;
2105 static int
2106 altern[SIZEOFFREE]; 1967 int altern[SIZEOFFREE];
2107 1968
2108 for (i = start; i < stop; i++) 1969 for (int i = start; i < stop; i++)
2109 { 1970 {
2110 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1971 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2111 if (!flag) 1972 if (!flag)
2112 altern[index++] = i; 1973 altern [index++] = i;
2113 1974
2114 /* Basically, if we find a wall on a space, we cut down the search size. 1975 /* Basically, if we find a wall on a space, we cut down the search size.
2115 * In this way, we won't return spaces that are on another side of a wall. 1976 * In this way, we won't return spaces that are on another side of a wall.
2116 * This mostly work, but it cuts down the search size in all directions - 1977 * This mostly work, but it cuts down the search size in all directions -
2117 * if the space being examined only has a wall to the north and empty 1978 * if the space being examined only has a wall to the north and empty
… …
2133 * find_first_free_spot(archetype, maptile, x, y) works like 1994 * find_first_free_spot(archetype, maptile, x, y) works like
2134 * find_free_spot(), but it will search max number of squares. 1995 * find_free_spot(), but it will search max number of squares.
2135 * But it will return the first available spot, not a random choice. 1996 * But it will return the first available spot, not a random choice.
2136 * Changed 0.93.2: Have it return -1 if there is no free spot available. 1997 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2137 */ 1998 */
2138
2139int 1999int
2140find_first_free_spot (const object *ob, maptile *m, int x, int y) 2000find_first_free_spot (const object *ob, maptile *m, int x, int y)
2141{ 2001{
2142 int
2143 i;
2144
2145 for (i = 0; i < SIZEOFFREE; i++) 2002 for (int i = 0; i < SIZEOFFREE; i++)
2146 {
2147 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2003 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2148 return i; 2004 return i;
2149 } 2005
2150 return -1; 2006 return -1;
2151} 2007}
2152 2008
2153/* 2009/*
2154 * The function permute(arr, begin, end) randomly reorders the array 2010 * The function permute(arr, begin, end) randomly reorders the array
2155 * arr[begin..end-1]. 2011 * arr[begin..end-1].
2012 * now uses a fisher-yates shuffle, old permute was broken
2156 */ 2013 */
2157static void 2014static void
2158permute (int *arr, int begin, int end) 2015permute (int *arr, int begin, int end)
2159{ 2016{
2160 int 2017 arr += begin;
2161 i,
2162 j,
2163 tmp,
2164 len;
2165
2166 len = end - begin; 2018 end -= begin;
2167 for (i = begin; i < end; i++)
2168 {
2169 j = begin + RANDOM () % len;
2170 2019
2171 tmp = arr[i]; 2020 while (--end)
2172 arr[i] = arr[j]; 2021 swap (arr [end], arr [RANDOM () % (end + 1)]);
2173 arr[j] = tmp;
2174 }
2175} 2022}
2176 2023
2177/* new function to make monster searching more efficient, and effective! 2024/* new function to make monster searching more efficient, and effective!
2178 * This basically returns a randomized array (in the passed pointer) of 2025 * This basically returns a randomized array (in the passed pointer) of
2179 * the spaces to find monsters. In this way, it won't always look for 2026 * the spaces to find monsters. In this way, it won't always look for
… …
2182 * the 3x3 area will be searched, just not in a predictable order. 2029 * the 3x3 area will be searched, just not in a predictable order.
2183 */ 2030 */
2184void 2031void
2185get_search_arr (int *search_arr) 2032get_search_arr (int *search_arr)
2186{ 2033{
2187 int 2034 int i;
2188 i;
2189 2035
2190 for (i = 0; i < SIZEOFFREE; i++) 2036 for (i = 0; i < SIZEOFFREE; i++)
2191 {
2192 search_arr[i] = i; 2037 search_arr[i] = i;
2193 }
2194 2038
2195 permute (search_arr, 1, SIZEOFFREE1 + 1); 2039 permute (search_arr, 1, SIZEOFFREE1 + 1);
2196 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2040 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2197 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2041 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2198} 2042}
… …
2207 * Perhaps incorrectly, but I'm making the assumption that exclude 2051 * Perhaps incorrectly, but I'm making the assumption that exclude
2208 * is actually want is going to try and move there. We need this info 2052 * is actually want is going to try and move there. We need this info
2209 * because we have to know what movement the thing looking to move 2053 * because we have to know what movement the thing looking to move
2210 * there is capable of. 2054 * there is capable of.
2211 */ 2055 */
2212
2213int 2056int
2214find_dir (maptile *m, int x, int y, object *exclude) 2057find_dir (maptile *m, int x, int y, object *exclude)
2215{ 2058{
2216 int
2217 i,
2218 max = SIZEOFFREE, mflags; 2059 int i, max = SIZEOFFREE, mflags;
2219 2060
2220 sint16 nx, ny; 2061 sint16 nx, ny;
2221 object * 2062 object *tmp;
2222 tmp;
2223 maptile * 2063 maptile *mp;
2224 mp;
2225 2064
2226 MoveType blocked, move_type; 2065 MoveType blocked, move_type;
2227 2066
2228 if (exclude && exclude->head) 2067 if (exclude && exclude->head)
2229 { 2068 {
… …
2241 mp = m; 2080 mp = m;
2242 nx = x + freearr_x[i]; 2081 nx = x + freearr_x[i];
2243 ny = y + freearr_y[i]; 2082 ny = y + freearr_y[i];
2244 2083
2245 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2084 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2085
2246 if (mflags & P_OUT_OF_MAP) 2086 if (mflags & P_OUT_OF_MAP)
2247 {
2248 max = maxfree[i]; 2087 max = maxfree[i];
2249 }
2250 else 2088 else
2251 { 2089 {
2252 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2090 mapspace &ms = mp->at (nx, ny);
2091
2092 blocked = ms.move_block;
2253 2093
2254 if ((move_type & blocked) == move_type) 2094 if ((move_type & blocked) == move_type)
2255 {
2256 max = maxfree[i]; 2095 max = maxfree[i];
2257 }
2258 else if (mflags & P_IS_ALIVE) 2096 else if (mflags & P_IS_ALIVE)
2259 { 2097 {
2260 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2098 for (tmp = ms.bot; tmp; tmp = tmp->above)
2261 { 2099 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2262 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2100 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2263 {
2264 break; 2101 break;
2265 } 2102
2266 }
2267 if (tmp) 2103 if (tmp)
2268 {
2269 return freedir[i]; 2104 return freedir[i];
2270 }
2271 } 2105 }
2272 } 2106 }
2273 } 2107 }
2108
2274 return 0; 2109 return 0;
2275} 2110}
2276 2111
2277/* 2112/*
2278 * distance(object 1, object 2) will return the square of the 2113 * distance(object 1, object 2) will return the square of the
2279 * distance between the two given objects. 2114 * distance between the two given objects.
2280 */ 2115 */
2281
2282int 2116int
2283distance (const object *ob1, const object *ob2) 2117distance (const object *ob1, const object *ob2)
2284{ 2118{
2285 int
2286 i;
2287
2288 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2119 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2289 return i;
2290} 2120}
2291 2121
2292/* 2122/*
2293 * find_dir_2(delta-x,delta-y) will return a direction in which 2123 * find_dir_2(delta-x,delta-y) will return a direction in which
2294 * an object which has subtracted the x and y coordinates of another 2124 * an object which has subtracted the x and y coordinates of another
2295 * object, needs to travel toward it. 2125 * object, needs to travel toward it.
2296 */ 2126 */
2297
2298int 2127int
2299find_dir_2 (int x, int y) 2128find_dir_2 (int x, int y)
2300{ 2129{
2301 int 2130 int q;
2302 q;
2303 2131
2304 if (y) 2132 if (y)
2305 q = x * 100 / y; 2133 q = x * 100 / y;
2306 else if (x) 2134 else if (x)
2307 q = -300 * x; 2135 q = -300 * x;
… …
2342int 2170int
2343absdir (int d) 2171absdir (int d)
2344{ 2172{
2345 while (d < 1) 2173 while (d < 1)
2346 d += 8; 2174 d += 8;
2175
2347 while (d > 8) 2176 while (d > 8)
2348 d -= 8; 2177 d -= 8;
2178
2349 return d; 2179 return d;
2350} 2180}
2351 2181
2352/* 2182/*
2353 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2355 */ 2185 */
2356 2186
2357int 2187int
2358dirdiff (int dir1, int dir2) 2188dirdiff (int dir1, int dir2)
2359{ 2189{
2360 int 2190 int d;
2361 d;
2362 2191
2363 d = abs (dir1 - dir2); 2192 d = abs (dir1 - dir2);
2364 if (d > 4) 2193 if (d > 4)
2365 d = 8 - d; 2194 d = 8 - d;
2195
2366 return d; 2196 return d;
2367} 2197}
2368 2198
2369/* peterm: 2199/* peterm:
2370 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2200 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2373 * This basically means that if direction is 15, then it could either go 2203 * This basically means that if direction is 15, then it could either go
2374 * direction 4, 14, or 16 to get back to where we are. 2204 * direction 4, 14, or 16 to get back to where we are.
2375 * Moved from spell_util.c to object.c with the other related direction 2205 * Moved from spell_util.c to object.c with the other related direction
2376 * functions. 2206 * functions.
2377 */ 2207 */
2378
2379int
2380 reduction_dir[SIZEOFFREE][3] = { 2208int reduction_dir[SIZEOFFREE][3] = {
2381 {0, 0, 0}, /* 0 */ 2209 {0, 0, 0}, /* 0 */
2382 {0, 0, 0}, /* 1 */ 2210 {0, 0, 0}, /* 1 */
2383 {0, 0, 0}, /* 2 */ 2211 {0, 0, 0}, /* 2 */
2384 {0, 0, 0}, /* 3 */ 2212 {0, 0, 0}, /* 3 */
2385 {0, 0, 0}, /* 4 */ 2213 {0, 0, 0}, /* 4 */
… …
2433 * find a path to that monster that we found. If not, 2261 * find a path to that monster that we found. If not,
2434 * we don't bother going toward it. Returns 1 if we 2262 * we don't bother going toward it. Returns 1 if we
2435 * can see a direct way to get it 2263 * can see a direct way to get it
2436 * Modified to be map tile aware -.MSW 2264 * Modified to be map tile aware -.MSW
2437 */ 2265 */
2438
2439
2440int 2266int
2441can_see_monsterP (maptile *m, int x, int y, int dir) 2267can_see_monsterP (maptile *m, int x, int y, int dir)
2442{ 2268{
2443 sint16 dx, dy; 2269 sint16 dx, dy;
2444 int
2445 mflags; 2270 int mflags;
2446 2271
2447 if (dir < 0) 2272 if (dir < 0)
2448 return 0; /* exit condition: invalid direction */ 2273 return 0; /* exit condition: invalid direction */
2449 2274
2450 dx = x + freearr_x[dir]; 2275 dx = x + freearr_x[dir];
… …
2463 return 0; 2288 return 0;
2464 2289
2465 /* yes, can see. */ 2290 /* yes, can see. */
2466 if (dir < 9) 2291 if (dir < 9)
2467 return 1; 2292 return 1;
2293
2468 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2294 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2469 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2295 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2296 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2470} 2297}
2471
2472
2473 2298
2474/* 2299/*
2475 * can_pick(picker, item): finds out if an object is possible to be 2300 * can_pick(picker, item): finds out if an object is possible to be
2476 * picked up by the picker. Returnes 1 if it can be 2301 * picked up by the picker. Returnes 1 if it can be
2477 * picked up, otherwise 0. 2302 * picked up, otherwise 0.
… …
2488 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2313 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2489 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2314 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2490 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2315 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2491} 2316}
2492 2317
2493
2494/* 2318/*
2495 * create clone from object to another 2319 * create clone from object to another
2496 */ 2320 */
2497object * 2321object *
2498object_create_clone (object *asrc) 2322object_create_clone (object *asrc)
… …
2517 { 2341 {
2518 dst = tmp; 2342 dst = tmp;
2519 tmp->head = 0; 2343 tmp->head = 0;
2520 } 2344 }
2521 else 2345 else
2522 {
2523 tmp->head = dst; 2346 tmp->head = dst;
2524 }
2525 2347
2526 tmp->more = 0; 2348 tmp->more = 0;
2527 2349
2528 if (prev) 2350 if (prev)
2529 prev->more = tmp; 2351 prev->more = tmp;
… …
2541/* Basically, we save the content of the string to a temp file, then call */ 2363/* Basically, we save the content of the string to a temp file, then call */
2542/* load_object on it. I admit it is a highly inefficient way to make things, */ 2364/* load_object on it. I admit it is a highly inefficient way to make things, */
2543/* but it was simple to make and allows reusing the load_object function. */ 2365/* but it was simple to make and allows reusing the load_object function. */
2544/* Remember not to use load_object_str in a time-critical situation. */ 2366/* Remember not to use load_object_str in a time-critical situation. */
2545/* Also remember that multiparts objects are not supported for now. */ 2367/* Also remember that multiparts objects are not supported for now. */
2546
2547object * 2368object *
2548load_object_str (const char *obstr) 2369load_object_str (const char *obstr)
2549{ 2370{
2550 object *op; 2371 object *op;
2551 char filename[MAX_BUF]; 2372 char filename[MAX_BUF];
… …
2581 * returns NULL if no match. 2402 * returns NULL if no match.
2582 */ 2403 */
2583object * 2404object *
2584find_obj_by_type_subtype (const object *who, int type, int subtype) 2405find_obj_by_type_subtype (const object *who, int type, int subtype)
2585{ 2406{
2586 object *tmp;
2587
2588 for (tmp = who->inv; tmp; tmp = tmp->below) 2407 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2589 if (tmp->type == type && tmp->subtype == subtype) 2408 if (tmp->type == type && tmp->subtype == subtype)
2590 return tmp; 2409 return tmp;
2591 2410
2592 return NULL; 2411 return 0;
2593} 2412}
2594 2413
2595/* If ob has a field named key, return the link from the list, 2414/* If ob has a field named key, return the link from the list,
2596 * otherwise return NULL. 2415 * otherwise return NULL.
2597 * 2416 *
… …
2599 * do the desired thing. 2418 * do the desired thing.
2600 */ 2419 */
2601key_value * 2420key_value *
2602get_ob_key_link (const object *ob, const char *key) 2421get_ob_key_link (const object *ob, const char *key)
2603{ 2422{
2604 key_value *link;
2605
2606 for (link = ob->key_values; link != NULL; link = link->next) 2423 for (key_value *link = ob->key_values; link; link = link->next)
2607 if (link->key == key) 2424 if (link->key == key)
2608 return link; 2425 return link;
2609 2426
2610 return NULL; 2427 return 0;
2611} 2428}
2612 2429
2613/* 2430/*
2614 * Returns the value of op has an extra_field for key, or NULL. 2431 * Returns the value of op has an extra_field for key, or NULL.
2615 * 2432 *
… …
2655 * Returns TRUE on success. 2472 * Returns TRUE on success.
2656 */ 2473 */
2657int 2474int
2658set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2475set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2659{ 2476{
2660 key_value *
2661 field = NULL, *last = NULL; 2477 key_value *field = NULL, *last = NULL;
2662 2478
2663 for (field = op->key_values; field != NULL; field = field->next) 2479 for (field = op->key_values; field != NULL; field = field->next)
2664 { 2480 {
2665 if (field->key != canonical_key) 2481 if (field->key != canonical_key)
2666 { 2482 {
… …
2694 /* IF we get here, key doesn't exist */ 2510 /* IF we get here, key doesn't exist */
2695 2511
2696 /* No field, we'll have to add it. */ 2512 /* No field, we'll have to add it. */
2697 2513
2698 if (!add_key) 2514 if (!add_key)
2699 {
2700 return FALSE; 2515 return FALSE;
2701 } 2516
2702 /* There isn't any good reason to store a null 2517 /* There isn't any good reason to store a null
2703 * value in the key/value list. If the archetype has 2518 * value in the key/value list. If the archetype has
2704 * this key, then we should also have it, so shouldn't 2519 * this key, then we should also have it, so shouldn't
2705 * be here. If user wants to store empty strings, 2520 * be here. If user wants to store empty strings,
2706 * should pass in "" 2521 * should pass in ""
… …
2755 } 2570 }
2756 else 2571 else
2757 item = item->env; 2572 item = item->env;
2758} 2573}
2759 2574
2575
2576const char *
2577object::flag_desc (char *desc, int len) const
2578{
2579 char *p = desc;
2580 bool first = true;
2581
2582 *p = 0;
2583
2584 for (int i = 0; i < NUM_FLAGS; i++)
2585 {
2586 if (len <= 10) // magic constant!
2587 {
2588 snprintf (p, len, ",...");
2589 break;
2590 }
2591
2592 if (flag [i])
2593 {
2594 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2595 len -= cnt;
2596 p += cnt;
2597 first = false;
2598 }
2599 }
2600
2601 return desc;
2602}
2603
2760// return a suitable string describing an objetc in enough detail to find it 2604// return a suitable string describing an object in enough detail to find it
2761const char * 2605const char *
2762object::debug_desc (char *info) const 2606object::debug_desc (char *info) const
2763{ 2607{
2608 char flagdesc[512];
2764 char info2[256 * 3]; 2609 char info2[256 * 4];
2765 char *p = info; 2610 char *p = info;
2766 2611
2767 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2768 count, 2613 count, uuid.seq,
2769 &name, 2614 &name,
2770 title ? " " : "", 2615 title ? "\",title:" : "",
2771 title ? (const char *)title : ""); 2616 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type);
2772 2618
2773 if (env) 2619 if (env)
2774 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2775 2621
2776 if (map) 2622 if (map)
2777 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2623 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2778 2624
2779 return info; 2625 return info;
2780} 2626}
2781 2627
2782const char * 2628const char *
2783object::debug_desc () const 2629object::debug_desc () const
2784{ 2630{
2785 static char info[256 * 3]; 2631 static char info[256 * 4];
2786 return debug_desc (info); 2632 return debug_desc (info);
2787} 2633}
2788 2634

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines