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.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.134 by pippijn, Thu Mar 1 12:28:16 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
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
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:
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
362char * 362char *
363dump_object (object *op) 363dump_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, 3); 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
397object * 396object *
398find_object (tag_t i) 397find_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
413object * 411object *
414find_object_name (const char *str) 412find_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}
467 } 465 }
468 466
469 op->key_values = 0; 467 op->key_values = 0;
470} 468}
471 469
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/* 470/*
515 * copy_to first frees everything allocated by the dst object, 471 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second 472 * and then copies the contents of itself into the second
517 * object, allocating what needs to be allocated. Basically, any 473 * object, allocating what needs to be allocated. Basically, any
518 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 474 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
524{ 480{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 481 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 482 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527 483
528 *(object_copy *)dst = *this; 484 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533 485
534 if (is_freed) 486 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED); 487 SET_FLAG (dst, FLAG_FREED);
536 488
537 if (is_removed) 489 if (is_removed)
538 SET_FLAG (dst, FLAG_REMOVED); 490 SET_FLAG (dst, FLAG_REMOVED);
539 491
540 if (speed < 0) 492 if (speed < 0)
541 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 493 dst->speed_left = speed_left - rndm ();
542 494
543 /* Copy over key_values, if any. */ 495 /* Copy over key_values, if any. */
544 if (key_values) 496 if (key_values)
545 { 497 {
546 key_value *tail = 0; 498 key_value *tail = 0;
568 tail = new_link; 520 tail = new_link;
569 } 521 }
570 } 522 }
571 } 523 }
572 524
573 update_ob_speed (dst); 525 dst->set_speed (dst->speed);
526}
527
528void
529object::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 ();
574} 544}
575 545
576object * 546object *
577object::clone () 547object::clone ()
578{ 548{
584/* 554/*
585 * 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
586 * 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
587 * 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.
588 */ 558 */
589
590void 559void
591update_turn_face (object *op) 560update_turn_face (object *op)
592{ 561{
593 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 562 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594 return; 563 return;
564
595 SET_ANIMATION (op, op->direction); 565 SET_ANIMATION (op, op->direction);
596 update_object (op, UP_OBJ_FACE); 566 update_object (op, UP_OBJ_FACE);
597} 567}
598 568
599/* 569/*
600 * Updates the speed of an object. If the speed changes from 0 to another 570 * 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. 571 * 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. 572 * This function needs to be called whenever the speed of an object changes.
603 */ 573 */
604void 574void
605update_ob_speed (object *op) 575object::set_speed (float speed)
606{ 576{
607 extern int arch_init; 577 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 { 578 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 579 LOG (llevError, "Object %s is freed but has speed.\n", &name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0; 580 speed = 0;
620#endif
621 }
622
623 if (arch_init)
624 return;
625
626 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627 { 581 }
628 /* If already on active list, don't do anything */
629 if (op->active_next || op->active_prev || op == active_objects)
630 return;
631 582
632 /* process_events() expects us to insert the object at the beginning 583 this->speed = speed;
633 * of the list. */
634 op->active_next = active_objects;
635 584
636 if (op->active_next != NULL) 585 if (has_active_speed ())
637 op->active_next->active_prev = op; 586 activate ();
638
639 active_objects = op;
640 }
641 else 587 else
642 { 588 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}
666
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} 589}
697 590
698/* 591/*
699 * update_object() updates the the map. 592 * update_object() updates the the map.
700 * It takes into account invisible objects (and represent squares covered 593 * It takes into account invisible objects (and represent squares covered
713 * UP_OBJ_FACE: only the objects face has changed. 606 * UP_OBJ_FACE: only the objects face has changed.
714 */ 607 */
715void 608void
716update_object (object *op, int action) 609update_object (object *op, int action)
717{ 610{
718 MoveType move_on, move_off, move_block, move_slow;
719
720 if (op == NULL) 611 if (op == NULL)
721 { 612 {
722 /* this should never happen */ 613 /* this should never happen */
723 LOG (llevDebug, "update_object() called for NULL object.\n"); 614 LOG (llevDebug, "update_object() called for NULL object.\n");
724 return; 615 return;
737 */ 628 */
738 if (!op->map || op->map->in_memory == MAP_SAVING) 629 if (!op->map || op->map->in_memory == MAP_SAVING)
739 return; 630 return;
740 631
741 /* make sure the object is within map boundaries */ 632 /* make sure the object is within map boundaries */
742 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 633 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743 { 634 {
744 LOG (llevError, "update_object() called for object out of map!\n"); 635 LOG (llevError, "update_object() called for object out of map!\n");
745#ifdef MANY_CORES 636#ifdef MANY_CORES
746 abort (); 637 abort ();
747#endif 638#endif
748 return; 639 return;
749 } 640 }
750 641
751 mapspace &m = op->map->at (op->x, op->y); 642 mapspace &m = op->ms ();
752 643
753 if (m.flags_ & P_NEED_UPDATE) 644 if (!(m.flags_ & P_UPTODATE))
754 /* nop */; 645 /* nop */;
755 else if (action == UP_OBJ_INSERT) 646 else if (action == UP_OBJ_INSERT)
756 { 647 {
757 // this is likely overkill, TODO: revisit (schmorp) 648 // this is likely overkill, TODO: revisit (schmorp)
758 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 649 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
767 /* 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
768 * to have move_allow right now. 659 * to have move_allow right now.
769 */ 660 */
770 || ((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
771 || 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)
772 m.flags_ = P_NEED_UPDATE; 663 m.flags_ = 0;
773 } 664 }
774 /* if the object is being removed, we can't make intelligent 665 /* if the object is being removed, we can't make intelligent
775 * decisions, because remove_ob can't really pass the object 666 * decisions, because remove_ob can't really pass the object
776 * that is being removed. 667 * that is being removed.
777 */ 668 */
778 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 669 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779 m.flags_ = P_NEED_UPDATE; 670 m.flags_ = 0;
780 else if (action == UP_OBJ_FACE) 671 else if (action == UP_OBJ_FACE)
781 /* Nothing to do for that case */ ; 672 /* Nothing to do for that case */ ;
782 else 673 else
783 LOG (llevError, "update_object called with invalid action: %d\n", action); 674 LOG (llevError, "update_object called with invalid action: %d\n", action);
784 675
785 if (op->more) 676 if (op->more)
786 update_object (op->more, action); 677 update_object (op->more, action);
787} 678}
788 679
789object::vector object::mortals;
790object::vector object::objects; // not yet used
791object *object::first;
792
793void object::free_mortals ()
794{
795 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796 if ((*i)->refcnt)
797 ++i; // further delay freeing
798 else
799 {
800 delete *i;
801 mortals.erase (i);
802 }
803}
804
805object::object () 680object::object ()
806{ 681{
807 SET_FLAG (this, FLAG_REMOVED); 682 SET_FLAG (this, FLAG_REMOVED);
808 683
809 expmul = 1.0; 684 expmul = 1.0;
810 face = blank_face; 685 face = blank_face;
811} 686}
812 687
813object::~object () 688object::~object ()
814{ 689{
690 unlink ();
691
815 free_key_values (this); 692 free_key_values (this);
816} 693}
817 694
695static int object_count;
696
818void object::link () 697void object::link ()
819{ 698{
820 count = ++ob_count; 699 assert (!index);//D
821 uuid = gen_uuid (); 700 uuid = gen_uuid ();
701 count = ++object_count;
822 702
823 prev = 0; 703 refcnt_inc ();
824 next = object::first; 704 objects.insert (this);
825
826 if (object::first)
827 object::first->prev = this;
828
829 object::first = this;
830} 705}
831 706
832void object::unlink () 707void object::unlink ()
833{ 708{
834 if (this == object::first) 709 if (!index)
835 object::first = next; 710 return;
836 711
837 /* Remove this object from the list of used objects */ 712 objects.erase (this);
838 if (prev) prev->next = next; 713 refcnt_dec ();
839 if (next) next->prev = prev; 714}
840 715
841 prev = 0; 716void
842 next = 0; 717object::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
727void
728object::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 */
744void
745object::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
754void
755object::deactivate_recursive ()
756{
757 for (object *op = inv; op; op = op->below)
758 op->deactivate_recursive ();
759
760 deactivate ();
761}
762
763void
764object::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 }
771}
772
773/*
774 * Remove and free all objects in the inventory of the given object.
775 * object.c ?
776 */
777void
778object::destroy_inv (bool drop_to_ground)
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
788 /* Only if the space blocks everything do we not process -
789 * if some form of movement is allowed, let objects
790 * drop on that space.
791 */
792 if (!drop_to_ground
793 || !map
794 || map->in_memory != MAP_IN_MEMORY
795 || map->nodrop
796 || ms ().move_block == MOVE_ALL)
797 {
798 while (inv)
799 {
800 inv->destroy_inv (drop_to_ground);
801 inv->destroy ();
802 }
803 }
804 else
805 { /* Put objects in inventory onto this space */
806 while (inv)
807 {
808 object *op = inv;
809
810 if (op->flag [FLAG_STARTEQUIP]
811 || op->flag [FLAG_NO_DROP]
812 || op->type == RUNE
813 || op->type == TRAP
814 || op->flag [FLAG_IS_A_TEMPLATE]
815 || op->flag [FLAG_DESTROY_ON_DEATH])
816 op->destroy ();
817 else
818 map->insert (op, x, y);
819 }
820 }
843} 821}
844 822
845object *object::create () 823object *object::create ()
846{ 824{
847 object *op = new object; 825 object *op = new object;
848 op->link (); 826 op->link ();
849 return op; 827 return op;
850} 828}
851 829
852/* 830void
853 * free_object() frees everything allocated by an object, removes 831object::do_destroy ()
854 * it from the list of used objects, and puts it on the list of
855 * free objects. The IS_FREED() flag is set in the object.
856 * The object must have been removed by remove_ob() first for
857 * this function to succeed.
858 *
859 * If destroy_inventory is set, free inventory as well. Else drop items in
860 * inventory to the ground.
861 */
862void object::destroy (bool destroy_inventory)
863{ 832{
864 if (QUERY_FLAG (this, FLAG_FREED)) 833 attachable::do_destroy ();
865 return;
866 834
867 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 835 if (flag [FLAG_IS_LINKED])
836 remove_button_link (this);
837
838 if (flag [FLAG_FRIENDLY])
839 {
868 remove_friendly_object (this); 840 remove_friendly_object (this);
869 841
870 if (!QUERY_FLAG (this, FLAG_REMOVED)) 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 }
848
849 if (!flag [FLAG_REMOVED])
871 remove (); 850 remove ();
872 851
873 SET_FLAG (this, FLAG_FREED); 852 destroy_inv (true);
874 853
875 if (more) 854 deactivate ();
876 { 855 unlink ();
877 more->destroy (destroy_inventory);
878 more = 0;
879 }
880 856
881 if (inv) 857 flag [FLAG_FREED] = 1;
882 {
883 /* Only if the space blocks everything do we not process -
884 * if some form of movement is allowed, let objects
885 * drop on that space.
886 */
887 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888 {
889 object *op = inv;
890
891 while (op)
892 {
893 object *tmp = op->below;
894 op->destroy (destroy_inventory);
895 op = tmp;
896 }
897 }
898 else
899 { /* Put objects in inventory onto this space */
900 object *op = inv;
901
902 while (op)
903 {
904 object *tmp = op->below;
905
906 op->remove ();
907
908 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910 op->destroy ();
911 else
912 {
913 op->x = x;
914 op->y = y;
915 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916 }
917
918 op = tmp;
919 }
920 }
921 }
922 858
923 // hack to ensure that freed objects still have a valid map 859 // hack to ensure that freed objects still have a valid map
924 { 860 {
925 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
926 862
930 866
931 freed_map->name = "/internal/freed_objects_map"; 867 freed_map->name = "/internal/freed_objects_map";
932 freed_map->width = 3; 868 freed_map->width = 3;
933 freed_map->height = 3; 869 freed_map->height = 3;
934 870
935 freed_map->allocate (); 871 freed_map->alloc ();
872 freed_map->in_memory = MAP_IN_MEMORY;
936 } 873 }
937 874
938 map = freed_map; 875 map = freed_map;
939 x = 1; 876 x = 1;
940 y = 1; 877 y = 1;
941 } 878 }
942 879
880 head = 0;
881
882 if (more)
883 {
884 more->destroy ();
885 more = 0;
886 }
887
943 // clear those pointers that likely might have circular references to us 888 // clear those pointers that likely might have circular references to us
944 owner = 0; 889 owner = 0;
945 enemy = 0; 890 enemy = 0;
946 attacked_by = 0; 891 attacked_by = 0;
892}
947 893
948 // only relevant for players(?), but make sure of it anyways 894void
949 contr = 0; 895object::destroy (bool destroy_inventory)
896{
897 if (destroyed ())
898 return;
950 899
951 /* Remove object from the active list */ 900 if (destroy_inventory)
952 speed = 0; 901 destroy_inv (false);
953 update_ob_speed (this);
954 902
955 unlink (); 903 attachable::destroy ();
956
957 mortals.push_back (this);
958} 904}
959 905
960/* 906/*
961 * sub_weight() recursively (outwards) subtracts a number from the 907 * sub_weight() recursively (outwards) subtracts a number from the
962 * weight of an object (and what is carried by it's environment(s)). 908 * weight of an object (and what is carried by it's environment(s)).
978 * 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
979 * 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
980 * object will have no environment. If the object previously had an 926 * object will have no environment. If the object previously had an
981 * environment, the x and y coordinates will be updated to 927 * environment, the x and y coordinates will be updated to
982 * the previous environment. 928 * the previous environment.
983 * Beware: This function is called from the editor as well!
984 */ 929 */
985void 930void
986object::remove () 931object::do_remove ()
987{ 932{
988 object *tmp, *last = 0; 933 object *tmp, *last = 0;
989 object *otmp; 934 object *otmp;
990 935
991 int check_walk_off;
992
993 if (QUERY_FLAG (this, FLAG_REMOVED)) 936 if (QUERY_FLAG (this, FLAG_REMOVED))
994 return; 937 return;
995 938
996 SET_FLAG (this, FLAG_REMOVED); 939 SET_FLAG (this, FLAG_REMOVED);
940 INVOKE_OBJECT (REMOVE, this);
997 941
998 if (more) 942 if (more)
999 more->remove (); 943 more->remove ();
1000 944
1001 /* 945 /*
1012 /* NO_FIX_PLAYER is set when a great many changes are being 956 /* NO_FIX_PLAYER is set when a great many changes are being
1013 * made to players inventory. If set, avoiding the call 957 * made to players inventory. If set, avoiding the call
1014 * to save cpu time. 958 * to save cpu time.
1015 */ 959 */
1016 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))
1017 fix_player (otmp); 961 otmp->update_stats ();
1018 962
1019 if (above != NULL) 963 if (above)
1020 above->below = below; 964 above->below = below;
1021 else 965 else
1022 env->inv = below; 966 env->inv = below;
1023 967
1024 if (below != NULL) 968 if (below)
1025 below->above = above; 969 below->above = above;
1026 970
1027 /* we set up values so that it could be inserted into 971 /* we set up values so that it could be inserted into
1028 * 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
1029 * to the caller to decide what we want to do. 973 * to the caller to decide what we want to do.
1033 above = 0, below = 0; 977 above = 0, below = 0;
1034 env = 0; 978 env = 0;
1035 } 979 }
1036 else if (map) 980 else if (map)
1037 { 981 {
1038 /* Re did the following section of code - it looks like it had 982 if (type == PLAYER)
1039 * lots of logic for things we no longer care about
1040 */ 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 ();
1041 996
1042 /* link the object above us */ 997 /* link the object above us */
1043 if (above) 998 if (above)
1044 above->below = below; 999 above->below = below;
1045 else 1000 else
1046 map->at (x, y).top = below; /* we were top, set new top */ 1001 ms.top = below; /* we were top, set new top */
1047 1002
1048 /* Relink the object below us, if there is one */ 1003 /* Relink the object below us, if there is one */
1049 if (below) 1004 if (below)
1050 below->above = above; 1005 below->above = above;
1051 else 1006 else
1053 /* 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
1054 * use translated coordinates in case some oddness with map tiling is 1009 * use translated coordinates in case some oddness with map tiling is
1055 * evident 1010 * evident
1056 */ 1011 */
1057 if (GET_MAP_OB (map, x, y) != this) 1012 if (GET_MAP_OB (map, x, y) != this)
1058 {
1059 char *dump = dump_object (this);
1060 LOG (llevError,
1061 "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 ());
1062 free (dump);
1063 dump = dump_object (GET_MAP_OB (map, x, y));
1064 LOG (llevError, "%s\n", dump);
1065 free (dump);
1066 }
1067 1014
1068 map->at (x, y).bottom = above; /* goes on above it. */ 1015 ms.bot = above; /* goes on above it. */
1069 } 1016 }
1070 1017
1071 above = 0; 1018 above = 0;
1072 below = 0; 1019 below = 0;
1073 1020
1074 if (map->in_memory == MAP_SAVING) 1021 if (map->in_memory == MAP_SAVING)
1075 return; 1022 return;
1076 1023
1077 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1024 int check_walk_off = !flag [FLAG_NO_APPLY];
1078 1025
1079 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1026 for (tmp = ms.bot; tmp; tmp = tmp->above)
1080 { 1027 {
1081 /* 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
1082 * being removed. 1029 * being removed.
1083 */ 1030 */
1084 1031
1088 * removed (most likely destroyed), update the player view 1035 * removed (most likely destroyed), update the player view
1089 * appropriately. 1036 * appropriately.
1090 */ 1037 */
1091 if (tmp->container == this) 1038 if (tmp->container == this)
1092 { 1039 {
1093 CLEAR_FLAG (this, FLAG_APPLIED); 1040 flag [FLAG_APPLIED] = 0;
1094 tmp->container = 0; 1041 tmp->container = 0;
1095 } 1042 }
1096 1043
1044 if (tmp->contr->ns)
1097 tmp->contr->socket->floorbox_update (); 1045 tmp->contr->ns->floorbox_update ();
1098 } 1046 }
1099 1047
1100 /* See if player moving off should effect something */ 1048 /* See if object moving off should effect something */
1101 if (check_walk_off 1049 if (check_walk_off
1102 && ((move_type & tmp->move_off) 1050 && ((move_type & tmp->move_off)
1103 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1051 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1104 { 1052 {
1105 move_apply (tmp, this, 0); 1053 move_apply (tmp, this, 0);
1107 if (destroyed ()) 1055 if (destroyed ())
1108 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 ());
1109 } 1057 }
1110 1058
1111 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1059 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1112 1060 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1113 if (tmp->above == tmp) 1061 if (tmp->above == tmp)
1114 tmp->above = 0; 1062 tmp->above = 0;
1115 1063
1116 last = tmp; 1064 last = tmp;
1117 } 1065 }
1118 1066
1119 /* 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?
1120 if (!last) 1069 if (!last)
1121 map->at (x, y).flags_ = P_NEED_UPDATE; 1070 map->at (x, y).flags_ = 0;
1122 else 1071 else
1123 update_object (last, UP_OBJ_REMOVE); 1072 update_object (last, UP_OBJ_REMOVE);
1124 1073
1125 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1074 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126 update_all_los (map, x, y); 1075 update_all_los (map, x, y);
1127 } 1076 }
1128} 1077}
1129 1078
1130/* 1079/*
1139merge_ob (object *op, object *top) 1088merge_ob (object *op, object *top)
1140{ 1089{
1141 if (!op->nrof) 1090 if (!op->nrof)
1142 return 0; 1091 return 0;
1143 1092
1144 if (top == NULL) 1093 if (top)
1145 for (top = op; top != NULL && top->above != NULL; top = top->above); 1094 for (top = op; top && top->above; top = top->above)
1095 ;
1146 1096
1147 for (; top != NULL; top = top->below) 1097 for (; top; top = top->below)
1148 { 1098 {
1149 if (top == op) 1099 if (top == op)
1150 continue; 1100 continue;
1151 1101
1152 if (object::can_merge (op, top)) 1102 if (object::can_merge (op, top))
1162 1112
1163 return 0; 1113 return 0;
1164} 1114}
1165 1115
1166/* 1116/*
1167 * 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
1168 * job preparing multi-part monsters 1118 * job preparing multi-part monsters.
1169 */ 1119 */
1170object * 1120object *
1171insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1121insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1172{ 1122{
1173 object *tmp;
1174
1175 if (op->head)
1176 op = op->head;
1177
1178 for (tmp = op; tmp; tmp = tmp->more) 1123 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179 { 1124 {
1180 tmp->x = x + tmp->arch->clone.x; 1125 tmp->x = x + tmp->arch->clone.x;
1181 tmp->y = y + tmp->arch->clone.y; 1126 tmp->y = y + tmp->arch->clone.y;
1182 } 1127 }
1183 1128
1202 * Return value: 1147 * Return value:
1203 * new object if 'op' was merged with other object 1148 * new object if 'op' was merged with other object
1204 * NULL if 'op' was destroyed 1149 * NULL if 'op' was destroyed
1205 * just 'op' otherwise 1150 * just 'op' otherwise
1206 */ 1151 */
1207
1208object * 1152object *
1209insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1153insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210{ 1154{
1211 object *tmp, *top, *floor = NULL; 1155 object *tmp, *top, *floor = NULL;
1212 sint16 x, y;
1213 1156
1214 if (QUERY_FLAG (op, FLAG_FREED)) 1157 if (QUERY_FLAG (op, FLAG_FREED))
1215 { 1158 {
1216 LOG (llevError, "Trying to insert freed object!\n"); 1159 LOG (llevError, "Trying to insert freed object!\n");
1217 return NULL; 1160 return NULL;
1218 } 1161 }
1219 1162
1220 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)
1221 { 1169 {
1222 char *dump = dump_object (op); 1170 char *dump = dump_object (op);
1223 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);
1224 free (dump); 1172 free (dump);
1225 return op; 1173 return op;
1238#endif 1186#endif
1239 free (dump); 1187 free (dump);
1240 return op; 1188 return op;
1241 } 1189 }
1242 1190
1243 if (!QUERY_FLAG (op, FLAG_REMOVED))
1244 {
1245 char *dump = dump_object (op);
1246 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247 free (dump);
1248 return op;
1249 }
1250
1251 if (op->more != NULL)
1252 {
1253 /* The part may be on a different map. */
1254
1255 object *more = op->more; 1191 if (object *more = op->more)
1256 1192 {
1257 /* We really need the caller to normalize coordinates - if
1258 * we set the map, that doesn't work if the location is within
1259 * a map and this is straddling an edge. So only if coordinate
1260 * is clear wrong do we normalize it.
1261 */
1262 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263 more->map = get_map_from_coord (m, &more->x, &more->y);
1264 else if (!more->map)
1265 {
1266 /* For backwards compatibility - when not dealing with tiled maps,
1267 * more->map should always point to the parent.
1268 */
1269 more->map = m;
1270 }
1271
1272 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1193 if (!insert_ob_in_map (more, m, originator, flag))
1273 { 1194 {
1274 if (!op->head) 1195 if (!op->head)
1275 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");
1276 1197
1277 return NULL; 1198 return 0;
1278 } 1199 }
1279 } 1200 }
1280 1201
1281 CLEAR_FLAG (op, FLAG_REMOVED); 1202 CLEAR_FLAG (op, FLAG_REMOVED);
1282 1203
1283 /* Ideally, the caller figures this out. However, it complicates a lot 1204 /* Ideally, the caller figures this out. However, it complicates a lot
1284 * 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
1285 * need extra work 1206 * need extra work
1286 */ 1207 */
1287 op->map = get_map_from_coord (m, &op->x, &op->y); 1208 if (!xy_normalise (m, op->x, op->y))
1288 x = op->x; 1209 return 0;
1289 y = op->y; 1210
1211 op->map = m;
1212 mapspace &ms = op->ms ();
1290 1213
1291 /* this has to be done after we translate the coordinates. 1214 /* this has to be done after we translate the coordinates.
1292 */ 1215 */
1293 if (op->nrof && !(flag & INS_NO_MERGE)) 1216 if (op->nrof && !(flag & INS_NO_MERGE))
1294 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1217 for (tmp = ms.bot; tmp; tmp = tmp->above)
1295 if (object::can_merge (op, tmp)) 1218 if (object::can_merge (op, tmp))
1296 { 1219 {
1297 op->nrof += tmp->nrof; 1220 op->nrof += tmp->nrof;
1298 tmp->destroy (); 1221 tmp->destroy ();
1299 } 1222 }
1316 op->below = originator->below; 1239 op->below = originator->below;
1317 1240
1318 if (op->below) 1241 if (op->below)
1319 op->below->above = op; 1242 op->below->above = op;
1320 else 1243 else
1321 op->map->at (op->x, op->y).bottom = op; 1244 ms.bot = op;
1322 1245
1323 /* since *below* originator, no need to update top */ 1246 /* since *below* originator, no need to update top */
1324 originator->below = op; 1247 originator->below = op;
1325 } 1248 }
1326 else 1249 else
1327 { 1250 {
1251 top = ms.bot;
1252
1328 /* If there are other objects, then */ 1253 /* If there are other objects, then */
1329 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1254 if ((!(flag & INS_MAP_LOAD)) && top)
1330 { 1255 {
1331 object *last = NULL; 1256 object *last = 0;
1332 1257
1333 /* 1258 /*
1334 * 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.
1335 * We've already dealt with merging if appropriate. 1260 * We've already dealt with merging if appropriate.
1336 * 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
1340 * 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
1341 * 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
1342 * 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
1343 * that flying non pickable objects are spell objects. 1268 * that flying non pickable objects are spell objects.
1344 */ 1269 */
1345 1270 for (top = ms.bot; top; top = top->above)
1346 while (top != NULL)
1347 { 1271 {
1348 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))
1349 floor = top; 1273 floor = top;
1350 1274
1351 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))
1354 top = top->below; 1278 top = top->below;
1355 break; 1279 break;
1356 } 1280 }
1357 1281
1358 last = top; 1282 last = top;
1359 top = top->above;
1360 } 1283 }
1361 1284
1362 /* 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 */
1363 top = last; 1286 top = last;
1364 1287
1371 * Unless those objects are exits, type 66 1294 * Unless those objects are exits, type 66
1372 * If INS_ON_TOP is used, don't do this processing 1295 * If INS_ON_TOP is used, don't do this processing
1373 * Need to find the object that in fact blocks view, otherwise 1296 * Need to find the object that in fact blocks view, otherwise
1374 * stacking is a bit odd. 1297 * stacking is a bit odd.
1375 */ 1298 */
1376 if (!(flag & INS_ON_TOP) && 1299 if (!(flag & INS_ON_TOP)
1377 (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))
1378 { 1302 {
1379 for (last = top; last != floor; last = last->below) 1303 for (last = top; last != floor; last = last->below)
1380 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1304 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1381 break; 1305 break;
1306
1382 /* Check to see if we found the object that blocks view, 1307 /* Check to see if we found the object that blocks view,
1383 * 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
1384 * we can get inserted below this one, which requires we 1309 * we can get inserted below this one, which requires we
1385 * set top to the object below us. 1310 * set top to the object below us.
1386 */ 1311 */
1388 top = last->below; 1313 top = last->below;
1389 } 1314 }
1390 } /* If objects on this space */ 1315 } /* If objects on this space */
1391 1316
1392 if (flag & INS_MAP_LOAD) 1317 if (flag & INS_MAP_LOAD)
1393 top = GET_MAP_TOP (op->map, op->x, op->y); 1318 top = ms.top;
1394 1319
1395 if (flag & INS_ABOVE_FLOOR_ONLY) 1320 if (flag & INS_ABOVE_FLOOR_ONLY)
1396 top = floor; 1321 top = floor;
1397 1322
1398 /* 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.
1399 */ 1324 */
1400 1325
1401 /* First object on this space */ 1326 /* First object on this space */
1402 if (!top) 1327 if (!top)
1403 { 1328 {
1404 op->above = GET_MAP_OB (op->map, op->x, op->y); 1329 op->above = ms.bot;
1405 1330
1406 if (op->above) 1331 if (op->above)
1407 op->above->below = op; 1332 op->above->below = op;
1408 1333
1409 op->below = NULL; 1334 op->below = 0;
1410 op->map->at (op->x, op->y).bottom = op; 1335 ms.bot = op;
1411 } 1336 }
1412 else 1337 else
1413 { /* get inserted into the stack above top */ 1338 { /* get inserted into the stack above top */
1414 op->above = top->above; 1339 op->above = top->above;
1415 1340
1418 1343
1419 op->below = top; 1344 op->below = top;
1420 top->above = op; 1345 top->above = op;
1421 } 1346 }
1422 1347
1423 if (op->above == NULL) 1348 if (!op->above)
1424 op->map->at (op->x, op->y).top = op; 1349 ms.top = op;
1425 } /* else not INS_BELOW_ORIGINATOR */ 1350 } /* else not INS_BELOW_ORIGINATOR */
1426 1351
1427 if (op->type == PLAYER) 1352 if (op->type == PLAYER)
1353 {
1428 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;
1429 1360
1430 /* 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
1431 * it, so save a few ticks and start from there. 1362 * it, so save a few ticks and start from there.
1432 */ 1363 */
1433 if (!(flag & INS_MAP_LOAD)) 1364 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = op->map->at (op->x, op->y).player ()) 1365 if (object *pl = ms.player ())
1366 if (pl->contr->ns)
1435 pl->contr->socket->floorbox_update (); 1367 pl->contr->ns->floorbox_update ();
1436 1368
1437 /* If this object glows, it may affect lighting conditions that are 1369 /* If this object glows, it may affect lighting conditions that are
1438 * 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
1439 * 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
1440 * on the map will get recalculated. The players could very well 1372 * on the map will get recalculated. The players could very well
1441 * 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 -
1442 * this should get redone to only look for players within range, 1374 * this should get redone to only look for players within range,
1443 * or just updating the P_NEED_UPDATE for spaces within this area 1375 * or just updating the P_UPTODATE for spaces within this area
1444 * of effect may be sufficient. 1376 * of effect may be sufficient.
1445 */ 1377 */
1446 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1378 if (op->map->darkness && (op->glow_radius != 0))
1447 update_all_los (op->map, op->x, op->y); 1379 update_all_los (op->map, op->x, op->y);
1448 1380
1449 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1381 /* updates flags (blocked, alive, no magic, etc) for this map space */
1450 update_object (op, UP_OBJ_INSERT); 1382 update_object (op, UP_OBJ_INSERT);
1383
1384 INVOKE_OBJECT (INSERT, op);
1451 1385
1452 /* Don't know if moving this to the end will break anything. However, 1386 /* Don't know if moving this to the end will break anything. However,
1453 * we want to have floorbox_update called before calling this. 1387 * we want to have floorbox_update called before calling this.
1454 * 1388 *
1455 * check_move_on() must be after this because code called from 1389 * check_move_on() must be after this because code called from
1460 1394
1461 /* if this is not the head or flag has been passed, don't check walk on status */ 1395 /* if this is not the head or flag has been passed, don't check walk on status */
1462 if (!(flag & INS_NO_WALK_ON) && !op->head) 1396 if (!(flag & INS_NO_WALK_ON) && !op->head)
1463 { 1397 {
1464 if (check_move_on (op, originator)) 1398 if (check_move_on (op, originator))
1465 return NULL; 1399 return 0;
1466 1400
1467 /* If we are a multi part object, lets work our way through the check 1401 /* If we are a multi part object, lets work our way through the check
1468 * walk on's. 1402 * walk on's.
1469 */ 1403 */
1470 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1404 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471 if (check_move_on (tmp, originator)) 1405 if (check_move_on (tmp, originator))
1472 return NULL; 1406 return 0;
1473 } 1407 }
1474 1408
1475 return op; 1409 return op;
1476} 1410}
1477 1411
1484{ 1418{
1485 object *tmp, *tmp1; 1419 object *tmp, *tmp1;
1486 1420
1487 /* first search for itself and remove any old instances */ 1421 /* first search for itself and remove any old instances */
1488 1422
1489 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)
1490 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1424 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1491 tmp->destroy (); 1425 tmp->destroy ();
1492 1426
1493 tmp1 = arch_to_object (archetype::find (arch_string)); 1427 tmp1 = arch_to_object (archetype::find (arch_string));
1494 1428
1495 tmp1->x = op->x; 1429 tmp1->x = op->x;
1496 tmp1->y = op->y; 1430 tmp1->y = op->y;
1497 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*
1435object *
1436object::insert_at (object *where, object *originator, int flags)
1437{
1438 where->map->insert (this, where->x, where->y, originator, flags);
1498} 1439}
1499 1440
1500/* 1441/*
1501 * 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
1502 * is returned contains nr objects, and the remaining parts contains 1443 * is returned contains nr objects, and the remaining parts contains
1503 * 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).
1504 * On failure, NULL is returned, and the reason put into the 1445 * On failure, NULL is returned, and the reason put into the
1505 * global static errmsg array. 1446 * global static errmsg array.
1506 */ 1447 */
1507
1508object * 1448object *
1509get_split_ob (object *orig_ob, uint32 nr) 1449get_split_ob (object *orig_ob, uint32 nr)
1510{ 1450{
1511 object *newob; 1451 object *newob;
1512 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1452 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1548 1488
1549object * 1489object *
1550decrease_ob_nr (object *op, uint32 i) 1490decrease_ob_nr (object *op, uint32 i)
1551{ 1491{
1552 object *tmp; 1492 object *tmp;
1553 player *pl;
1554 1493
1555 if (i == 0) /* objects with op->nrof require this check */ 1494 if (i == 0) /* objects with op->nrof require this check */
1556 return op; 1495 return op;
1557 1496
1558 if (i > op->nrof) 1497 if (i > op->nrof)
1571 * IMO, searching through all the players will mostly 1510 * IMO, searching through all the players will mostly
1572 * likely be quicker than following op->env to the map, 1511 * likely be quicker than following op->env to the map,
1573 * and then searching the map for a player. 1512 * and then searching the map for a player.
1574 */ 1513 */
1575 if (!tmp) 1514 if (!tmp)
1576 { 1515 for_all_players (pl)
1577 for (pl = first_player; pl; pl = pl->next)
1578 if (pl->ob->container == op->env) 1516 if (pl->ob->container == op->env)
1579 { 1517 {
1580 tmp = pl->ob; 1518 tmp = pl->ob;
1581 break; 1519 break;
1582 } 1520 }
1583 }
1584 1521
1585 if (i < op->nrof) 1522 if (i < op->nrof)
1586 { 1523 {
1587 sub_weight (op->env, op->weight * i); 1524 sub_weight (op->env, op->weight * i);
1588 op->nrof -= i; 1525 op->nrof -= i;
1724 add_weight (this, (op->weight + op->carrying)); 1661 add_weight (this, (op->weight + op->carrying));
1725 1662
1726 otmp = this->in_player (); 1663 otmp = this->in_player ();
1727 if (otmp && otmp->contr) 1664 if (otmp && otmp->contr)
1728 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1665 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729 fix_player (otmp); 1666 otmp->update_stats ();
1730 1667
1731 op->map = 0; 1668 op->map = 0;
1732 op->env = this; 1669 op->env = this;
1733 op->above = 0; 1670 op->above = 0;
1734 op->below = 0; 1671 op->below = 0;
1738 if ((op->glow_radius != 0) && map) 1675 if ((op->glow_radius != 0) && map)
1739 { 1676 {
1740#ifdef DEBUG_LIGHTS 1677#ifdef DEBUG_LIGHTS
1741 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1678 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742#endif /* DEBUG_LIGHTS */ 1679#endif /* DEBUG_LIGHTS */
1743 if (MAP_DARKNESS (map)) 1680 if (map->darkness)
1744 update_all_los (map, x, y); 1681 update_all_los (map, x, y);
1745 } 1682 }
1746 1683
1747 /* Client has no idea of ordering so lets not bother ordering it here. 1684 /* Client has no idea of ordering so lets not bother ordering it here.
1748 * It sure simplifies this function... 1685 * It sure simplifies this function...
1753 { 1690 {
1754 op->below = inv; 1691 op->below = inv;
1755 op->below->above = op; 1692 op->below->above = op;
1756 inv = op; 1693 inv = op;
1757 } 1694 }
1695
1696 INVOKE_OBJECT (INSERT, this);
1758 1697
1759 return op; 1698 return op;
1760} 1699}
1761 1700
1762/* 1701/*
1777 * 1716 *
1778 * 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
1779 * 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
1780 * on top. 1719 * on top.
1781 */ 1720 */
1782
1783int 1721int
1784check_move_on (object *op, object *originator) 1722check_move_on (object *op, object *originator)
1785{ 1723{
1786 object *tmp; 1724 object *tmp;
1787 maptile *m = op->map; 1725 maptile *m = op->map;
1814 1752
1815 /* The objects have to be checked from top to bottom. 1753 /* The objects have to be checked from top to bottom.
1816 * Hence, we first go to the top: 1754 * Hence, we first go to the top:
1817 */ 1755 */
1818 1756
1819 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1757 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1820 { 1758 {
1821 /* Trim the search when we find the first other spell effect 1759 /* Trim the search when we find the first other spell effect
1822 * 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,
1823 * we don't need to check all of them. 1761 * we don't need to check all of them.
1824 */ 1762 */
1842 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1780 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1843 ((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))
1844 { 1782 {
1845 1783
1846 float 1784 float
1847 diff = tmp->move_slow_penalty * FABS (op->speed); 1785 diff = tmp->move_slow_penalty * fabs (op->speed);
1848 1786
1849 if (op->type == PLAYER) 1787 if (op->type == PLAYER)
1850 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)) ||
1851 (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)))
1852 diff /= 4.0; 1790 diff /= 4.0;
1879/* 1817/*
1880 * present_arch(arch, map, x, y) searches for any objects with 1818 * present_arch(arch, map, x, y) searches for any objects with
1881 * a matching archetype at the given map and coordinates. 1819 * a matching archetype at the given map and coordinates.
1882 * The first matching object is returned, or NULL if none. 1820 * The first matching object is returned, or NULL if none.
1883 */ 1821 */
1884
1885object * 1822object *
1886present_arch (const archetype *at, maptile *m, int x, int y) 1823present_arch (const archetype *at, maptile *m, int x, int y)
1887{ 1824{
1888 object *
1889 tmp;
1890
1891 if (m == NULL || out_of_map (m, x, y)) 1825 if (!m || out_of_map (m, x, y))
1892 { 1826 {
1893 LOG (llevError, "Present_arch called outside map.\n"); 1827 LOG (llevError, "Present_arch called outside map.\n");
1894 return NULL; 1828 return NULL;
1895 } 1829 }
1896 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1830
1831 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1897 if (tmp->arch == at) 1832 if (tmp->arch == at)
1898 return tmp; 1833 return tmp;
1834
1899 return NULL; 1835 return NULL;
1900} 1836}
1901 1837
1902/* 1838/*
1903 * present(type, map, x, y) searches for any objects with 1839 * present(type, map, x, y) searches for any objects with
1904 * a matching type variable at the given map and coordinates. 1840 * a matching type variable at the given map and coordinates.
1905 * The first matching object is returned, or NULL if none. 1841 * The first matching object is returned, or NULL if none.
1906 */ 1842 */
1907
1908object * 1843object *
1909present (unsigned char type, maptile *m, int x, int y) 1844present (unsigned char type, maptile *m, int x, int y)
1910{ 1845{
1911 object *
1912 tmp;
1913
1914 if (out_of_map (m, x, y)) 1846 if (out_of_map (m, x, y))
1915 { 1847 {
1916 LOG (llevError, "Present called outside map.\n"); 1848 LOG (llevError, "Present called outside map.\n");
1917 return NULL; 1849 return NULL;
1918 } 1850 }
1919 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1851
1852 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1920 if (tmp->type == type) 1853 if (tmp->type == type)
1921 return tmp; 1854 return tmp;
1855
1922 return NULL; 1856 return NULL;
1923} 1857}
1924 1858
1925/* 1859/*
1926 * present_in_ob(type, object) searches for any objects with 1860 * present_in_ob(type, object) searches for any objects with
1927 * a matching type variable in the inventory of the given object. 1861 * a matching type variable in the inventory of the given object.
1928 * The first matching object is returned, or NULL if none. 1862 * The first matching object is returned, or NULL if none.
1929 */ 1863 */
1930
1931object * 1864object *
1932present_in_ob (unsigned char type, const object *op) 1865present_in_ob (unsigned char type, const object *op)
1933{ 1866{
1934 object *
1935 tmp;
1936
1937 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1867 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938 if (tmp->type == type) 1868 if (tmp->type == type)
1939 return tmp; 1869 return tmp;
1870
1940 return NULL; 1871 return NULL;
1941} 1872}
1942 1873
1943/* 1874/*
1944 * present_in_ob (type, str, object) searches for any objects with 1875 * present_in_ob (type, str, object) searches for any objects with
1952 * str is the string to match against. Note that we match against 1883 * str is the string to match against. Note that we match against
1953 * the object name, not the archetype name. this is so that the 1884 * the object name, not the archetype name. this is so that the
1954 * spell code can use one object type (force), but change it's name 1885 * spell code can use one object type (force), but change it's name
1955 * to be unique. 1886 * to be unique.
1956 */ 1887 */
1957
1958object * 1888object *
1959present_in_ob_by_name (int type, const char *str, const object *op) 1889present_in_ob_by_name (int type, const char *str, const object *op)
1960{ 1890{
1961 object *
1962 tmp;
1963
1964 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1891 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 {
1966 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1892 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967 return tmp; 1893 return tmp;
1968 } 1894
1969 return NULL; 1895 return 0;
1970} 1896}
1971 1897
1972/* 1898/*
1973 * present_arch_in_ob(archetype, object) searches for any objects with 1899 * present_arch_in_ob(archetype, object) searches for any objects with
1974 * a matching archetype in the inventory of the given object. 1900 * a matching archetype in the inventory of the given object.
1975 * The first matching object is returned, or NULL if none. 1901 * The first matching object is returned, or NULL if none.
1976 */ 1902 */
1977
1978object * 1903object *
1979present_arch_in_ob (const archetype *at, const object *op) 1904present_arch_in_ob (const archetype *at, const object *op)
1980{ 1905{
1981 object *
1982 tmp;
1983
1984 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1906 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985 if (tmp->arch == at) 1907 if (tmp->arch == at)
1986 return tmp; 1908 return tmp;
1909
1987 return NULL; 1910 return NULL;
1988} 1911}
1989 1912
1990/* 1913/*
1991 * activate recursively a flag on an object inventory 1914 * activate recursively a flag on an object inventory
1992 */ 1915 */
1993void 1916void
1994flag_inv (object *op, int flag) 1917flag_inv (object *op, int flag)
1995{ 1918{
1996 object *
1997 tmp;
1998
1999 if (op->inv) 1919 if (op->inv)
2000 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1920 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001 { 1921 {
2002 SET_FLAG (tmp, flag); 1922 SET_FLAG (tmp, flag);
2003 flag_inv (tmp, flag); 1923 flag_inv (tmp, flag);
2004 } 1924 }
2005} /* 1925}
1926
1927/*
2006 * desactivate recursively a flag on an object inventory 1928 * deactivate recursively a flag on an object inventory
2007 */ 1929 */
2008void 1930void
2009unflag_inv (object *op, int flag) 1931unflag_inv (object *op, int flag)
2010{ 1932{
2011 object *
2012 tmp;
2013
2014 if (op->inv) 1933 if (op->inv)
2015 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1934 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016 { 1935 {
2017 CLEAR_FLAG (tmp, flag); 1936 CLEAR_FLAG (tmp, flag);
2018 unflag_inv (tmp, flag); 1937 unflag_inv (tmp, flag);
2019 } 1938 }
2020} 1939}
2023 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1942 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024 * all it's inventory (recursively). 1943 * all it's inventory (recursively).
2025 * If checksums are used, a player will get set_cheat called for 1944 * If checksums are used, a player will get set_cheat called for
2026 * him/her-self and all object carried by a call to this function. 1945 * him/her-self and all object carried by a call to this function.
2027 */ 1946 */
2028
2029void 1947void
2030set_cheat (object *op) 1948set_cheat (object *op)
2031{ 1949{
2032 SET_FLAG (op, FLAG_WAS_WIZ); 1950 SET_FLAG (op, FLAG_WAS_WIZ);
2033 flag_inv (op, FLAG_WAS_WIZ); 1951 flag_inv (op, FLAG_WAS_WIZ);
2052 * because arch_blocked (now ob_blocked) needs to know the movement type 1970 * because arch_blocked (now ob_blocked) needs to know the movement type
2053 * to know if the space in question will block the object. We can't use 1971 * to know if the space in question will block the object. We can't use
2054 * the archetype because that isn't correct if the monster has been 1972 * the archetype because that isn't correct if the monster has been
2055 * customized, changed states, etc. 1973 * customized, changed states, etc.
2056 */ 1974 */
2057
2058int 1975int
2059find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1976find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060{ 1977{
2061 int
2062 i,
2063 index = 0, flag; 1978 int index = 0, flag;
2064 static int
2065 altern[SIZEOFFREE]; 1979 int altern[SIZEOFFREE];
2066 1980
2067 for (i = start; i < stop; i++) 1981 for (int i = start; i < stop; i++)
2068 { 1982 {
2069 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1983 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070 if (!flag) 1984 if (!flag)
2071 altern[index++] = i; 1985 altern [index++] = i;
2072 1986
2073 /* Basically, if we find a wall on a space, we cut down the search size. 1987 /* Basically, if we find a wall on a space, we cut down the search size.
2074 * In this way, we won't return spaces that are on another side of a wall. 1988 * In this way, we won't return spaces that are on another side of a wall.
2075 * This mostly work, but it cuts down the search size in all directions - 1989 * This mostly work, but it cuts down the search size in all directions -
2076 * if the space being examined only has a wall to the north and empty 1990 * if the space being examined only has a wall to the north and empty
2083 } 1997 }
2084 1998
2085 if (!index) 1999 if (!index)
2086 return -1; 2000 return -1;
2087 2001
2088 return altern[RANDOM () % index]; 2002 return altern [rndm (index)];
2089} 2003}
2090 2004
2091/* 2005/*
2092 * find_first_free_spot(archetype, maptile, x, y) works like 2006 * find_first_free_spot(archetype, maptile, x, y) works like
2093 * find_free_spot(), but it will search max number of squares. 2007 * find_free_spot(), but it will search max number of squares.
2094 * But it will return the first available spot, not a random choice. 2008 * But it will return the first available spot, not a random choice.
2095 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2009 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2096 */ 2010 */
2097
2098int 2011int
2099find_first_free_spot (const object *ob, maptile *m, int x, int y) 2012find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100{ 2013{
2101 int
2102 i;
2103
2104 for (i = 0; i < SIZEOFFREE; i++) 2014 for (int i = 0; i < SIZEOFFREE; i++)
2105 {
2106 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2015 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107 return i; 2016 return i;
2108 } 2017
2109 return -1; 2018 return -1;
2110} 2019}
2111 2020
2112/* 2021/*
2113 * The function permute(arr, begin, end) randomly reorders the array 2022 * The function permute(arr, begin, end) randomly reorders the array
2114 * arr[begin..end-1]. 2023 * arr[begin..end-1].
2024 * now uses a fisher-yates shuffle, old permute was broken
2115 */ 2025 */
2116static void 2026static void
2117permute (int *arr, int begin, int end) 2027permute (int *arr, int begin, int end)
2118{ 2028{
2119 int 2029 arr += begin;
2120 i,
2121 j,
2122 tmp,
2123 len;
2124
2125 len = end - begin; 2030 end -= begin;
2126 for (i = begin; i < end; i++)
2127 {
2128 j = begin + RANDOM () % len;
2129 2031
2130 tmp = arr[i]; 2032 while (--end)
2131 arr[i] = arr[j]; 2033 swap (arr [end], arr [rndm (end + 1)]);
2132 arr[j] = tmp;
2133 }
2134} 2034}
2135 2035
2136/* new function to make monster searching more efficient, and effective! 2036/* new function to make monster searching more efficient, and effective!
2137 * This basically returns a randomized array (in the passed pointer) of 2037 * This basically returns a randomized array (in the passed pointer) of
2138 * 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
2141 * the 3x3 area will be searched, just not in a predictable order. 2041 * the 3x3 area will be searched, just not in a predictable order.
2142 */ 2042 */
2143void 2043void
2144get_search_arr (int *search_arr) 2044get_search_arr (int *search_arr)
2145{ 2045{
2146 int 2046 int i;
2147 i;
2148 2047
2149 for (i = 0; i < SIZEOFFREE; i++) 2048 for (i = 0; i < SIZEOFFREE; i++)
2150 {
2151 search_arr[i] = i; 2049 search_arr[i] = i;
2152 }
2153 2050
2154 permute (search_arr, 1, SIZEOFFREE1 + 1); 2051 permute (search_arr, 1, SIZEOFFREE1 + 1);
2155 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2052 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2053 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157} 2054}
2166 * Perhaps incorrectly, but I'm making the assumption that exclude 2063 * Perhaps incorrectly, but I'm making the assumption that exclude
2167 * is actually want is going to try and move there. We need this info 2064 * is actually want is going to try and move there. We need this info
2168 * because we have to know what movement the thing looking to move 2065 * because we have to know what movement the thing looking to move
2169 * there is capable of. 2066 * there is capable of.
2170 */ 2067 */
2171
2172int 2068int
2173find_dir (maptile *m, int x, int y, object *exclude) 2069find_dir (maptile *m, int x, int y, object *exclude)
2174{ 2070{
2175 int
2176 i,
2177 max = SIZEOFFREE, mflags; 2071 int i, max = SIZEOFFREE, mflags;
2178 2072
2179 sint16 nx, ny; 2073 sint16 nx, ny;
2180 object * 2074 object *tmp;
2181 tmp;
2182 maptile * 2075 maptile *mp;
2183 mp;
2184 2076
2185 MoveType blocked, move_type; 2077 MoveType blocked, move_type;
2186 2078
2187 if (exclude && exclude->head) 2079 if (exclude && exclude->head)
2188 { 2080 {
2205 2097
2206 if (mflags & P_OUT_OF_MAP) 2098 if (mflags & P_OUT_OF_MAP)
2207 max = maxfree[i]; 2099 max = maxfree[i];
2208 else 2100 else
2209 { 2101 {
2210 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2102 mapspace &ms = mp->at (nx, ny);
2103
2104 blocked = ms.move_block;
2211 2105
2212 if ((move_type & blocked) == move_type) 2106 if ((move_type & blocked) == move_type)
2213 max = maxfree[i]; 2107 max = maxfree[i];
2214 else if (mflags & P_IS_ALIVE) 2108 else if (mflags & P_IS_ALIVE)
2215 { 2109 {
2216 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2110 for (tmp = ms.bot; tmp; tmp = tmp->above)
2217 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2111 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2112 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2218 break; 2113 break;
2219 2114
2220 if (tmp) 2115 if (tmp)
2221 return freedir[i]; 2116 return freedir[i];
2222 } 2117 }
2228 2123
2229/* 2124/*
2230 * distance(object 1, object 2) will return the square of the 2125 * distance(object 1, object 2) will return the square of the
2231 * distance between the two given objects. 2126 * distance between the two given objects.
2232 */ 2127 */
2233
2234int 2128int
2235distance (const object *ob1, const object *ob2) 2129distance (const object *ob1, const object *ob2)
2236{ 2130{
2237 int i;
2238
2239 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2131 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240 return i;
2241} 2132}
2242 2133
2243/* 2134/*
2244 * find_dir_2(delta-x,delta-y) will return a direction in which 2135 * find_dir_2(delta-x,delta-y) will return a direction in which
2245 * an object which has subtracted the x and y coordinates of another 2136 * an object which has subtracted the x and y coordinates of another
2246 * object, needs to travel toward it. 2137 * object, needs to travel toward it.
2247 */ 2138 */
2248
2249int 2139int
2250find_dir_2 (int x, int y) 2140find_dir_2 (int x, int y)
2251{ 2141{
2252 int q; 2142 int q;
2253 2143
2282 2172
2283 return 3; 2173 return 3;
2284} 2174}
2285 2175
2286/* 2176/*
2287 * absdir(int): Returns a number between 1 and 8, which represent
2288 * the "absolute" direction of a number (it actually takes care of
2289 * "overflow" in previous calculations of a direction).
2290 */
2291
2292int
2293absdir (int d)
2294{
2295 while (d < 1)
2296 d += 8;
2297 while (d > 8)
2298 d -= 8;
2299 return d;
2300}
2301
2302/*
2303 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2177 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2304 * between two directions (which are expected to be absolute (see absdir()) 2178 * between two directions (which are expected to be absolute (see absdir())
2305 */ 2179 */
2306
2307int 2180int
2308dirdiff (int dir1, int dir2) 2181dirdiff (int dir1, int dir2)
2309{ 2182{
2310 int 2183 int d;
2311 d;
2312 2184
2313 d = abs (dir1 - dir2); 2185 d = abs (dir1 - dir2);
2314 if (d > 4) 2186 if (d > 4)
2315 d = 8 - d; 2187 d = 8 - d;
2188
2316 return d; 2189 return d;
2317} 2190}
2318 2191
2319/* peterm: 2192/* peterm:
2320 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2193 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2323 * This basically means that if direction is 15, then it could either go 2196 * This basically means that if direction is 15, then it could either go
2324 * direction 4, 14, or 16 to get back to where we are. 2197 * direction 4, 14, or 16 to get back to where we are.
2325 * Moved from spell_util.c to object.c with the other related direction 2198 * Moved from spell_util.c to object.c with the other related direction
2326 * functions. 2199 * functions.
2327 */ 2200 */
2328
2329int
2330 reduction_dir[SIZEOFFREE][3] = { 2201int reduction_dir[SIZEOFFREE][3] = {
2331 {0, 0, 0}, /* 0 */ 2202 {0, 0, 0}, /* 0 */
2332 {0, 0, 0}, /* 1 */ 2203 {0, 0, 0}, /* 1 */
2333 {0, 0, 0}, /* 2 */ 2204 {0, 0, 0}, /* 2 */
2334 {0, 0, 0}, /* 3 */ 2205 {0, 0, 0}, /* 3 */
2335 {0, 0, 0}, /* 4 */ 2206 {0, 0, 0}, /* 4 */
2479 insert_ob_in_ob (object_create_clone (item), dst); 2350 insert_ob_in_ob (object_create_clone (item), dst);
2480 2351
2481 return dst; 2352 return dst;
2482} 2353}
2483 2354
2484/* GROS - Creates an object using a string representing its content. */
2485/* Basically, we save the content of the string to a temp file, then call */
2486/* load_object on it. I admit it is a highly inefficient way to make things, */
2487/* but it was simple to make and allows reusing the load_object function. */
2488/* Remember not to use load_object_str in a time-critical situation. */
2489/* Also remember that multiparts objects are not supported for now. */
2490
2491object *
2492load_object_str (const char *obstr)
2493{
2494 object *op;
2495 char filename[MAX_BUF];
2496
2497 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2498
2499 FILE *tempfile = fopen (filename, "w");
2500
2501 if (tempfile == NULL)
2502 {
2503 LOG (llevError, "Error - Unable to access load object temp file\n");
2504 return NULL;
2505 }
2506
2507 fprintf (tempfile, obstr);
2508 fclose (tempfile);
2509
2510 op = object::create ();
2511
2512 object_thawer thawer (filename);
2513
2514 if (thawer)
2515 load_object (thawer, op, 0);
2516
2517 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2518 CLEAR_FLAG (op, FLAG_REMOVED);
2519
2520 return op;
2521}
2522
2523/* This returns the first object in who's inventory that 2355/* This returns the first object in who's inventory that
2524 * has the same type and subtype match. 2356 * has the same type and subtype match.
2525 * returns NULL if no match. 2357 * returns NULL if no match.
2526 */ 2358 */
2527object * 2359object *
2528find_obj_by_type_subtype (const object *who, int type, int subtype) 2360find_obj_by_type_subtype (const object *who, int type, int subtype)
2529{ 2361{
2530 object *tmp;
2531
2532 for (tmp = who->inv; tmp; tmp = tmp->below) 2362 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533 if (tmp->type == type && tmp->subtype == subtype) 2363 if (tmp->type == type && tmp->subtype == subtype)
2534 return tmp; 2364 return tmp;
2535 2365
2536 return NULL; 2366 return 0;
2537} 2367}
2538 2368
2539/* If ob has a field named key, return the link from the list, 2369/* If ob has a field named key, return the link from the list,
2540 * otherwise return NULL. 2370 * otherwise return NULL.
2541 * 2371 *
2543 * do the desired thing. 2373 * do the desired thing.
2544 */ 2374 */
2545key_value * 2375key_value *
2546get_ob_key_link (const object *ob, const char *key) 2376get_ob_key_link (const object *ob, const char *key)
2547{ 2377{
2548 key_value *link;
2549
2550 for (link = ob->key_values; link != NULL; link = link->next) 2378 for (key_value *link = ob->key_values; link; link = link->next)
2551 if (link->key == key) 2379 if (link->key == key)
2552 return link; 2380 return link;
2553 2381
2554 return NULL; 2382 return 0;
2555} 2383}
2556 2384
2557/* 2385/*
2558 * Returns the value of op has an extra_field for key, or NULL. 2386 * Returns the value of op has an extra_field for key, or NULL.
2559 * 2387 *
2599 * Returns TRUE on success. 2427 * Returns TRUE on success.
2600 */ 2428 */
2601int 2429int
2602set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2430set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603{ 2431{
2604 key_value *
2605 field = NULL, *last = NULL; 2432 key_value *field = NULL, *last = NULL;
2606 2433
2607 for (field = op->key_values; field != NULL; field = field->next) 2434 for (field = op->key_values; field != NULL; field = field->next)
2608 { 2435 {
2609 if (field->key != canonical_key) 2436 if (field->key != canonical_key)
2610 { 2437 {
2638 /* IF we get here, key doesn't exist */ 2465 /* IF we get here, key doesn't exist */
2639 2466
2640 /* No field, we'll have to add it. */ 2467 /* No field, we'll have to add it. */
2641 2468
2642 if (!add_key) 2469 if (!add_key)
2643 {
2644 return FALSE; 2470 return FALSE;
2645 } 2471
2646 /* There isn't any good reason to store a null 2472 /* There isn't any good reason to store a null
2647 * value in the key/value list. If the archetype has 2473 * value in the key/value list. If the archetype has
2648 * this key, then we should also have it, so shouldn't 2474 * this key, then we should also have it, so shouldn't
2649 * be here. If user wants to store empty strings, 2475 * be here. If user wants to store empty strings,
2650 * should pass in "" 2476 * should pass in ""
2699 } 2525 }
2700 else 2526 else
2701 item = item->env; 2527 item = item->env;
2702} 2528}
2703 2529
2530
2531const char *
2532object::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
2704// 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
2705const char * 2560const char *
2706object::debug_desc (char *info) const 2561object::debug_desc (char *info) const
2707{ 2562{
2563 char flagdesc[512];
2708 char info2[256 * 3]; 2564 char info2[256 * 4];
2709 char *p = info; 2565 char *p = info;
2710 2566
2711 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}",
2712 count, 2568 count, uuid.seq,
2713 &name, 2569 &name,
2714 title ? " " : "", 2570 title ? "\",title:\"" : "",
2715 title ? (const char *)title : ""); 2571 title ? (const char *)title : "",
2572 flag_desc (flagdesc, 512), type);
2716 2573
2717 if (env) 2574 if (env)
2718 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2575 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719 2576
2720 if (map) 2577 if (map)
2721 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);
2722 2579
2723 return info; 2580 return info;
2724} 2581}
2725 2582
2726const char * 2583const char *
2727object::debug_desc () const 2584object::debug_desc () const
2728{ 2585{
2729 static char info[256 * 3]; 2586 static char info[256 * 4];
2730 return debug_desc (info); 2587 return debug_desc (info);
2731} 2588}
2732 2589
2590const char *
2591object::debug_desc2 () const
2592{
2593 static char info[256 * 4];
2594 return debug_desc (info);
2595}
2596
2597struct region *
2598object::region () const
2599{
2600 return map ? map->region (x, y)
2601 : region::default_region ();
2602}
2603
2604const materialtype_t *
2605object::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
2616void
2617object::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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines