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.81 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.143 by root, Tue May 1 05:48:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
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
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:
323sum_weight (object *op) 324sum_weight (object *op)
324{ 325{
325 long sum; 326 long sum;
326 object *inv; 327 object *inv;
327 328
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 330 {
330 if (inv->inv) 331 if (inv->inv)
331 sum_weight (inv); 332 sum_weight (inv);
333
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 335 }
334 336
335 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 358/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 360 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 361 * The result of the dump is stored in the static global errmsg array.
360 */ 362 */
361
362char * 363char *
363dump_object (object *op) 364dump_object (object *op)
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 op->write (freezer);
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 for_all_objects (op)
401 if (op->count == i) 401 if (op->count == i)
402 return op; 402 return op;
403 403
404 return 0; 404 return 0;
405} 405}
406 406
407/* 407/*
408 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
411 */ 411 */
412
413object * 412object *
414find_object_name (const char *str) 413find_object_name (const char *str)
415{ 414{
416 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
417 object *op; 416 object *op;
418 417
419 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
420 if (op->name == str_) 419 if (op->name == str_)
421 break; 420 break;
422 421
423 return op; 422 return op;
424} 423}
456 * refcounts and freeing the links. 455 * refcounts and freeing the links.
457 */ 456 */
458static void 457static void
459free_key_values (object *op) 458free_key_values (object *op)
460{ 459{
461 for (key_value *i = op->key_values; i != 0;) 460 for (key_value *i = op->key_values; i; )
462 { 461 {
463 key_value *next = i->next; 462 key_value *next = i->next;
464 delete i; 463 delete i;
465 464
466 i = next; 465 i = next;
467 } 466 }
468 467
469 op->key_values = 0; 468 op->key_values = 0;
470} 469}
471 470
472/* 471object &
473 * copy_to first frees everything allocated by the dst object, 472object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 473{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 474 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 475 bool is_removed = flag [FLAG_REMOVED];
485 476
486 *(object_copy *)dst = *this; 477 *(object_copy *)this = src;
487 478
488 if (self || cb) 479 flag [FLAG_FREED] = is_freed;
489 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 480 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_freed)
492 SET_FLAG (dst, FLAG_FREED);
493
494 if (is_removed)
495 SET_FLAG (dst, FLAG_REMOVED);
496
497 if (speed < 0)
498 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
499 481
500 /* Copy over key_values, if any. */ 482 /* Copy over key_values, if any. */
501 if (key_values) 483 if (src.key_values)
502 { 484 {
503 key_value *tail = 0; 485 key_value *tail = 0;
504 key_value *i;
505
506 dst->key_values = 0; 486 key_values = 0;
507 487
508 for (i = key_values; i; i = i->next) 488 for (key_value *i = src.key_values; i; i = i->next)
509 { 489 {
510 key_value *new_link = new key_value; 490 key_value *new_link = new key_value;
511 491
512 new_link->next = 0; 492 new_link->next = 0;
513 new_link->key = i->key; 493 new_link->key = i->key;
514 new_link->value = i->value; 494 new_link->value = i->value;
515 495
516 /* Try and be clever here, too. */ 496 /* Try and be clever here, too. */
517 if (!dst->key_values) 497 if (!key_values)
518 { 498 {
519 dst->key_values = new_link; 499 key_values = new_link;
520 tail = new_link; 500 tail = new_link;
521 } 501 }
522 else 502 else
523 { 503 {
524 tail->next = new_link; 504 tail->next = new_link;
525 tail = new_link; 505 tail = new_link;
526 } 506 }
527 } 507 }
528 } 508 }
509}
529 510
530 update_ob_speed (dst); 511/*
512 * copy_to first frees everything allocated by the dst object,
513 * and then copies the contents of itself into the second
514 * object, allocating what needs to be allocated. Basically, any
515 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
516 * if the first object is freed, the pointers in the new object
517 * will point at garbage.
518 */
519void
520object::copy_to (object *dst)
521{
522 *dst = *this;
523
524 if (speed < 0)
525 dst->speed_left = speed_left - rndm ();
526
527 dst->set_speed (dst->speed);
528}
529
530void
531object::instantiate ()
532{
533 if (!uuid.seq) // HACK
534 uuid = gen_uuid ();
535
536 speed_left = -0.1f;
537 /* copy the body_info to the body_used - this is only really
538 * need for monsters, but doesn't hurt to do it for everything.
539 * by doing so, when a monster is created, it has good starting
540 * values for the body_used info, so when items are created
541 * for it, they can be properly equipped.
542 */
543 memcpy (body_used, body_info, sizeof (body_used));
544
545 attachable::instantiate ();
531} 546}
532 547
533object * 548object *
534object::clone () 549object::clone ()
535{ 550{
541/* 556/*
542 * If an object with the IS_TURNABLE() flag needs to be turned due 557 * If an object with the IS_TURNABLE() flag needs to be turned due
543 * to the closest player being on the other side, this function can 558 * to the closest player being on the other side, this function can
544 * be called to update the face variable, _and_ how it looks on the map. 559 * be called to update the face variable, _and_ how it looks on the map.
545 */ 560 */
546
547void 561void
548update_turn_face (object *op) 562update_turn_face (object *op)
549{ 563{
550 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 564 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551 return; 565 return;
566
552 SET_ANIMATION (op, op->direction); 567 SET_ANIMATION (op, op->direction);
553 update_object (op, UP_OBJ_FACE); 568 update_object (op, UP_OBJ_FACE);
554} 569}
555 570
556/* 571/*
557 * Updates the speed of an object. If the speed changes from 0 to another 572 * Updates the speed of an object. If the speed changes from 0 to another
558 * value, or vice versa, then add/remove the object from the active list. 573 * value, or vice versa, then add/remove the object from the active list.
559 * This function needs to be called whenever the speed of an object changes. 574 * This function needs to be called whenever the speed of an object changes.
560 */ 575 */
561void 576void
562update_ob_speed (object *op) 577object::set_speed (float speed)
563{ 578{
564 extern int arch_init; 579 if (flag [FLAG_FREED] && speed)
565
566 /* No reason putting the archetypes objects on the speed list,
567 * since they never really need to be updated.
568 */
569
570 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571 { 580 {
572 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 581 LOG (llevError, "Object %s is freed but has speed.\n", &name);
573#ifdef MANY_CORES
574 abort ();
575#else
576 op->speed = 0; 582 speed = 0;
577#endif
578 }
579
580 if (arch_init)
581 return;
582
583 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584 { 583 }
585 /* If already on active list, don't do anything */
586 if (op->active_next || op->active_prev || op == active_objects)
587 return;
588 584
589 /* process_events() expects us to insert the object at the beginning 585 this->speed = speed;
590 * of the list. */
591 op->active_next = active_objects;
592 586
593 if (op->active_next != NULL) 587 if (has_active_speed ())
594 op->active_next->active_prev = op; 588 activate ();
595
596 active_objects = op;
597 }
598 else 589 else
599 { 590 deactivate ();
600 /* If not on the active list, nothing needs to be done */
601 if (!op->active_next && !op->active_prev && op != active_objects)
602 return;
603
604 if (op->active_prev == NULL)
605 {
606 active_objects = op->active_next;
607
608 if (op->active_next != NULL)
609 op->active_next->active_prev = NULL;
610 }
611 else
612 {
613 op->active_prev->active_next = op->active_next;
614
615 if (op->active_next)
616 op->active_next->active_prev = op->active_prev;
617 }
618
619 op->active_next = NULL;
620 op->active_prev = NULL;
621 }
622}
623
624/* This function removes object 'op' from the list of active
625 * objects.
626 * This should only be used for style maps or other such
627 * reference maps where you don't want an object that isn't
628 * in play chewing up cpu time getting processed.
629 * The reverse of this is to call update_ob_speed, which
630 * will do the right thing based on the speed of the object.
631 */
632void
633remove_from_active_list (object *op)
634{
635 /* If not on the active list, nothing needs to be done */
636 if (!op->active_next && !op->active_prev && op != active_objects)
637 return;
638
639 if (op->active_prev == NULL)
640 {
641 active_objects = op->active_next;
642 if (op->active_next != NULL)
643 op->active_next->active_prev = NULL;
644 }
645 else
646 {
647 op->active_prev->active_next = op->active_next;
648 if (op->active_next)
649 op->active_next->active_prev = op->active_prev;
650 }
651 op->active_next = NULL;
652 op->active_prev = NULL;
653} 591}
654 592
655/* 593/*
656 * update_object() updates the the map. 594 * update_object() updates the the map.
657 * It takes into account invisible objects (and represent squares covered 595 * It takes into account invisible objects (and represent squares covered
670 * UP_OBJ_FACE: only the objects face has changed. 608 * UP_OBJ_FACE: only the objects face has changed.
671 */ 609 */
672void 610void
673update_object (object *op, int action) 611update_object (object *op, int action)
674{ 612{
675 MoveType move_on, move_off, move_block, move_slow;
676
677 if (op == NULL) 613 if (op == NULL)
678 { 614 {
679 /* this should never happen */ 615 /* this should never happen */
680 LOG (llevDebug, "update_object() called for NULL object.\n"); 616 LOG (llevDebug, "update_object() called for NULL object.\n");
681 return; 617 return;
694 */ 630 */
695 if (!op->map || op->map->in_memory == MAP_SAVING) 631 if (!op->map || op->map->in_memory == MAP_SAVING)
696 return; 632 return;
697 633
698 /* make sure the object is within map boundaries */ 634 /* make sure the object is within map boundaries */
699 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 635 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700 { 636 {
701 LOG (llevError, "update_object() called for object out of map!\n"); 637 LOG (llevError, "update_object() called for object out of map!\n");
702#ifdef MANY_CORES 638#ifdef MANY_CORES
703 abort (); 639 abort ();
704#endif 640#endif
705 return; 641 return;
706 } 642 }
707 643
708 mapspace &m = op->ms (); 644 mapspace &m = op->ms ();
709 645
710 if (m.flags_ & P_NEED_UPDATE) 646 if (!(m.flags_ & P_UPTODATE))
711 /* nop */; 647 /* nop */;
712 else if (action == UP_OBJ_INSERT) 648 else if (action == UP_OBJ_INSERT)
713 { 649 {
714 // this is likely overkill, TODO: revisit (schmorp) 650 // this is likely overkill, TODO: revisit (schmorp)
715 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 651 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
724 /* This isn't perfect, but I don't expect a lot of objects to 660 /* This isn't perfect, but I don't expect a lot of objects to
725 * to have move_allow right now. 661 * to have move_allow right now.
726 */ 662 */
727 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 663 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
728 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 664 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729 m.flags_ = P_NEED_UPDATE; 665 m.flags_ = 0;
730 } 666 }
731 /* if the object is being removed, we can't make intelligent 667 /* if the object is being removed, we can't make intelligent
732 * decisions, because remove_ob can't really pass the object 668 * decisions, because remove_ob can't really pass the object
733 * that is being removed. 669 * that is being removed.
734 */ 670 */
735 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 671 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736 m.flags_ = P_NEED_UPDATE; 672 m.flags_ = 0;
737 else if (action == UP_OBJ_FACE) 673 else if (action == UP_OBJ_FACE)
738 /* Nothing to do for that case */ ; 674 /* Nothing to do for that case */ ;
739 else 675 else
740 LOG (llevError, "update_object called with invalid action: %d\n", action); 676 LOG (llevError, "update_object called with invalid action: %d\n", action);
741 677
742 if (op->more) 678 if (op->more)
743 update_object (op->more, action); 679 update_object (op->more, action);
744} 680}
745 681
746object::vector object::mortals;
747object::vector object::objects; // not yet used
748object *object::first;
749
750void object::free_mortals ()
751{
752 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753 if ((*i)->refcnt)
754 ++i; // further delay freeing
755 else
756 {
757 delete *i;
758 mortals.erase (i);
759 }
760}
761
762object::object () 682object::object ()
763{ 683{
764 SET_FLAG (this, FLAG_REMOVED); 684 SET_FLAG (this, FLAG_REMOVED);
765 685
766 expmul = 1.0; 686 expmul = 1.0;
767 face = blank_face; 687 face = blank_face;
768} 688}
769 689
770object::~object () 690object::~object ()
771{ 691{
692 unlink ();
693
772 free_key_values (this); 694 free_key_values (this);
773} 695}
774 696
697static int object_count;
698
775void object::link () 699void object::link ()
776{ 700{
777 count = ++ob_count; 701 assert (!index);//D
778 uuid = gen_uuid (); 702 uuid = gen_uuid ();
703 count = ++object_count;
779 704
780 prev = 0; 705 refcnt_inc ();
781 next = object::first; 706 objects.insert (this);
782
783 if (object::first)
784 object::first->prev = this;
785
786 object::first = this;
787} 707}
788 708
789void object::unlink () 709void object::unlink ()
790{ 710{
791 if (this == object::first) 711 if (!index)
792 object::first = next; 712 return;
793 713
794 /* Remove this object from the list of used objects */ 714 objects.erase (this);
795 if (prev) prev->next = next; 715 refcnt_dec ();
796 if (next) next->prev = prev; 716}
797 717
798 prev = 0; 718void
799 next = 0; 719object::activate ()
720{
721 /* If already on active list, don't do anything */
722 if (active)
723 return;
724
725 if (has_active_speed ())
726 actives.insert (this);
727}
728
729void
730object::activate_recursive ()
731{
732 activate ();
733
734 for (object *op = inv; op; op = op->below)
735 op->activate_recursive ();
736}
737
738/* This function removes object 'op' from the list of active
739 * objects.
740 * This should only be used for style maps or other such
741 * reference maps where you don't want an object that isn't
742 * in play chewing up cpu time getting processed.
743 * The reverse of this is to call update_ob_speed, which
744 * will do the right thing based on the speed of the object.
745 */
746void
747object::deactivate ()
748{
749 /* If not on the active list, nothing needs to be done */
750 if (!active)
751 return;
752
753 actives.erase (this);
754}
755
756void
757object::deactivate_recursive ()
758{
759 for (object *op = inv; op; op = op->below)
760 op->deactivate_recursive ();
761
762 deactivate ();
763}
764
765void
766object::set_flag_inv (int flag, int value)
767{
768 for (object *op = inv; op; op = op->below)
769 {
770 op->flag [flag] = value;
771 op->set_flag_inv (flag, value);
772 }
773}
774
775/*
776 * Remove and free all objects in the inventory of the given object.
777 * object.c ?
778 */
779void
780object::destroy_inv (bool drop_to_ground)
781{
782 // need to check first, because the checks below might segfault
783 // as we might be on an invalid mapspace and crossfire code
784 // is too buggy to ensure that the inventory is empty.
785 // corollary: if you create arrows etc. with stuff in tis inventory,
786 // cf will crash below with off-map x and y
787 if (!inv)
788 return;
789
790 /* Only if the space blocks everything do we not process -
791 * if some form of movement is allowed, let objects
792 * drop on that space.
793 */
794 if (!drop_to_ground
795 || !map
796 || map->in_memory != MAP_IN_MEMORY
797 || map->nodrop
798 || ms ().move_block == MOVE_ALL)
799 {
800 while (inv)
801 {
802 inv->destroy_inv (drop_to_ground);
803 inv->destroy ();
804 }
805 }
806 else
807 { /* Put objects in inventory onto this space */
808 while (inv)
809 {
810 object *op = inv;
811
812 if (op->flag [FLAG_STARTEQUIP]
813 || op->flag [FLAG_NO_DROP]
814 || op->type == RUNE
815 || op->type == TRAP
816 || op->flag [FLAG_IS_A_TEMPLATE]
817 || op->flag [FLAG_DESTROY_ON_DEATH])
818 op->destroy ();
819 else
820 map->insert (op, x, y);
821 }
822 }
800} 823}
801 824
802object *object::create () 825object *object::create ()
803{ 826{
804 object *op = new object; 827 object *op = new object;
805 op->link (); 828 op->link ();
806 return op; 829 return op;
807} 830}
808 831
809/* 832void
810 * free_object() frees everything allocated by an object, removes 833object::do_destroy ()
811 * it from the list of used objects, and puts it on the list of
812 * free objects. The IS_FREED() flag is set in the object.
813 * The object must have been removed by remove_ob() first for
814 * this function to succeed.
815 *
816 * If destroy_inventory is set, free inventory as well. Else drop items in
817 * inventory to the ground.
818 */
819void object::destroy (bool destroy_inventory)
820{ 834{
821 if (QUERY_FLAG (this, FLAG_FREED)) 835 attachable::do_destroy ();
822 return;
823 836
824 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 837 if (flag [FLAG_IS_LINKED])
838 remove_button_link (this);
839
840 if (flag [FLAG_FRIENDLY])
825 remove_friendly_object (this); 841 remove_friendly_object (this);
826 842
827 if (!QUERY_FLAG (this, FLAG_REMOVED)) 843 if (!flag [FLAG_REMOVED])
828 remove (); 844 remove ();
829 845
830 SET_FLAG (this, FLAG_FREED); 846 destroy_inv (true);
831 847
832 if (more) 848 deactivate ();
833 { 849 unlink ();
834 more->destroy (destroy_inventory);
835 more = 0;
836 }
837 850
838 if (inv) 851 flag [FLAG_FREED] = 1;
839 {
840 /* Only if the space blocks everything do we not process -
841 * if some form of movement is allowed, let objects
842 * drop on that space.
843 */
844 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845 {
846 object *op = inv;
847
848 while (op)
849 {
850 object *tmp = op->below;
851 op->destroy (destroy_inventory);
852 op = tmp;
853 }
854 }
855 else
856 { /* Put objects in inventory onto this space */
857 object *op = inv;
858
859 while (op)
860 {
861 object *tmp = op->below;
862
863 op->remove ();
864
865 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867 op->destroy ();
868 else
869 {
870 op->x = x;
871 op->y = y;
872 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873 }
874
875 op = tmp;
876 }
877 }
878 }
879 852
880 // hack to ensure that freed objects still have a valid map 853 // hack to ensure that freed objects still have a valid map
881 { 854 {
882 static maptile *freed_map; // freed objects are moved here to avoid crashes 855 static maptile *freed_map; // freed objects are moved here to avoid crashes
883 856
887 860
888 freed_map->name = "/internal/freed_objects_map"; 861 freed_map->name = "/internal/freed_objects_map";
889 freed_map->width = 3; 862 freed_map->width = 3;
890 freed_map->height = 3; 863 freed_map->height = 3;
891 864
892 freed_map->allocate (); 865 freed_map->alloc ();
866 freed_map->in_memory = MAP_IN_MEMORY;
893 } 867 }
894 868
895 map = freed_map; 869 map = freed_map;
896 x = 1; 870 x = 1;
897 y = 1; 871 y = 1;
898 } 872 }
899 873
874 head = 0;
875
876 if (more)
877 {
878 more->destroy ();
879 more = 0;
880 }
881
900 // clear those pointers that likely might have circular references to us 882 // clear those pointers that likely might have circular references to us
901 owner = 0; 883 owner = 0;
902 enemy = 0; 884 enemy = 0;
903 attacked_by = 0; 885 attacked_by = 0;
886}
904 887
905 // only relevant for players(?), but make sure of it anyways 888void
906 contr = 0; 889object::destroy (bool destroy_inventory)
890{
891 if (destroyed ())
892 return;
907 893
908 /* Remove object from the active list */ 894 if (destroy_inventory)
909 speed = 0; 895 destroy_inv (false);
910 update_ob_speed (this);
911 896
912 unlink (); 897 attachable::destroy ();
913
914 mortals.push_back (this);
915} 898}
916 899
917/* 900/*
918 * sub_weight() recursively (outwards) subtracts a number from the 901 * sub_weight() recursively (outwards) subtracts a number from the
919 * weight of an object (and what is carried by it's environment(s)). 902 * weight of an object (and what is carried by it's environment(s)).
935 * This function removes the object op from the linked list of objects 918 * This function removes the object op from the linked list of objects
936 * which it is currently tied to. When this function is done, the 919 * which it is currently tied to. When this function is done, the
937 * object will have no environment. If the object previously had an 920 * object will have no environment. If the object previously had an
938 * environment, the x and y coordinates will be updated to 921 * environment, the x and y coordinates will be updated to
939 * the previous environment. 922 * the previous environment.
940 * Beware: This function is called from the editor as well!
941 */ 923 */
942void 924void
943object::remove () 925object::do_remove ()
944{ 926{
945 object *tmp, *last = 0; 927 object *tmp, *last = 0;
946 object *otmp; 928 object *otmp;
947 929
948 int check_walk_off;
949
950 if (QUERY_FLAG (this, FLAG_REMOVED)) 930 if (QUERY_FLAG (this, FLAG_REMOVED))
951 return; 931 return;
952 932
953 SET_FLAG (this, FLAG_REMOVED); 933 SET_FLAG (this, FLAG_REMOVED);
934 INVOKE_OBJECT (REMOVE, this);
954 935
955 if (more) 936 if (more)
956 more->remove (); 937 more->remove ();
957 938
958 /* 939 /*
971 * to save cpu time. 952 * to save cpu time.
972 */ 953 */
973 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 954 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974 otmp->update_stats (); 955 otmp->update_stats ();
975 956
976 if (above != NULL) 957 if (above)
977 above->below = below; 958 above->below = below;
978 else 959 else
979 env->inv = below; 960 env->inv = below;
980 961
981 if (below != NULL) 962 if (below)
982 below->above = above; 963 below->above = above;
983 964
984 /* we set up values so that it could be inserted into 965 /* we set up values so that it could be inserted into
985 * the map, but we don't actually do that - it is up 966 * the map, but we don't actually do that - it is up
986 * to the caller to decide what we want to do. 967 * to the caller to decide what we want to do.
990 above = 0, below = 0; 971 above = 0, below = 0;
991 env = 0; 972 env = 0;
992 } 973 }
993 else if (map) 974 else if (map)
994 { 975 {
995 /* Re did the following section of code - it looks like it had 976 if (type == PLAYER)
996 * lots of logic for things we no longer care about
997 */ 977 {
978 // leaving a spot always closes any open container on the ground
979 if (container && !container->env)
980 // this causes spurious floorbox updates, but it ensures
981 // that the CLOSE event is being sent.
982 close_container ();
983
984 --map->players;
985 map->touch ();
986 }
987
988 map->dirty = true;
989 mapspace &ms = this->ms ();
998 990
999 /* link the object above us */ 991 /* link the object above us */
1000 if (above) 992 if (above)
1001 above->below = below; 993 above->below = below;
1002 else 994 else
1003 map->at (x, y).top = below; /* we were top, set new top */ 995 ms.top = below; /* we were top, set new top */
1004 996
1005 /* Relink the object below us, if there is one */ 997 /* Relink the object below us, if there is one */
1006 if (below) 998 if (below)
1007 below->above = above; 999 below->above = above;
1008 else 1000 else
1010 /* Nothing below, which means we need to relink map object for this space 1002 /* Nothing below, which means we need to relink map object for this space
1011 * use translated coordinates in case some oddness with map tiling is 1003 * use translated coordinates in case some oddness with map tiling is
1012 * evident 1004 * evident
1013 */ 1005 */
1014 if (GET_MAP_OB (map, x, y) != this) 1006 if (GET_MAP_OB (map, x, y) != this)
1015 {
1016 char *dump = dump_object (this);
1017 LOG (llevError,
1018 "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); 1007 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 ());
1019 free (dump);
1020 dump = dump_object (GET_MAP_OB (map, x, y));
1021 LOG (llevError, "%s\n", dump);
1022 free (dump);
1023 }
1024 1008
1025 map->at (x, y).bottom = above; /* goes on above it. */ 1009 ms.bot = above; /* goes on above it. */
1026 } 1010 }
1027 1011
1028 above = 0; 1012 above = 0;
1029 below = 0; 1013 below = 0;
1030 1014
1031 if (map->in_memory == MAP_SAVING) 1015 if (map->in_memory == MAP_SAVING)
1032 return; 1016 return;
1033 1017
1034 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1018 int check_walk_off = !flag [FLAG_NO_APPLY];
1035 1019
1036 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1020 for (tmp = ms.bot; tmp; tmp = tmp->above)
1037 { 1021 {
1038 /* No point updating the players look faces if he is the object 1022 /* No point updating the players look faces if he is the object
1039 * being removed. 1023 * being removed.
1040 */ 1024 */
1041 1025
1045 * removed (most likely destroyed), update the player view 1029 * removed (most likely destroyed), update the player view
1046 * appropriately. 1030 * appropriately.
1047 */ 1031 */
1048 if (tmp->container == this) 1032 if (tmp->container == this)
1049 { 1033 {
1050 CLEAR_FLAG (this, FLAG_APPLIED); 1034 flag [FLAG_APPLIED] = 0;
1051 tmp->container = 0; 1035 tmp->container = 0;
1052 } 1036 }
1053 1037
1038 if (tmp->contr->ns)
1054 tmp->contr->ns->floorbox_update (); 1039 tmp->contr->ns->floorbox_update ();
1055 } 1040 }
1056 1041
1057 /* See if player moving off should effect something */ 1042 /* See if object moving off should effect something */
1058 if (check_walk_off 1043 if (check_walk_off
1059 && ((move_type & tmp->move_off) 1044 && ((move_type & tmp->move_off)
1060 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1045 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061 { 1046 {
1062 move_apply (tmp, this, 0); 1047 move_apply (tmp, this, 0);
1064 if (destroyed ()) 1049 if (destroyed ())
1065 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1050 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066 } 1051 }
1067 1052
1068 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1053 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069 1054 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1070 if (tmp->above == tmp) 1055 if (tmp->above == tmp)
1071 tmp->above = 0; 1056 tmp->above = 0;
1072 1057
1073 last = tmp; 1058 last = tmp;
1074 } 1059 }
1075 1060
1076 /* last == NULL of there are no objects on this space */ 1061 /* last == NULL if there are no objects on this space */
1062 //TODO: this makes little sense, why only update the topmost object?
1077 if (!last) 1063 if (!last)
1078 map->at (x, y).flags_ = P_NEED_UPDATE; 1064 map->at (x, y).flags_ = 0;
1079 else 1065 else
1080 update_object (last, UP_OBJ_REMOVE); 1066 update_object (last, UP_OBJ_REMOVE);
1081 1067
1082 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1068 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083 update_all_los (map, x, y); 1069 update_all_los (map, x, y);
1084 } 1070 }
1085} 1071}
1086 1072
1087/* 1073/*
1096merge_ob (object *op, object *top) 1082merge_ob (object *op, object *top)
1097{ 1083{
1098 if (!op->nrof) 1084 if (!op->nrof)
1099 return 0; 1085 return 0;
1100 1086
1101 if (top == NULL) 1087 if (top)
1102 for (top = op; top != NULL && top->above != NULL; top = top->above); 1088 for (top = op; top && top->above; top = top->above)
1089 ;
1103 1090
1104 for (; top != NULL; top = top->below) 1091 for (; top; top = top->below)
1105 { 1092 {
1106 if (top == op) 1093 if (top == op)
1107 continue; 1094 continue;
1108 1095
1109 if (object::can_merge (op, top)) 1096 if (object::can_merge (op, top))
1118 } 1105 }
1119 1106
1120 return 0; 1107 return 0;
1121} 1108}
1122 1109
1110void
1111object::expand_tail ()
1112{
1113 if (more)
1114 return;
1115
1116 object *prev = this;
1117
1118 for (archetype *at = arch->more; at; at = at->more)
1119 {
1120 object *op = arch_to_object (at);
1121
1122 op->name = name;
1123 op->name_pl = name_pl;
1124 op->title = title;
1125
1126 op->head = this;
1127 prev->more = op;
1128
1129 prev = op;
1130 }
1131}
1132
1123/* 1133/*
1124 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1134 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1125 * job preparing multi-part monsters 1135 * job preparing multi-part monsters.
1126 */ 1136 */
1127object * 1137object *
1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1138insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129{ 1139{
1130 object *tmp;
1131
1132 if (op->head)
1133 op = op->head;
1134
1135 for (tmp = op; tmp; tmp = tmp->more) 1140 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136 { 1141 {
1137 tmp->x = x + tmp->arch->clone.x; 1142 tmp->x = x + tmp->arch->clone.x;
1138 tmp->y = y + tmp->arch->clone.y; 1143 tmp->y = y + tmp->arch->clone.y;
1139 } 1144 }
1140 1145
1159 * Return value: 1164 * Return value:
1160 * new object if 'op' was merged with other object 1165 * new object if 'op' was merged with other object
1161 * NULL if 'op' was destroyed 1166 * NULL if 'op' was destroyed
1162 * just 'op' otherwise 1167 * just 'op' otherwise
1163 */ 1168 */
1164
1165object * 1169object *
1166insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1170insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167{ 1171{
1172 assert (!op->flag [FLAG_FREED]);
1173
1168 object *tmp, *top, *floor = NULL; 1174 object *tmp, *top, *floor = NULL;
1169 sint16 x, y;
1170 1175
1171 if (QUERY_FLAG (op, FLAG_FREED)) 1176 op->remove ();
1172 {
1173 LOG (llevError, "Trying to insert freed object!\n");
1174 return NULL;
1175 }
1176 1177
1177 if (m == NULL) 1178#if 0
1178 { 1179 if (!m->active != !op->active)
1179 char *dump = dump_object (op); 1180 if (m->active)
1180 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1181 op->activate_recursive ();
1181 free (dump); 1182 else
1182 return op; 1183 op->deactivate_recursive ();
1183 } 1184#endif
1184 1185
1185 if (out_of_map (m, op->x, op->y)) 1186 if (out_of_map (m, op->x, op->y))
1186 { 1187 {
1187 char *dump = dump_object (op);
1188 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1188 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189#ifdef MANY_CORES 1189#ifdef MANY_CORES
1190 /* Better to catch this here, as otherwise the next use of this object 1190 /* Better to catch this here, as otherwise the next use of this object
1191 * is likely to cause a crash. Better to find out where it is getting 1191 * is likely to cause a crash. Better to find out where it is getting
1192 * improperly inserted. 1192 * improperly inserted.
1193 */ 1193 */
1194 abort (); 1194 abort ();
1195#endif 1195#endif
1196 free (dump);
1197 return op; 1196 return op;
1198 } 1197 }
1199 1198
1200 if (!QUERY_FLAG (op, FLAG_REMOVED))
1201 {
1202 char *dump = dump_object (op);
1203 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204 free (dump);
1205 return op;
1206 }
1207
1208 if (op->more != NULL)
1209 {
1210 /* The part may be on a different map. */
1211
1212 object *more = op->more; 1199 if (object *more = op->more)
1213 1200 {
1214 /* We really need the caller to normalize coordinates - if
1215 * we set the map, that doesn't work if the location is within
1216 * a map and this is straddling an edge. So only if coordinate
1217 * is clear wrong do we normalize it.
1218 */
1219 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220 more->map = get_map_from_coord (m, &more->x, &more->y);
1221 else if (!more->map)
1222 {
1223 /* For backwards compatibility - when not dealing with tiled maps,
1224 * more->map should always point to the parent.
1225 */
1226 more->map = m;
1227 }
1228
1229 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1201 if (!insert_ob_in_map (more, m, originator, flag))
1230 { 1202 {
1231 if (!op->head) 1203 if (!op->head)
1232 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1204 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233 1205
1234 return NULL; 1206 return 0;
1235 } 1207 }
1236 } 1208 }
1237 1209
1238 CLEAR_FLAG (op, FLAG_REMOVED); 1210 CLEAR_FLAG (op, FLAG_REMOVED);
1239 1211
1240 /* Ideally, the caller figures this out. However, it complicates a lot 1212 /* Ideally, the caller figures this out. However, it complicates a lot
1241 * of areas of callers (eg, anything that uses find_free_spot would now 1213 * of areas of callers (eg, anything that uses find_free_spot would now
1242 * need extra work 1214 * need extra work
1243 */ 1215 */
1244 op->map = get_map_from_coord (m, &op->x, &op->y); 1216 if (!xy_normalise (m, op->x, op->y))
1245 x = op->x; 1217 return 0;
1246 y = op->y; 1218
1219 op->map = m;
1220 mapspace &ms = op->ms ();
1247 1221
1248 /* this has to be done after we translate the coordinates. 1222 /* this has to be done after we translate the coordinates.
1249 */ 1223 */
1250 if (op->nrof && !(flag & INS_NO_MERGE)) 1224 if (op->nrof && !(flag & INS_NO_MERGE))
1251 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1225 for (tmp = ms.bot; tmp; tmp = tmp->above)
1252 if (object::can_merge (op, tmp)) 1226 if (object::can_merge (op, tmp))
1253 { 1227 {
1254 op->nrof += tmp->nrof; 1228 op->nrof += tmp->nrof;
1255 tmp->destroy (); 1229 tmp->destroy ();
1256 } 1230 }
1273 op->below = originator->below; 1247 op->below = originator->below;
1274 1248
1275 if (op->below) 1249 if (op->below)
1276 op->below->above = op; 1250 op->below->above = op;
1277 else 1251 else
1278 op->ms ().bottom = op; 1252 ms.bot = op;
1279 1253
1280 /* since *below* originator, no need to update top */ 1254 /* since *below* originator, no need to update top */
1281 originator->below = op; 1255 originator->below = op;
1282 } 1256 }
1283 else 1257 else
1284 { 1258 {
1259 top = ms.bot;
1260
1285 /* If there are other objects, then */ 1261 /* If there are other objects, then */
1286 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1262 if ((!(flag & INS_MAP_LOAD)) && top)
1287 { 1263 {
1288 object *last = NULL; 1264 object *last = 0;
1289 1265
1290 /* 1266 /*
1291 * If there are multiple objects on this space, we do some trickier handling. 1267 * If there are multiple objects on this space, we do some trickier handling.
1292 * We've already dealt with merging if appropriate. 1268 * We've already dealt with merging if appropriate.
1293 * Generally, we want to put the new object on top. But if 1269 * Generally, we want to put the new object on top. But if
1297 * once we get to them. This reduces the need to traverse over all of 1273 * once we get to them. This reduces the need to traverse over all of
1298 * them when adding another one - this saves quite a bit of cpu time 1274 * them when adding another one - this saves quite a bit of cpu time
1299 * when lots of spells are cast in one area. Currently, it is presumed 1275 * when lots of spells are cast in one area. Currently, it is presumed
1300 * that flying non pickable objects are spell objects. 1276 * that flying non pickable objects are spell objects.
1301 */ 1277 */
1302 1278 for (top = ms.bot; top; top = top->above)
1303 while (top != NULL)
1304 { 1279 {
1305 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1280 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306 floor = top; 1281 floor = top;
1307 1282
1308 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1283 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1311 top = top->below; 1286 top = top->below;
1312 break; 1287 break;
1313 } 1288 }
1314 1289
1315 last = top; 1290 last = top;
1316 top = top->above;
1317 } 1291 }
1318 1292
1319 /* Don't want top to be NULL, so set it to the last valid object */ 1293 /* Don't want top to be NULL, so set it to the last valid object */
1320 top = last; 1294 top = last;
1321 1295
1323 * looks like instead of lots of conditions here. 1297 * looks like instead of lots of conditions here.
1324 * makes things faster, and effectively the same result. 1298 * makes things faster, and effectively the same result.
1325 */ 1299 */
1326 1300
1327 /* Have object 'fall below' other objects that block view. 1301 /* Have object 'fall below' other objects that block view.
1328 * Unless those objects are exits, type 66 1302 * Unless those objects are exits.
1329 * If INS_ON_TOP is used, don't do this processing 1303 * If INS_ON_TOP is used, don't do this processing
1330 * Need to find the object that in fact blocks view, otherwise 1304 * Need to find the object that in fact blocks view, otherwise
1331 * stacking is a bit odd. 1305 * stacking is a bit odd.
1332 */ 1306 */
1333 if (!(flag & INS_ON_TOP) && 1307 if (!(flag & INS_ON_TOP)
1334 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1308 && ms.flags () & P_BLOCKSVIEW
1309 && (op->face && !faces [op->face].visibility))
1335 { 1310 {
1336 for (last = top; last != floor; last = last->below) 1311 for (last = top; last != floor; last = last->below)
1337 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1312 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338 break; 1313 break;
1314
1339 /* Check to see if we found the object that blocks view, 1315 /* Check to see if we found the object that blocks view,
1340 * and make sure we have a below pointer for it so that 1316 * and make sure we have a below pointer for it so that
1341 * we can get inserted below this one, which requires we 1317 * we can get inserted below this one, which requires we
1342 * set top to the object below us. 1318 * set top to the object below us.
1343 */ 1319 */
1345 top = last->below; 1321 top = last->below;
1346 } 1322 }
1347 } /* If objects on this space */ 1323 } /* If objects on this space */
1348 1324
1349 if (flag & INS_MAP_LOAD) 1325 if (flag & INS_MAP_LOAD)
1350 top = GET_MAP_TOP (op->map, op->x, op->y); 1326 top = ms.top;
1351 1327
1352 if (flag & INS_ABOVE_FLOOR_ONLY) 1328 if (flag & INS_ABOVE_FLOOR_ONLY)
1353 top = floor; 1329 top = floor;
1354 1330
1355 /* Top is the object that our object (op) is going to get inserted above. 1331 /* Top is the object that our object (op) is going to get inserted above.
1356 */ 1332 */
1357 1333
1358 /* First object on this space */ 1334 /* First object on this space */
1359 if (!top) 1335 if (!top)
1360 { 1336 {
1361 op->above = GET_MAP_OB (op->map, op->x, op->y); 1337 op->above = ms.bot;
1362 1338
1363 if (op->above) 1339 if (op->above)
1364 op->above->below = op; 1340 op->above->below = op;
1365 1341
1366 op->below = NULL; 1342 op->below = 0;
1367 op->ms ().bottom = op; 1343 ms.bot = op;
1368 } 1344 }
1369 else 1345 else
1370 { /* get inserted into the stack above top */ 1346 { /* get inserted into the stack above top */
1371 op->above = top->above; 1347 op->above = top->above;
1372 1348
1375 1351
1376 op->below = top; 1352 op->below = top;
1377 top->above = op; 1353 top->above = op;
1378 } 1354 }
1379 1355
1380 if (op->above == NULL) 1356 if (!op->above)
1381 op->ms ().top = op; 1357 ms.top = op;
1382 } /* else not INS_BELOW_ORIGINATOR */ 1358 } /* else not INS_BELOW_ORIGINATOR */
1383 1359
1384 if (op->type == PLAYER) 1360 if (op->type == PLAYER)
1361 {
1385 op->contr->do_los = 1; 1362 op->contr->do_los = 1;
1363 ++op->map->players;
1364 op->map->touch ();
1365 }
1366
1367 op->map->dirty = true;
1386 1368
1387 /* If we have a floor, we know the player, if any, will be above 1369 /* If we have a floor, we know the player, if any, will be above
1388 * it, so save a few ticks and start from there. 1370 * it, so save a few ticks and start from there.
1389 */ 1371 */
1390 if (!(flag & INS_MAP_LOAD)) 1372 if (!(flag & INS_MAP_LOAD))
1391 if (object *pl = op->ms ().player ()) 1373 if (object *pl = ms.player ())
1374 if (pl->contr->ns)
1392 pl->contr->ns->floorbox_update (); 1375 pl->contr->ns->floorbox_update ();
1393 1376
1394 /* If this object glows, it may affect lighting conditions that are 1377 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1378 * visible to others on this map. But update_all_los is really
1396 * an inefficient way to do this, as it means los for all players 1379 * an inefficient way to do this, as it means los for all players
1397 * on the map will get recalculated. The players could very well 1380 * on the map will get recalculated. The players could very well
1398 * be far away from this change and not affected in any way - 1381 * be far away from this change and not affected in any way -
1399 * this should get redone to only look for players within range, 1382 * this should get redone to only look for players within range,
1400 * or just updating the P_NEED_UPDATE for spaces within this area 1383 * or just updating the P_UPTODATE for spaces within this area
1401 * of effect may be sufficient. 1384 * of effect may be sufficient.
1402 */ 1385 */
1403 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1386 if (op->map->darkness && (op->glow_radius != 0))
1404 update_all_los (op->map, op->x, op->y); 1387 update_all_los (op->map, op->x, op->y);
1405 1388
1406 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1389 /* updates flags (blocked, alive, no magic, etc) for this map space */
1407 update_object (op, UP_OBJ_INSERT); 1390 update_object (op, UP_OBJ_INSERT);
1391
1392 INVOKE_OBJECT (INSERT, op);
1408 1393
1409 /* Don't know if moving this to the end will break anything. However, 1394 /* Don't know if moving this to the end will break anything. However,
1410 * we want to have floorbox_update called before calling this. 1395 * we want to have floorbox_update called before calling this.
1411 * 1396 *
1412 * check_move_on() must be after this because code called from 1397 * check_move_on() must be after this because code called from
1417 1402
1418 /* if this is not the head or flag has been passed, don't check walk on status */ 1403 /* if this is not the head or flag has been passed, don't check walk on status */
1419 if (!(flag & INS_NO_WALK_ON) && !op->head) 1404 if (!(flag & INS_NO_WALK_ON) && !op->head)
1420 { 1405 {
1421 if (check_move_on (op, originator)) 1406 if (check_move_on (op, originator))
1422 return NULL; 1407 return 0;
1423 1408
1424 /* If we are a multi part object, lets work our way through the check 1409 /* If we are a multi part object, lets work our way through the check
1425 * walk on's. 1410 * walk on's.
1426 */ 1411 */
1427 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1412 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1428 if (check_move_on (tmp, originator)) 1413 if (check_move_on (tmp, originator))
1429 return NULL; 1414 return 0;
1430 } 1415 }
1431 1416
1432 return op; 1417 return op;
1433} 1418}
1434 1419
1441{ 1426{
1442 object *tmp, *tmp1; 1427 object *tmp, *tmp1;
1443 1428
1444 /* first search for itself and remove any old instances */ 1429 /* first search for itself and remove any old instances */
1445 1430
1446 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1431 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1432 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1448 tmp->destroy (); 1433 tmp->destroy ();
1449 1434
1450 tmp1 = arch_to_object (archetype::find (arch_string)); 1435 tmp1 = arch_to_object (archetype::find (arch_string));
1451 1436
1452 tmp1->x = op->x; 1437 tmp1->x = op->x;
1453 tmp1->y = op->y; 1438 tmp1->y = op->y;
1454 insert_ob_in_map (tmp1, op->map, op, 0); 1439 insert_ob_in_map (tmp1, op->map, op, 0);
1440}
1441
1442object *
1443object::insert_at (object *where, object *originator, int flags)
1444{
1445 return where->map->insert (this, where->x, where->y, originator, flags);
1455} 1446}
1456 1447
1457/* 1448/*
1458 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1449 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1459 * is returned contains nr objects, and the remaining parts contains 1450 * is returned contains nr objects, and the remaining parts contains
1460 * the rest (or is removed and freed if that number is 0). 1451 * the rest (or is removed and freed if that number is 0).
1461 * On failure, NULL is returned, and the reason put into the 1452 * On failure, NULL is returned, and the reason put into the
1462 * global static errmsg array. 1453 * global static errmsg array.
1463 */ 1454 */
1464
1465object * 1455object *
1466get_split_ob (object *orig_ob, uint32 nr) 1456get_split_ob (object *orig_ob, uint32 nr)
1467{ 1457{
1468 object *newob; 1458 object *newob;
1469 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1459 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1500 * the amount of an object. If the amount reaches 0, the object 1490 * the amount of an object. If the amount reaches 0, the object
1501 * is subsequently removed and freed. 1491 * is subsequently removed and freed.
1502 * 1492 *
1503 * Return value: 'op' if something is left, NULL if the amount reached 0 1493 * Return value: 'op' if something is left, NULL if the amount reached 0
1504 */ 1494 */
1505
1506object * 1495object *
1507decrease_ob_nr (object *op, uint32 i) 1496decrease_ob_nr (object *op, uint32 i)
1508{ 1497{
1509 object *tmp; 1498 object *tmp;
1510 1499
1585 1574
1586/* 1575/*
1587 * add_weight(object, weight) adds the specified weight to an object, 1576 * add_weight(object, weight) adds the specified weight to an object,
1588 * and also updates how much the environment(s) is/are carrying. 1577 * and also updates how much the environment(s) is/are carrying.
1589 */ 1578 */
1590
1591void 1579void
1592add_weight (object *op, signed long weight) 1580add_weight (object *op, signed long weight)
1593{ 1581{
1594 while (op != NULL) 1582 while (op != NULL)
1595 { 1583 {
1627 * inside the object environment. 1615 * inside the object environment.
1628 * 1616 *
1629 * The function returns now pointer to inserted item, and return value can 1617 * The function returns now pointer to inserted item, and return value can
1630 * be != op, if items are merged. -Tero 1618 * be != op, if items are merged. -Tero
1631 */ 1619 */
1632
1633object * 1620object *
1634object::insert (object *op) 1621object::insert (object *op)
1635{ 1622{
1636 object *tmp, *otmp; 1623 object *tmp, *otmp;
1637 1624
1692 if ((op->glow_radius != 0) && map) 1679 if ((op->glow_radius != 0) && map)
1693 { 1680 {
1694#ifdef DEBUG_LIGHTS 1681#ifdef DEBUG_LIGHTS
1695 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1682 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1696#endif /* DEBUG_LIGHTS */ 1683#endif /* DEBUG_LIGHTS */
1697 if (MAP_DARKNESS (map)) 1684 if (map->darkness)
1698 update_all_los (map, x, y); 1685 update_all_los (map, x, y);
1699 } 1686 }
1700 1687
1701 /* Client has no idea of ordering so lets not bother ordering it here. 1688 /* Client has no idea of ordering so lets not bother ordering it here.
1702 * It sure simplifies this function... 1689 * It sure simplifies this function...
1707 { 1694 {
1708 op->below = inv; 1695 op->below = inv;
1709 op->below->above = op; 1696 op->below->above = op;
1710 inv = op; 1697 inv = op;
1711 } 1698 }
1699
1700 INVOKE_OBJECT (INSERT, this);
1712 1701
1713 return op; 1702 return op;
1714} 1703}
1715 1704
1716/* 1705/*
1731 * 1720 *
1732 * MSW 2001-07-08: Check all objects on space, not just those below 1721 * MSW 2001-07-08: Check all objects on space, not just those below
1733 * object being inserted. insert_ob_in_map may not put new objects 1722 * object being inserted. insert_ob_in_map may not put new objects
1734 * on top. 1723 * on top.
1735 */ 1724 */
1736
1737int 1725int
1738check_move_on (object *op, object *originator) 1726check_move_on (object *op, object *originator)
1739{ 1727{
1740 object *tmp; 1728 object *tmp;
1741 maptile *m = op->map; 1729 maptile *m = op->map;
1768 1756
1769 /* The objects have to be checked from top to bottom. 1757 /* The objects have to be checked from top to bottom.
1770 * Hence, we first go to the top: 1758 * Hence, we first go to the top:
1771 */ 1759 */
1772 1760
1773 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1761 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1774 { 1762 {
1775 /* Trim the search when we find the first other spell effect 1763 /* Trim the search when we find the first other spell effect
1776 * this helps performance so that if a space has 50 spell objects, 1764 * this helps performance so that if a space has 50 spell objects,
1777 * we don't need to check all of them. 1765 * we don't need to check all of them.
1778 */ 1766 */
1796 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1784 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1797 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1785 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1798 { 1786 {
1799 1787
1800 float 1788 float
1801 diff = tmp->move_slow_penalty * FABS (op->speed); 1789 diff = tmp->move_slow_penalty * fabs (op->speed);
1802 1790
1803 if (op->type == PLAYER) 1791 if (op->type == PLAYER)
1804 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1792 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1805 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1793 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1806 diff /= 4.0; 1794 diff /= 4.0;
1833/* 1821/*
1834 * present_arch(arch, map, x, y) searches for any objects with 1822 * present_arch(arch, map, x, y) searches for any objects with
1835 * a matching archetype at the given map and coordinates. 1823 * a matching archetype at the given map and coordinates.
1836 * The first matching object is returned, or NULL if none. 1824 * The first matching object is returned, or NULL if none.
1837 */ 1825 */
1838
1839object * 1826object *
1840present_arch (const archetype *at, maptile *m, int x, int y) 1827present_arch (const archetype *at, maptile *m, int x, int y)
1841{ 1828{
1842 object *
1843 tmp;
1844
1845 if (m == NULL || out_of_map (m, x, y)) 1829 if (!m || out_of_map (m, x, y))
1846 { 1830 {
1847 LOG (llevError, "Present_arch called outside map.\n"); 1831 LOG (llevError, "Present_arch called outside map.\n");
1848 return NULL; 1832 return NULL;
1849 } 1833 }
1850 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1834
1835 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1851 if (tmp->arch == at) 1836 if (tmp->arch == at)
1852 return tmp; 1837 return tmp;
1838
1853 return NULL; 1839 return NULL;
1854} 1840}
1855 1841
1856/* 1842/*
1857 * present(type, map, x, y) searches for any objects with 1843 * present(type, map, x, y) searches for any objects with
1858 * a matching type variable at the given map and coordinates. 1844 * a matching type variable at the given map and coordinates.
1859 * The first matching object is returned, or NULL if none. 1845 * The first matching object is returned, or NULL if none.
1860 */ 1846 */
1861
1862object * 1847object *
1863present (unsigned char type, maptile *m, int x, int y) 1848present (unsigned char type, maptile *m, int x, int y)
1864{ 1849{
1865 object *
1866 tmp;
1867
1868 if (out_of_map (m, x, y)) 1850 if (out_of_map (m, x, y))
1869 { 1851 {
1870 LOG (llevError, "Present called outside map.\n"); 1852 LOG (llevError, "Present called outside map.\n");
1871 return NULL; 1853 return NULL;
1872 } 1854 }
1873 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1855
1856 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1874 if (tmp->type == type) 1857 if (tmp->type == type)
1875 return tmp; 1858 return tmp;
1859
1876 return NULL; 1860 return NULL;
1877} 1861}
1878 1862
1879/* 1863/*
1880 * present_in_ob(type, object) searches for any objects with 1864 * present_in_ob(type, object) searches for any objects with
1881 * a matching type variable in the inventory of the given object. 1865 * a matching type variable in the inventory of the given object.
1882 * The first matching object is returned, or NULL if none. 1866 * The first matching object is returned, or NULL if none.
1883 */ 1867 */
1884
1885object * 1868object *
1886present_in_ob (unsigned char type, const object *op) 1869present_in_ob (unsigned char type, const object *op)
1887{ 1870{
1888 object *
1889 tmp;
1890
1891 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1871 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1892 if (tmp->type == type) 1872 if (tmp->type == type)
1893 return tmp; 1873 return tmp;
1874
1894 return NULL; 1875 return NULL;
1895} 1876}
1896 1877
1897/* 1878/*
1898 * present_in_ob (type, str, object) searches for any objects with 1879 * present_in_ob (type, str, object) searches for any objects with
1906 * str is the string to match against. Note that we match against 1887 * str is the string to match against. Note that we match against
1907 * the object name, not the archetype name. this is so that the 1888 * the object name, not the archetype name. this is so that the
1908 * spell code can use one object type (force), but change it's name 1889 * spell code can use one object type (force), but change it's name
1909 * to be unique. 1890 * to be unique.
1910 */ 1891 */
1911
1912object * 1892object *
1913present_in_ob_by_name (int type, const char *str, const object *op) 1893present_in_ob_by_name (int type, const char *str, const object *op)
1914{ 1894{
1915 object *
1916 tmp;
1917
1918 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1895 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919 {
1920 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1896 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1921 return tmp; 1897 return tmp;
1922 } 1898
1923 return NULL; 1899 return 0;
1924} 1900}
1925 1901
1926/* 1902/*
1927 * present_arch_in_ob(archetype, object) searches for any objects with 1903 * present_arch_in_ob(archetype, object) searches for any objects with
1928 * a matching archetype in the inventory of the given object. 1904 * a matching archetype in the inventory of the given object.
1929 * The first matching object is returned, or NULL if none. 1905 * The first matching object is returned, or NULL if none.
1930 */ 1906 */
1931
1932object * 1907object *
1933present_arch_in_ob (const archetype *at, const object *op) 1908present_arch_in_ob (const archetype *at, const object *op)
1934{ 1909{
1935 object *
1936 tmp;
1937
1938 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1910 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1939 if (tmp->arch == at) 1911 if (tmp->arch == at)
1940 return tmp; 1912 return tmp;
1913
1941 return NULL; 1914 return NULL;
1942} 1915}
1943 1916
1944/* 1917/*
1945 * activate recursively a flag on an object inventory 1918 * activate recursively a flag on an object inventory
1946 */ 1919 */
1947void 1920void
1948flag_inv (object *op, int flag) 1921flag_inv (object *op, int flag)
1949{ 1922{
1950 object *
1951 tmp;
1952
1953 if (op->inv) 1923 if (op->inv)
1954 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1924 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1955 { 1925 {
1956 SET_FLAG (tmp, flag); 1926 SET_FLAG (tmp, flag);
1957 flag_inv (tmp, flag); 1927 flag_inv (tmp, flag);
1958 } 1928 }
1959} /* 1929}
1930
1931/*
1960 * desactivate recursively a flag on an object inventory 1932 * deactivate recursively a flag on an object inventory
1961 */ 1933 */
1962void 1934void
1963unflag_inv (object *op, int flag) 1935unflag_inv (object *op, int flag)
1964{ 1936{
1965 object *
1966 tmp;
1967
1968 if (op->inv) 1937 if (op->inv)
1969 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1938 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1970 { 1939 {
1971 CLEAR_FLAG (tmp, flag); 1940 CLEAR_FLAG (tmp, flag);
1972 unflag_inv (tmp, flag); 1941 unflag_inv (tmp, flag);
1973 } 1942 }
1974} 1943}
1977 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1946 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1978 * all it's inventory (recursively). 1947 * all it's inventory (recursively).
1979 * If checksums are used, a player will get set_cheat called for 1948 * If checksums are used, a player will get set_cheat called for
1980 * him/her-self and all object carried by a call to this function. 1949 * him/her-self and all object carried by a call to this function.
1981 */ 1950 */
1982
1983void 1951void
1984set_cheat (object *op) 1952set_cheat (object *op)
1985{ 1953{
1986 SET_FLAG (op, FLAG_WAS_WIZ); 1954 SET_FLAG (op, FLAG_WAS_WIZ);
1987 flag_inv (op, FLAG_WAS_WIZ); 1955 flag_inv (op, FLAG_WAS_WIZ);
2006 * because arch_blocked (now ob_blocked) needs to know the movement type 1974 * because arch_blocked (now ob_blocked) needs to know the movement type
2007 * to know if the space in question will block the object. We can't use 1975 * to know if the space in question will block the object. We can't use
2008 * the archetype because that isn't correct if the monster has been 1976 * the archetype because that isn't correct if the monster has been
2009 * customized, changed states, etc. 1977 * customized, changed states, etc.
2010 */ 1978 */
2011
2012int 1979int
2013find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1980find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2014{ 1981{
2015 int
2016 i,
2017 index = 0, flag; 1982 int index = 0, flag;
2018 static int
2019 altern[SIZEOFFREE]; 1983 int altern[SIZEOFFREE];
2020 1984
2021 for (i = start; i < stop; i++) 1985 for (int i = start; i < stop; i++)
2022 { 1986 {
2023 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1987 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2024 if (!flag) 1988 if (!flag)
2025 altern[index++] = i; 1989 altern [index++] = i;
2026 1990
2027 /* Basically, if we find a wall on a space, we cut down the search size. 1991 /* Basically, if we find a wall on a space, we cut down the search size.
2028 * In this way, we won't return spaces that are on another side of a wall. 1992 * In this way, we won't return spaces that are on another side of a wall.
2029 * This mostly work, but it cuts down the search size in all directions - 1993 * This mostly work, but it cuts down the search size in all directions -
2030 * if the space being examined only has a wall to the north and empty 1994 * if the space being examined only has a wall to the north and empty
2037 } 2001 }
2038 2002
2039 if (!index) 2003 if (!index)
2040 return -1; 2004 return -1;
2041 2005
2042 return altern[RANDOM () % index]; 2006 return altern [rndm (index)];
2043} 2007}
2044 2008
2045/* 2009/*
2046 * find_first_free_spot(archetype, maptile, x, y) works like 2010 * find_first_free_spot(archetype, maptile, x, y) works like
2047 * find_free_spot(), but it will search max number of squares. 2011 * find_free_spot(), but it will search max number of squares.
2048 * But it will return the first available spot, not a random choice. 2012 * But it will return the first available spot, not a random choice.
2049 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2013 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2050 */ 2014 */
2051
2052int 2015int
2053find_first_free_spot (const object *ob, maptile *m, int x, int y) 2016find_first_free_spot (const object *ob, maptile *m, int x, int y)
2054{ 2017{
2055 int
2056 i;
2057
2058 for (i = 0; i < SIZEOFFREE; i++) 2018 for (int i = 0; i < SIZEOFFREE; i++)
2059 {
2060 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2019 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2061 return i; 2020 return i;
2062 } 2021
2063 return -1; 2022 return -1;
2064} 2023}
2065 2024
2066/* 2025/*
2067 * The function permute(arr, begin, end) randomly reorders the array 2026 * The function permute(arr, begin, end) randomly reorders the array
2068 * arr[begin..end-1]. 2027 * arr[begin..end-1].
2028 * now uses a fisher-yates shuffle, old permute was broken
2069 */ 2029 */
2070static void 2030static void
2071permute (int *arr, int begin, int end) 2031permute (int *arr, int begin, int end)
2072{ 2032{
2073 int 2033 arr += begin;
2074 i,
2075 j,
2076 tmp,
2077 len;
2078
2079 len = end - begin; 2034 end -= begin;
2080 for (i = begin; i < end; i++)
2081 {
2082 j = begin + RANDOM () % len;
2083 2035
2084 tmp = arr[i]; 2036 while (--end)
2085 arr[i] = arr[j]; 2037 swap (arr [end], arr [rndm (end + 1)]);
2086 arr[j] = tmp;
2087 }
2088} 2038}
2089 2039
2090/* new function to make monster searching more efficient, and effective! 2040/* new function to make monster searching more efficient, and effective!
2091 * This basically returns a randomized array (in the passed pointer) of 2041 * This basically returns a randomized array (in the passed pointer) of
2092 * the spaces to find monsters. In this way, it won't always look for 2042 * the spaces to find monsters. In this way, it won't always look for
2095 * the 3x3 area will be searched, just not in a predictable order. 2045 * the 3x3 area will be searched, just not in a predictable order.
2096 */ 2046 */
2097void 2047void
2098get_search_arr (int *search_arr) 2048get_search_arr (int *search_arr)
2099{ 2049{
2100 int 2050 int i;
2101 i;
2102 2051
2103 for (i = 0; i < SIZEOFFREE; i++) 2052 for (i = 0; i < SIZEOFFREE; i++)
2104 {
2105 search_arr[i] = i; 2053 search_arr[i] = i;
2106 }
2107 2054
2108 permute (search_arr, 1, SIZEOFFREE1 + 1); 2055 permute (search_arr, 1, SIZEOFFREE1 + 1);
2109 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2056 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2110 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2057 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2111} 2058}
2120 * Perhaps incorrectly, but I'm making the assumption that exclude 2067 * Perhaps incorrectly, but I'm making the assumption that exclude
2121 * is actually want is going to try and move there. We need this info 2068 * is actually want is going to try and move there. We need this info
2122 * because we have to know what movement the thing looking to move 2069 * because we have to know what movement the thing looking to move
2123 * there is capable of. 2070 * there is capable of.
2124 */ 2071 */
2125
2126int 2072int
2127find_dir (maptile *m, int x, int y, object *exclude) 2073find_dir (maptile *m, int x, int y, object *exclude)
2128{ 2074{
2129 int
2130 i,
2131 max = SIZEOFFREE, mflags; 2075 int i, max = SIZEOFFREE, mflags;
2132 2076
2133 sint16 nx, ny; 2077 sint16 nx, ny;
2134 object * 2078 object *tmp;
2135 tmp;
2136 maptile * 2079 maptile *mp;
2137 mp;
2138 2080
2139 MoveType blocked, move_type; 2081 MoveType blocked, move_type;
2140 2082
2141 if (exclude && exclude->head) 2083 if (exclude && exclude->head)
2142 { 2084 {
2159 2101
2160 if (mflags & P_OUT_OF_MAP) 2102 if (mflags & P_OUT_OF_MAP)
2161 max = maxfree[i]; 2103 max = maxfree[i];
2162 else 2104 else
2163 { 2105 {
2164 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2106 mapspace &ms = mp->at (nx, ny);
2107
2108 blocked = ms.move_block;
2165 2109
2166 if ((move_type & blocked) == move_type) 2110 if ((move_type & blocked) == move_type)
2167 max = maxfree[i]; 2111 max = maxfree[i];
2168 else if (mflags & P_IS_ALIVE) 2112 else if (mflags & P_IS_ALIVE)
2169 { 2113 {
2170 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2114 for (tmp = ms.bot; tmp; tmp = tmp->above)
2171 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2115 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2116 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2172 break; 2117 break;
2173 2118
2174 if (tmp) 2119 if (tmp)
2175 return freedir[i]; 2120 return freedir[i];
2176 } 2121 }
2182 2127
2183/* 2128/*
2184 * distance(object 1, object 2) will return the square of the 2129 * distance(object 1, object 2) will return the square of the
2185 * distance between the two given objects. 2130 * distance between the two given objects.
2186 */ 2131 */
2187
2188int 2132int
2189distance (const object *ob1, const object *ob2) 2133distance (const object *ob1, const object *ob2)
2190{ 2134{
2191 int i;
2192
2193 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2135 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2194 return i;
2195} 2136}
2196 2137
2197/* 2138/*
2198 * find_dir_2(delta-x,delta-y) will return a direction in which 2139 * find_dir_2(delta-x,delta-y) will return a direction in which
2199 * an object which has subtracted the x and y coordinates of another 2140 * an object which has subtracted the x and y coordinates of another
2200 * object, needs to travel toward it. 2141 * object, needs to travel toward it.
2201 */ 2142 */
2202
2203int 2143int
2204find_dir_2 (int x, int y) 2144find_dir_2 (int x, int y)
2205{ 2145{
2206 int q; 2146 int q;
2207 2147
2236 2176
2237 return 3; 2177 return 3;
2238} 2178}
2239 2179
2240/* 2180/*
2241 * absdir(int): Returns a number between 1 and 8, which represent
2242 * the "absolute" direction of a number (it actually takes care of
2243 * "overflow" in previous calculations of a direction).
2244 */
2245
2246int
2247absdir (int d)
2248{
2249 while (d < 1)
2250 d += 8;
2251 while (d > 8)
2252 d -= 8;
2253 return d;
2254}
2255
2256/*
2257 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2181 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2258 * between two directions (which are expected to be absolute (see absdir()) 2182 * between two directions (which are expected to be absolute (see absdir())
2259 */ 2183 */
2260
2261int 2184int
2262dirdiff (int dir1, int dir2) 2185dirdiff (int dir1, int dir2)
2263{ 2186{
2264 int 2187 int d;
2265 d;
2266 2188
2267 d = abs (dir1 - dir2); 2189 d = abs (dir1 - dir2);
2268 if (d > 4) 2190 if (d > 4)
2269 d = 8 - d; 2191 d = 8 - d;
2192
2270 return d; 2193 return d;
2271} 2194}
2272 2195
2273/* peterm: 2196/* peterm:
2274 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2197 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2277 * This basically means that if direction is 15, then it could either go 2200 * This basically means that if direction is 15, then it could either go
2278 * direction 4, 14, or 16 to get back to where we are. 2201 * direction 4, 14, or 16 to get back to where we are.
2279 * Moved from spell_util.c to object.c with the other related direction 2202 * Moved from spell_util.c to object.c with the other related direction
2280 * functions. 2203 * functions.
2281 */ 2204 */
2282
2283int
2284 reduction_dir[SIZEOFFREE][3] = { 2205int reduction_dir[SIZEOFFREE][3] = {
2285 {0, 0, 0}, /* 0 */ 2206 {0, 0, 0}, /* 0 */
2286 {0, 0, 0}, /* 1 */ 2207 {0, 0, 0}, /* 1 */
2287 {0, 0, 0}, /* 2 */ 2208 {0, 0, 0}, /* 2 */
2288 {0, 0, 0}, /* 3 */ 2209 {0, 0, 0}, /* 3 */
2289 {0, 0, 0}, /* 4 */ 2210 {0, 0, 0}, /* 4 */
2433 insert_ob_in_ob (object_create_clone (item), dst); 2354 insert_ob_in_ob (object_create_clone (item), dst);
2434 2355
2435 return dst; 2356 return dst;
2436} 2357}
2437 2358
2438/* GROS - Creates an object using a string representing its content. */
2439/* Basically, we save the content of the string to a temp file, then call */
2440/* load_object on it. I admit it is a highly inefficient way to make things, */
2441/* but it was simple to make and allows reusing the load_object function. */
2442/* Remember not to use load_object_str in a time-critical situation. */
2443/* Also remember that multiparts objects are not supported for now. */
2444
2445object *
2446load_object_str (const char *obstr)
2447{
2448 object *op;
2449 char filename[MAX_BUF];
2450
2451 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2452
2453 FILE *tempfile = fopen (filename, "w");
2454
2455 if (tempfile == NULL)
2456 {
2457 LOG (llevError, "Error - Unable to access load object temp file\n");
2458 return NULL;
2459 }
2460
2461 fprintf (tempfile, obstr);
2462 fclose (tempfile);
2463
2464 op = object::create ();
2465
2466 object_thawer thawer (filename);
2467
2468 if (thawer)
2469 load_object (thawer, op, 0);
2470
2471 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2472 CLEAR_FLAG (op, FLAG_REMOVED);
2473
2474 return op;
2475}
2476
2477/* This returns the first object in who's inventory that 2359/* This returns the first object in who's inventory that
2478 * has the same type and subtype match. 2360 * has the same type and subtype match.
2479 * returns NULL if no match. 2361 * returns NULL if no match.
2480 */ 2362 */
2481object * 2363object *
2482find_obj_by_type_subtype (const object *who, int type, int subtype) 2364find_obj_by_type_subtype (const object *who, int type, int subtype)
2483{ 2365{
2484 object *tmp;
2485
2486 for (tmp = who->inv; tmp; tmp = tmp->below) 2366 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2487 if (tmp->type == type && tmp->subtype == subtype) 2367 if (tmp->type == type && tmp->subtype == subtype)
2488 return tmp; 2368 return tmp;
2489 2369
2490 return NULL; 2370 return 0;
2491} 2371}
2492 2372
2493/* If ob has a field named key, return the link from the list, 2373/* If ob has a field named key, return the link from the list,
2494 * otherwise return NULL. 2374 * otherwise return NULL.
2495 * 2375 *
2497 * do the desired thing. 2377 * do the desired thing.
2498 */ 2378 */
2499key_value * 2379key_value *
2500get_ob_key_link (const object *ob, const char *key) 2380get_ob_key_link (const object *ob, const char *key)
2501{ 2381{
2502 key_value *link;
2503
2504 for (link = ob->key_values; link != NULL; link = link->next) 2382 for (key_value *link = ob->key_values; link; link = link->next)
2505 if (link->key == key) 2383 if (link->key == key)
2506 return link; 2384 return link;
2507 2385
2508 return NULL; 2386 return 0;
2509} 2387}
2510 2388
2511/* 2389/*
2512 * Returns the value of op has an extra_field for key, or NULL. 2390 * Returns the value of op has an extra_field for key, or NULL.
2513 * 2391 *
2538 if (link->key == canonical_key) 2416 if (link->key == canonical_key)
2539 return link->value; 2417 return link->value;
2540 2418
2541 return 0; 2419 return 0;
2542} 2420}
2543
2544 2421
2545/* 2422/*
2546 * Updates the canonical_key in op to value. 2423 * Updates the canonical_key in op to value.
2547 * 2424 *
2548 * canonical_key is a shared string (value doesn't have to be). 2425 * canonical_key is a shared string (value doesn't have to be).
2553 * Returns TRUE on success. 2430 * Returns TRUE on success.
2554 */ 2431 */
2555int 2432int
2556set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2433set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2557{ 2434{
2558 key_value *
2559 field = NULL, *last = NULL; 2435 key_value *field = NULL, *last = NULL;
2560 2436
2561 for (field = op->key_values; field != NULL; field = field->next) 2437 for (field = op->key_values; field != NULL; field = field->next)
2562 { 2438 {
2563 if (field->key != canonical_key) 2439 if (field->key != canonical_key)
2564 { 2440 {
2592 /* IF we get here, key doesn't exist */ 2468 /* IF we get here, key doesn't exist */
2593 2469
2594 /* No field, we'll have to add it. */ 2470 /* No field, we'll have to add it. */
2595 2471
2596 if (!add_key) 2472 if (!add_key)
2597 {
2598 return FALSE; 2473 return FALSE;
2599 } 2474
2600 /* There isn't any good reason to store a null 2475 /* There isn't any good reason to store a null
2601 * value in the key/value list. If the archetype has 2476 * value in the key/value list. If the archetype has
2602 * this key, then we should also have it, so shouldn't 2477 * this key, then we should also have it, so shouldn't
2603 * be here. If user wants to store empty strings, 2478 * be here. If user wants to store empty strings,
2604 * should pass in "" 2479 * should pass in ""
2653 } 2528 }
2654 else 2529 else
2655 item = item->env; 2530 item = item->env;
2656} 2531}
2657 2532
2533
2534const char *
2535object::flag_desc (char *desc, int len) const
2536{
2537 char *p = desc;
2538 bool first = true;
2539
2540 *p = 0;
2541
2542 for (int i = 0; i < NUM_FLAGS; i++)
2543 {
2544 if (len <= 10) // magic constant!
2545 {
2546 snprintf (p, len, ",...");
2547 break;
2548 }
2549
2550 if (flag [i])
2551 {
2552 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2553 len -= cnt;
2554 p += cnt;
2555 first = false;
2556 }
2557 }
2558
2559 return desc;
2560}
2561
2658// return a suitable string describing an objetc in enough detail to find it 2562// return a suitable string describing an object in enough detail to find it
2659const char * 2563const char *
2660object::debug_desc (char *info) const 2564object::debug_desc (char *info) const
2661{ 2565{
2566 char flagdesc[512];
2662 char info2[256 * 3]; 2567 char info2[256 * 4];
2663 char *p = info; 2568 char *p = info;
2664 2569
2665 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2570 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2666 count, 2571 count, uuid.seq,
2667 &name, 2572 &name,
2668 title ? " " : "", 2573 title ? "\",title:\"" : "",
2669 title ? (const char *)title : ""); 2574 title ? (const char *)title : "",
2575 flag_desc (flagdesc, 512), type);
2670 2576
2671 if (env) 2577 if (env)
2672 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2578 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2673 2579
2674 if (map) 2580 if (map)
2675 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2581 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2676 2582
2677 return info; 2583 return info;
2678} 2584}
2679 2585
2680const char * 2586const char *
2681object::debug_desc () const 2587object::debug_desc () const
2682{ 2588{
2683 static char info[256 * 3]; 2589 static char info[3][256 * 4];
2590 static int info_idx;
2591
2684 return debug_desc (info); 2592 return debug_desc (info [++info_idx % 3]);
2685} 2593}
2686 2594
2595struct region *
2596object::region () const
2597{
2598 return map ? map->region (x, y)
2599 : region::default_region ();
2600}
2601
2602const materialtype_t *
2603object::dominant_material () const
2604{
2605 if (materialtype_t *mat = name_to_material (materialname))
2606 return mat;
2607
2608 // omfg this is slow, this has to be temporary :)
2609 shstr unknown ("unknown");
2610
2611 return name_to_material (unknown);
2612}
2613
2614void
2615object::open_container (object *new_container)
2616{
2617 if (container == new_container)
2618 return;
2619
2620 if (object *old_container = container)
2621 {
2622 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2623 return;
2624
2625#if 0
2626 // remove the "Close old_container" object.
2627 if (object *closer = old_container->inv)
2628 if (closer->type == CLOSE_CON)
2629 closer->destroy ();
2630#endif
2631
2632 old_container->flag [FLAG_APPLIED] = 0;
2633 container = 0;
2634
2635 esrv_update_item (UPD_FLAGS, this, old_container);
2636 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2637 }
2638
2639 if (new_container)
2640 {
2641 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2642 return;
2643
2644 // TODO: this does not seem to serve any purpose anymore?
2645#if 0
2646 // insert the "Close Container" object.
2647 if (archetype *closer = new_container->other_arch)
2648 {
2649 object *closer = arch_to_object (new_container->other_arch);
2650 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2651 new_container->insert (closer);
2652 }
2653#endif
2654
2655 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2656
2657 new_container->flag [FLAG_APPLIED] = 1;
2658 container = new_container;
2659
2660 esrv_update_item (UPD_FLAGS, this, new_container);
2661 esrv_send_inventory (this, new_container);
2662 }
2663}
2664
2665

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines