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.87 by root, Tue Dec 26 08:54:59 2006 UTC vs.
Revision 1.146 by root, Fri May 11 21:07:13 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>
28#include <stdio.h> 29#include <stdio.h>
29#include <sys/types.h> 30#include <sys/types.h>
30#include <sys/uio.h> 31#include <sys/uio.h>
31#include <object.h> 32#include <object.h>
32#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
33#include <loader.h> 35#include <loader.h>
34 36
35#include <bitset> 37#include <bitset>
36 38
37int nrofallocobjects = 0; 39int nrofallocobjects = 0;
38static UUID uuid; 40static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 41const uint64 UUID_SKIP = 1<<19;
40 42
41object *active_objects; /* List of active objects that need to be processed */ 43objectvec objects;
44activevec actives;
42 45
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, 46short 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 47 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}; 48};
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, 49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
190 * Check nrof variable *before* calling can_merge() 193 * Check nrof variable *before* calling can_merge()
191 * 194 *
192 * Improvements made with merge: Better checking on potion, and also 195 * Improvements made with merge: Better checking on potion, and also
193 * check weight 196 * check weight
194 */ 197 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 198bool object::can_merge_slow (object *ob1, object *ob2)
197{ 199{
198 /* A couple quicksanity checks */ 200 /* A couple quicksanity checks */
199 if (ob1 == ob2 201 if (ob1 == ob2
200 || ob1->type != ob2->type 202 || ob1->type != ob2->type
277 279
278 /* Note sure why the following is the case - either the object has to 280 /* 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 281 * be animated or have a very low speed. Is this an attempted monster
280 * check? 282 * check?
281 */ 283 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 285 return 0;
284 286
285 switch (ob1->type) 287 switch (ob1->type)
286 { 288 {
287 case SCROLL: 289 case SCROLL:
323sum_weight (object *op) 325sum_weight (object *op)
324{ 326{
325 long sum; 327 long sum;
326 object *inv; 328 object *inv;
327 329
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 331 {
330 if (inv->inv) 332 if (inv->inv)
331 sum_weight (inv); 333 sum_weight (inv);
334
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 336 }
334 337
335 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 359/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 361 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 362 * The result of the dump is stored in the static global errmsg array.
360 */ 363 */
361
362char * 364char *
363dump_object (object *op) 365dump_object (object *op)
364{ 366{
365 if (!op) 367 if (!op)
366 return strdup ("[NULLOBJ]"); 368 return strdup ("[NULLOBJ]");
367 369
368 object_freezer freezer; 370 object_freezer freezer;
369 save_object (freezer, op, 1); 371 op->write (freezer);
370 return freezer.as_string (); 372 return freezer.as_string ();
371} 373}
372 374
373/* 375/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 376 * get_nearest_part(multi-object, object 2) returns the part of the
391} 393}
392 394
393/* 395/*
394 * Returns the object which has the count-variable equal to the argument. 396 * Returns the object which has the count-variable equal to the argument.
395 */ 397 */
396
397object * 398object *
398find_object (tag_t i) 399find_object (tag_t i)
399{ 400{
400 for (object *op = object::first; op; op = op->next) 401 for_all_objects (op)
401 if (op->count == i) 402 if (op->count == i)
402 return op; 403 return op;
403 404
404 return 0; 405 return 0;
405} 406}
406 407
407/* 408/*
408 * Returns the first object which has a name equal to the argument. 409 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 411 * Enables features like "patch <name-of-other-player> food 999"
411 */ 412 */
412
413object * 413object *
414find_object_name (const char *str) 414find_object_name (const char *str)
415{ 415{
416 shstr_cmp str_ (str); 416 shstr_cmp str_ (str);
417 object *op; 417 object *op;
418 418
419 for (op = object::first; op != NULL; op = op->next) 419 for_all_objects (op)
420 if (op->name == str_) 420 if (op->name == str_)
421 break; 421 break;
422 422
423 return op; 423 return op;
424} 424}
450 owner = owner->owner; 450 owner = owner->owner;
451 451
452 this->owner = owner; 452 this->owner = owner;
453} 453}
454 454
455void
456object::set_weapon (object *ob)
457{
458 if (current_weapon == ob)
459 return;
460
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
462
463 if (chosen_skill)
464 chosen_skill->flag [FLAG_APPLIED] = false;
465
466 current_weapon = ob;
467 chosen_skill = ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
468
469 if (chosen_skill)
470 chosen_skill->flag [FLAG_APPLIED] = true;
471
472 update_stats ();
473}
474
455/* Zero the key_values on op, decrementing the shared-string 475/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 476 * refcounts and freeing the links.
457 */ 477 */
458static void 478static void
459free_key_values (object *op) 479free_key_values (object *op)
460{ 480{
461 for (key_value *i = op->key_values; i != 0;) 481 for (key_value *i = op->key_values; i; )
462 { 482 {
463 key_value *next = i->next; 483 key_value *next = i->next;
464 delete i; 484 delete i;
465 485
466 i = next; 486 i = next;
467 } 487 }
468 488
469 op->key_values = 0; 489 op->key_values = 0;
470} 490}
471 491
472/* 492object &
473 * copy_to first frees everything allocated by the dst object, 493object::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{ 494{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 495 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 496 bool is_removed = flag [FLAG_REMOVED];
485 497
486 *(object_copy *)dst = *this; 498 *(object_copy *)this = src;
487 499
488 if (is_freed) 500 flag [FLAG_FREED] = is_freed;
489 SET_FLAG (dst, FLAG_FREED); 501 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED);
493
494 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496 502
497 /* Copy over key_values, if any. */ 503 /* Copy over key_values, if any. */
498 if (key_values) 504 if (src.key_values)
499 { 505 {
500 key_value *tail = 0; 506 key_value *tail = 0;
501 key_value *i;
502
503 dst->key_values = 0; 507 key_values = 0;
504 508
505 for (i = key_values; i; i = i->next) 509 for (key_value *i = src.key_values; i; i = i->next)
506 { 510 {
507 key_value *new_link = new key_value; 511 key_value *new_link = new key_value;
508 512
509 new_link->next = 0; 513 new_link->next = 0;
510 new_link->key = i->key; 514 new_link->key = i->key;
511 new_link->value = i->value; 515 new_link->value = i->value;
512 516
513 /* Try and be clever here, too. */ 517 /* Try and be clever here, too. */
514 if (!dst->key_values) 518 if (!key_values)
515 { 519 {
516 dst->key_values = new_link; 520 key_values = new_link;
517 tail = new_link; 521 tail = new_link;
518 } 522 }
519 else 523 else
520 { 524 {
521 tail->next = new_link; 525 tail->next = new_link;
522 tail = new_link; 526 tail = new_link;
523 } 527 }
524 } 528 }
525 } 529 }
530}
531
532/*
533 * copy_to first frees everything allocated by the dst object,
534 * and then copies the contents of itself into the second
535 * object, allocating what needs to be allocated. Basically, any
536 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
537 * if the first object is freed, the pointers in the new object
538 * will point at garbage.
539 */
540void
541object::copy_to (object *dst)
542{
543 *dst = *this;
544
545 if (speed < 0)
546 dst->speed_left = speed_left - rndm ();
526 547
527 dst->set_speed (dst->speed); 548 dst->set_speed (dst->speed);
549}
550
551void
552object::instantiate ()
553{
554 if (!uuid.seq) // HACK
555 uuid = gen_uuid ();
556
557 speed_left = -0.1f;
558 /* copy the body_info to the body_used - this is only really
559 * need for monsters, but doesn't hurt to do it for everything.
560 * by doing so, when a monster is created, it has good starting
561 * values for the body_used info, so when items are created
562 * for it, they can be properly equipped.
563 */
564 for (int i = NUM_BODY_LOCATIONS; i--; )
565 slot[i].used = slot[i].info;
566
567 attachable::instantiate ();
528} 568}
529 569
530object * 570object *
531object::clone () 571object::clone ()
532{ 572{
538/* 578/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 579 * If an object with the IS_TURNABLE() flag needs to be turned due
540 * to the closest player being on the other side, this function can 580 * to the closest player being on the other side, this function can
541 * be called to update the face variable, _and_ how it looks on the map. 581 * be called to update the face variable, _and_ how it looks on the map.
542 */ 582 */
543
544void 583void
545update_turn_face (object *op) 584update_turn_face (object *op)
546{ 585{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 586 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 587 return;
588
549 SET_ANIMATION (op, op->direction); 589 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 590 update_object (op, UP_OBJ_FACE);
551} 591}
552 592
553/* 593/*
556 * This function needs to be called whenever the speed of an object changes. 596 * This function needs to be called whenever the speed of an object changes.
557 */ 597 */
558void 598void
559object::set_speed (float speed) 599object::set_speed (float speed)
560{ 600{
561 extern int arch_init;
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (flag [FLAG_FREED] && speed) 601 if (flag [FLAG_FREED] && speed)
567 { 602 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name); 603 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0; 604 speed = 0;
570 } 605 }
571 606
572 this->speed = speed; 607 this->speed = speed;
573 608
574 if (arch_init) 609 if (has_active_speed ())
575 return; 610 activate ();
576
577 if (FABS (speed) > MIN_ACTIVE_SPEED)
578 {
579 /* If already on active list, don't do anything */
580 if (active_next || active_prev || this == active_objects)
581 return;
582
583 /* process_events() expects us to insert the object at the beginning
584 * of the list. */
585 active_next = active_objects;
586
587 if (active_next)
588 active_next->active_prev = this;
589
590 active_objects = this;
591 }
592 else 611 else
593 { 612 deactivate ();
594 /* If not on the active list, nothing needs to be done */
595 if (!active_next && !active_prev && this != active_objects)
596 return;
597
598 if (!active_prev)
599 {
600 active_objects = active_next;
601
602 if (active_next)
603 active_next->active_prev = 0;
604 }
605 else
606 {
607 active_prev->active_next = active_next;
608
609 if (active_next)
610 active_next->active_prev = active_prev;
611 }
612
613 active_next = 0;
614 active_prev = 0;
615 }
616}
617
618/* This function removes object 'op' from the list of active
619 * objects.
620 * This should only be used for style maps or other such
621 * reference maps where you don't want an object that isn't
622 * in play chewing up cpu time getting processed.
623 * The reverse of this is to call update_ob_speed, which
624 * will do the right thing based on the speed of the object.
625 */
626void
627remove_from_active_list (object *op)
628{
629 /* If not on the active list, nothing needs to be done */
630 if (!op->active_next && !op->active_prev && op != active_objects)
631 return;
632
633 if (op->active_prev == NULL)
634 {
635 active_objects = op->active_next;
636 if (op->active_next != NULL)
637 op->active_next->active_prev = NULL;
638 }
639 else
640 {
641 op->active_prev->active_next = op->active_next;
642 if (op->active_next)
643 op->active_next->active_prev = op->active_prev;
644 }
645 op->active_next = NULL;
646 op->active_prev = NULL;
647} 613}
648 614
649/* 615/*
650 * update_object() updates the the map. 616 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 617 * It takes into account invisible objects (and represent squares covered
664 * UP_OBJ_FACE: only the objects face has changed. 630 * UP_OBJ_FACE: only the objects face has changed.
665 */ 631 */
666void 632void
667update_object (object *op, int action) 633update_object (object *op, int action)
668{ 634{
669 MoveType move_on, move_off, move_block, move_slow;
670
671 if (op == NULL) 635 if (op == NULL)
672 { 636 {
673 /* this should never happen */ 637 /* this should never happen */
674 LOG (llevDebug, "update_object() called for NULL object.\n"); 638 LOG (llevDebug, "update_object() called for NULL object.\n");
675 return; 639 return;
699 return; 663 return;
700 } 664 }
701 665
702 mapspace &m = op->ms (); 666 mapspace &m = op->ms ();
703 667
704 if (m.flags_ & P_NEED_UPDATE) 668 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 669 /* nop */;
706 else if (action == UP_OBJ_INSERT) 670 else if (action == UP_OBJ_INSERT)
707 { 671 {
708 // this is likely overkill, TODO: revisit (schmorp) 672 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 673 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
718 /* This isn't perfect, but I don't expect a lot of objects to 682 /* This isn't perfect, but I don't expect a lot of objects to
719 * to have move_allow right now. 683 * to have move_allow right now.
720 */ 684 */
721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 685 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 686 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723 m.flags_ = P_NEED_UPDATE; 687 m.flags_ = 0;
724 } 688 }
725 /* if the object is being removed, we can't make intelligent 689 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 690 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 691 * that is being removed.
728 */ 692 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 693 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 694 m.flags_ = 0;
731 else if (action == UP_OBJ_FACE) 695 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 696 /* Nothing to do for that case */ ;
733 else 697 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 698 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 699
736 if (op->more) 700 if (op->more)
737 update_object (op->more, action); 701 update_object (op->more, action);
738} 702}
739 703
740object::vector object::objects; // not yet used
741object *object::first;
742
743object::object () 704object::object ()
744{ 705{
745 SET_FLAG (this, FLAG_REMOVED); 706 SET_FLAG (this, FLAG_REMOVED);
746 707
747 expmul = 1.0; 708 expmul = 1.0;
748 face = blank_face; 709 face = blank_face;
749} 710}
750 711
751object::~object () 712object::~object ()
752{ 713{
714 unlink ();
715
753 free_key_values (this); 716 free_key_values (this);
754} 717}
755 718
719static int object_count;
720
756void object::link () 721void object::link ()
757{ 722{
758 count = ++ob_count; 723 assert (!index);//D
759 uuid = gen_uuid (); 724 uuid = gen_uuid ();
725 count = ++object_count;
760 726
761 prev = 0; 727 refcnt_inc ();
762 next = object::first; 728 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 729}
769 730
770void object::unlink () 731void object::unlink ()
771{ 732{
772 if (this == object::first) 733 if (!index)
773 object::first = next; 734 return;
774 735
775 /* Remove this object from the list of used objects */ 736 objects.erase (this);
776 if (prev) prev->next = next; 737 refcnt_dec ();
777 if (next) next->prev = prev; 738}
778 739
779 prev = 0; 740void
780 next = 0; 741object::activate ()
742{
743 /* If already on active list, don't do anything */
744 if (active)
745 return;
746
747 if (has_active_speed ())
748 actives.insert (this);
749}
750
751void
752object::activate_recursive ()
753{
754 activate ();
755
756 for (object *op = inv; op; op = op->below)
757 op->activate_recursive ();
758}
759
760/* This function removes object 'op' from the list of active
761 * objects.
762 * This should only be used for style maps or other such
763 * reference maps where you don't want an object that isn't
764 * in play chewing up cpu time getting processed.
765 * The reverse of this is to call update_ob_speed, which
766 * will do the right thing based on the speed of the object.
767 */
768void
769object::deactivate ()
770{
771 /* If not on the active list, nothing needs to be done */
772 if (!active)
773 return;
774
775 actives.erase (this);
776}
777
778void
779object::deactivate_recursive ()
780{
781 for (object *op = inv; op; op = op->below)
782 op->deactivate_recursive ();
783
784 deactivate ();
785}
786
787void
788object::set_flag_inv (int flag, int value)
789{
790 for (object *op = inv; op; op = op->below)
791 {
792 op->flag [flag] = value;
793 op->set_flag_inv (flag, value);
794 }
795}
796
797/*
798 * Remove and free all objects in the inventory of the given object.
799 * object.c ?
800 */
801void
802object::destroy_inv (bool drop_to_ground)
803{
804 // need to check first, because the checks below might segfault
805 // as we might be on an invalid mapspace and crossfire code
806 // is too buggy to ensure that the inventory is empty.
807 // corollary: if you create arrows etc. with stuff in tis inventory,
808 // cf will crash below with off-map x and y
809 if (!inv)
810 return;
811
812 /* Only if the space blocks everything do we not process -
813 * if some form of movement is allowed, let objects
814 * drop on that space.
815 */
816 if (!drop_to_ground
817 || !map
818 || map->in_memory != MAP_IN_MEMORY
819 || map->nodrop
820 || ms ().move_block == MOVE_ALL)
821 {
822 while (inv)
823 {
824 inv->destroy_inv (drop_to_ground);
825 inv->destroy ();
826 }
827 }
828 else
829 { /* Put objects in inventory onto this space */
830 while (inv)
831 {
832 object *op = inv;
833
834 if (op->flag [FLAG_STARTEQUIP]
835 || op->flag [FLAG_NO_DROP]
836 || op->type == RUNE
837 || op->type == TRAP
838 || op->flag [FLAG_IS_A_TEMPLATE]
839 || op->flag [FLAG_DESTROY_ON_DEATH])
840 op->destroy ();
841 else
842 map->insert (op, x, y);
843 }
844 }
781} 845}
782 846
783object *object::create () 847object *object::create ()
784{ 848{
785 object *op = new object; 849 object *op = new object;
799 remove_friendly_object (this); 863 remove_friendly_object (this);
800 864
801 if (!flag [FLAG_REMOVED]) 865 if (!flag [FLAG_REMOVED])
802 remove (); 866 remove ();
803 867
804 if (flag [FLAG_FREED]) 868 destroy_inv (true);
805 return; 869
870 deactivate ();
871 unlink ();
806 872
807 flag [FLAG_FREED] = 1; 873 flag [FLAG_FREED] = 1;
808 874
809 // hack to ensure that freed objects still have a valid map 875 // hack to ensure that freed objects still have a valid map
810 { 876 {
816 882
817 freed_map->name = "/internal/freed_objects_map"; 883 freed_map->name = "/internal/freed_objects_map";
818 freed_map->width = 3; 884 freed_map->width = 3;
819 freed_map->height = 3; 885 freed_map->height = 3;
820 886
821 freed_map->allocate (); 887 freed_map->alloc ();
888 freed_map->in_memory = MAP_IN_MEMORY;
822 } 889 }
823 890
824 map = freed_map; 891 map = freed_map;
825 x = 1; 892 x = 1;
826 y = 1; 893 y = 1;
827 } 894 }
828 895
829 more = 0;
830 head = 0; 896 head = 0;
831 inv = 0; 897
898 if (more)
899 {
900 more->destroy ();
901 more = 0;
902 }
832 903
833 // clear those pointers that likely might have circular references to us 904 // clear those pointers that likely might have circular references to us
834 owner = 0; 905 owner = 0;
835 enemy = 0; 906 enemy = 0;
836 attacked_by = 0; 907 attacked_by = 0;
837
838 // only relevant for players(?), but make sure of it anyways
839 contr = 0;
840
841 /* Remove object from the active list */
842 set_speed (0);
843
844 unlink ();
845}
846
847/*
848 * Remove and free all objects in the inventory of the given object.
849 * object.c ?
850 */
851void
852object::destroy_inv (bool drop_to_ground)
853{
854 if (!inv)
855 return;
856
857 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects
859 * drop on that space.
860 */
861 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
862 {
863 while (inv)
864 {
865 inv->destroy_inv (drop_to_ground);
866 inv->destroy ();
867 }
868 }
869 else
870 { /* Put objects in inventory onto this space */
871 while (inv)
872 {
873 object *op = inv;
874
875 if (op->flag [FLAG_STARTEQUIP]
876 || op->flag [FLAG_NO_DROP]
877 || op->type == RUNE
878 || op->type == TRAP
879 || op->flag [FLAG_IS_A_TEMPLATE])
880 op->destroy ();
881 else
882 {
883 op->remove ();
884 op->x = x;
885 op->y = y;
886 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
887 }
888 }
889 }
890} 908}
891 909
892void 910void
893object::destroy (bool destroy_inventory) 911object::destroy (bool destroy_inventory)
894{ 912{
895 if (destroyed ()) 913 if (destroyed ())
896 return; 914 return;
897 915
898 if (more)
899 {
900 //TODO: non-head objects must not have inventory
901 more->destroy (destroy_inventory);
902 more = 0;
903 }
904
905 if (destroy_inventory) 916 if (destroy_inventory)
906 destroy_inv (true); 917 destroy_inv (false);
907 918
908 attachable::destroy (); 919 attachable::destroy ();
909} 920}
910 921
911/* 922/*
929 * This function removes the object op from the linked list of objects 940 * This function removes the object op from the linked list of objects
930 * which it is currently tied to. When this function is done, the 941 * which it is currently tied to. When this function is done, the
931 * object will have no environment. If the object previously had an 942 * object will have no environment. If the object previously had an
932 * environment, the x and y coordinates will be updated to 943 * environment, the x and y coordinates will be updated to
933 * the previous environment. 944 * the previous environment.
934 * Beware: This function is called from the editor as well!
935 */ 945 */
936void 946void
937object::remove () 947object::do_remove ()
938{ 948{
939 object *tmp, *last = 0; 949 object *tmp, *last = 0;
940 object *otmp; 950 object *otmp;
941 951
942 if (QUERY_FLAG (this, FLAG_REMOVED)) 952 if (QUERY_FLAG (this, FLAG_REMOVED))
964 * to save cpu time. 974 * to save cpu time.
965 */ 975 */
966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 976 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967 otmp->update_stats (); 977 otmp->update_stats ();
968 978
969 if (above != NULL) 979 if (above)
970 above->below = below; 980 above->below = below;
971 else 981 else
972 env->inv = below; 982 env->inv = below;
973 983
974 if (below != NULL) 984 if (below)
975 below->above = above; 985 below->above = above;
976 986
977 /* we set up values so that it could be inserted into 987 /* we set up values so that it could be inserted into
978 * the map, but we don't actually do that - it is up 988 * the map, but we don't actually do that - it is up
979 * to the caller to decide what we want to do. 989 * to the caller to decide what we want to do.
983 above = 0, below = 0; 993 above = 0, below = 0;
984 env = 0; 994 env = 0;
985 } 995 }
986 else if (map) 996 else if (map)
987 { 997 {
988 /* Re did the following section of code - it looks like it had 998 if (type == PLAYER)
989 * lots of logic for things we no longer care about
990 */ 999 {
1000 // leaving a spot always closes any open container on the ground
1001 if (container && !container->env)
1002 // this causes spurious floorbox updates, but it ensures
1003 // that the CLOSE event is being sent.
1004 close_container ();
1005
1006 --map->players;
1007 map->touch ();
1008 }
1009
1010 map->dirty = true;
1011 mapspace &ms = this->ms ();
991 1012
992 /* link the object above us */ 1013 /* link the object above us */
993 if (above) 1014 if (above)
994 above->below = below; 1015 above->below = below;
995 else 1016 else
996 map->at (x, y).top = below; /* we were top, set new top */ 1017 ms.top = below; /* we were top, set new top */
997 1018
998 /* Relink the object below us, if there is one */ 1019 /* Relink the object below us, if there is one */
999 if (below) 1020 if (below)
1000 below->above = above; 1021 below->above = above;
1001 else 1022 else
1003 /* Nothing below, which means we need to relink map object for this space 1024 /* Nothing below, which means we need to relink map object for this space
1004 * use translated coordinates in case some oddness with map tiling is 1025 * use translated coordinates in case some oddness with map tiling is
1005 * evident 1026 * evident
1006 */ 1027 */
1007 if (GET_MAP_OB (map, x, y) != this) 1028 if (GET_MAP_OB (map, x, y) != this)
1008 {
1009 char *dump = dump_object (this);
1010 LOG (llevError,
1011 "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); 1029 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 ());
1012 free (dump);
1013 dump = dump_object (GET_MAP_OB (map, x, y));
1014 LOG (llevError, "%s\n", dump);
1015 free (dump);
1016 }
1017 1030
1018 map->at (x, y).bot = above; /* goes on above it. */ 1031 ms.bot = above; /* goes on above it. */
1019 } 1032 }
1020 1033
1021 above = 0; 1034 above = 0;
1022 below = 0; 1035 below = 0;
1023 1036
1024 if (map->in_memory == MAP_SAVING) 1037 if (map->in_memory == MAP_SAVING)
1025 return; 1038 return;
1026 1039
1027 int check_walk_off = !flag [FLAG_NO_APPLY]; 1040 int check_walk_off = !flag [FLAG_NO_APPLY];
1028 1041
1029 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1042 for (tmp = ms.bot; tmp; tmp = tmp->above)
1030 { 1043 {
1031 /* No point updating the players look faces if he is the object 1044 /* No point updating the players look faces if he is the object
1032 * being removed. 1045 * being removed.
1033 */ 1046 */
1034 1047
1046 1059
1047 if (tmp->contr->ns) 1060 if (tmp->contr->ns)
1048 tmp->contr->ns->floorbox_update (); 1061 tmp->contr->ns->floorbox_update ();
1049 } 1062 }
1050 1063
1051 /* See if player moving off should effect something */ 1064 /* See if object moving off should effect something */
1052 if (check_walk_off 1065 if (check_walk_off
1053 && ((move_type & tmp->move_off) 1066 && ((move_type & tmp->move_off)
1054 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1067 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1055 { 1068 {
1056 move_apply (tmp, this, 0); 1069 move_apply (tmp, this, 0);
1058 if (destroyed ()) 1071 if (destroyed ())
1059 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1072 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1060 } 1073 }
1061 1074
1062 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1075 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1063 1076 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1064 if (tmp->above == tmp) 1077 if (tmp->above == tmp)
1065 tmp->above = 0; 1078 tmp->above = 0;
1066 1079
1067 last = tmp; 1080 last = tmp;
1068 } 1081 }
1069 1082
1070 /* last == NULL of there are no objects on this space */ 1083 /* last == NULL if there are no objects on this space */
1084 //TODO: this makes little sense, why only update the topmost object?
1071 if (!last) 1085 if (!last)
1072 map->at (x, y).flags_ = P_NEED_UPDATE; 1086 map->at (x, y).flags_ = 0;
1073 else 1087 else
1074 update_object (last, UP_OBJ_REMOVE); 1088 update_object (last, UP_OBJ_REMOVE);
1075 1089
1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1090 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1077 update_all_los (map, x, y); 1091 update_all_los (map, x, y);
1113 } 1127 }
1114 1128
1115 return 0; 1129 return 0;
1116} 1130}
1117 1131
1132void
1133object::expand_tail ()
1134{
1135 if (more)
1136 return;
1137
1138 object *prev = this;
1139
1140 for (archetype *at = arch->more; at; at = at->more)
1141 {
1142 object *op = arch_to_object (at);
1143
1144 op->name = name;
1145 op->name_pl = name_pl;
1146 op->title = title;
1147
1148 op->head = this;
1149 prev->more = op;
1150
1151 prev = op;
1152 }
1153}
1154
1118/* 1155/*
1119 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1156 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1120 * job preparing multi-part monsters 1157 * job preparing multi-part monsters.
1121 */ 1158 */
1122object * 1159object *
1123insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1160insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1124{ 1161{
1125 object *tmp;
1126
1127 if (op->head)
1128 op = op->head;
1129
1130 for (tmp = op; tmp; tmp = tmp->more) 1162 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1131 { 1163 {
1132 tmp->x = x + tmp->arch->clone.x; 1164 tmp->x = x + tmp->arch->clone.x;
1133 tmp->y = y + tmp->arch->clone.y; 1165 tmp->y = y + tmp->arch->clone.y;
1134 } 1166 }
1135 1167
1157 * just 'op' otherwise 1189 * just 'op' otherwise
1158 */ 1190 */
1159object * 1191object *
1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1192insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161{ 1193{
1194 assert (!op->flag [FLAG_FREED]);
1195
1162 object *tmp, *top, *floor = NULL; 1196 object *tmp, *top, *floor = NULL;
1163 sint16 x, y;
1164 1197
1165 if (QUERY_FLAG (op, FLAG_FREED)) 1198 op->remove ();
1166 {
1167 LOG (llevError, "Trying to insert freed object!\n");
1168 return NULL;
1169 }
1170 1199
1171 if (m == NULL) 1200#if 0
1172 { 1201 if (!m->active != !op->active)
1173 char *dump = dump_object (op); 1202 if (m->active)
1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1203 op->activate_recursive ();
1175 free (dump); 1204 else
1176 return op; 1205 op->deactivate_recursive ();
1177 } 1206#endif
1178 1207
1179 if (out_of_map (m, op->x, op->y)) 1208 if (out_of_map (m, op->x, op->y))
1180 { 1209 {
1181 char *dump = dump_object (op);
1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1210 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1183#ifdef MANY_CORES 1211#ifdef MANY_CORES
1184 /* Better to catch this here, as otherwise the next use of this object 1212 /* Better to catch this here, as otherwise the next use of this object
1185 * is likely to cause a crash. Better to find out where it is getting 1213 * is likely to cause a crash. Better to find out where it is getting
1186 * improperly inserted. 1214 * improperly inserted.
1187 */ 1215 */
1188 abort (); 1216 abort ();
1189#endif 1217#endif
1190 free (dump);
1191 return op; 1218 return op;
1192 } 1219 }
1193 1220
1194 if (!QUERY_FLAG (op, FLAG_REMOVED))
1195 {
1196 char *dump = dump_object (op);
1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198 free (dump);
1199 return op;
1200 }
1201
1202 if (op->more)
1203 {
1204 /* The part may be on a different map. */
1205
1206 object *more = op->more; 1221 if (object *more = op->more)
1207 1222 {
1208 /* We really need the caller to normalize coordinates - if
1209 * we set the map, that doesn't work if the location is within
1210 * a map and this is straddling an edge. So only if coordinate
1211 * is clear wrong do we normalize it.
1212 */
1213 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214 more->map = get_map_from_coord (m, &more->x, &more->y);
1215 else if (!more->map)
1216 {
1217 /* For backwards compatibility - when not dealing with tiled maps,
1218 * more->map should always point to the parent.
1219 */
1220 more->map = m;
1221 }
1222
1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1223 if (!insert_ob_in_map (more, m, originator, flag))
1224 { 1224 {
1225 if (!op->head) 1225 if (!op->head)
1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227 1227
1228 return 0; 1228 return 0;
1233 1233
1234 /* Ideally, the caller figures this out. However, it complicates a lot 1234 /* Ideally, the caller figures this out. However, it complicates a lot
1235 * of areas of callers (eg, anything that uses find_free_spot would now 1235 * of areas of callers (eg, anything that uses find_free_spot would now
1236 * need extra work 1236 * need extra work
1237 */ 1237 */
1238 op->map = get_map_from_coord (m, &op->x, &op->y); 1238 if (!xy_normalise (m, op->x, op->y))
1239 x = op->x; 1239 return 0;
1240 y = op->y; 1240
1241 op->map = m;
1242 mapspace &ms = op->ms ();
1241 1243
1242 /* this has to be done after we translate the coordinates. 1244 /* this has to be done after we translate the coordinates.
1243 */ 1245 */
1244 if (op->nrof && !(flag & INS_NO_MERGE)) 1246 if (op->nrof && !(flag & INS_NO_MERGE))
1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1247 for (tmp = ms.bot; tmp; tmp = tmp->above)
1246 if (object::can_merge (op, tmp)) 1248 if (object::can_merge (op, tmp))
1247 { 1249 {
1248 op->nrof += tmp->nrof; 1250 op->nrof += tmp->nrof;
1249 tmp->destroy (); 1251 tmp->destroy ();
1250 } 1252 }
1267 op->below = originator->below; 1269 op->below = originator->below;
1268 1270
1269 if (op->below) 1271 if (op->below)
1270 op->below->above = op; 1272 op->below->above = op;
1271 else 1273 else
1272 op->ms ().bot = op; 1274 ms.bot = op;
1273 1275
1274 /* since *below* originator, no need to update top */ 1276 /* since *below* originator, no need to update top */
1275 originator->below = op; 1277 originator->below = op;
1276 } 1278 }
1277 else 1279 else
1278 { 1280 {
1281 top = ms.bot;
1282
1279 /* If there are other objects, then */ 1283 /* If there are other objects, then */
1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1284 if ((!(flag & INS_MAP_LOAD)) && top)
1281 { 1285 {
1282 object *last = NULL; 1286 object *last = 0;
1283 1287
1284 /* 1288 /*
1285 * If there are multiple objects on this space, we do some trickier handling. 1289 * If there are multiple objects on this space, we do some trickier handling.
1286 * We've already dealt with merging if appropriate. 1290 * We've already dealt with merging if appropriate.
1287 * Generally, we want to put the new object on top. But if 1291 * Generally, we want to put the new object on top. But if
1291 * once we get to them. This reduces the need to traverse over all of 1295 * once we get to them. This reduces the need to traverse over all of
1292 * them when adding another one - this saves quite a bit of cpu time 1296 * them when adding another one - this saves quite a bit of cpu time
1293 * when lots of spells are cast in one area. Currently, it is presumed 1297 * when lots of spells are cast in one area. Currently, it is presumed
1294 * that flying non pickable objects are spell objects. 1298 * that flying non pickable objects are spell objects.
1295 */ 1299 */
1296 1300 for (top = ms.bot; top; top = top->above)
1297 while (top != NULL)
1298 { 1301 {
1299 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1302 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1300 floor = top; 1303 floor = top;
1301 1304
1302 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1305 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1305 top = top->below; 1308 top = top->below;
1306 break; 1309 break;
1307 } 1310 }
1308 1311
1309 last = top; 1312 last = top;
1310 top = top->above;
1311 } 1313 }
1312 1314
1313 /* Don't want top to be NULL, so set it to the last valid object */ 1315 /* Don't want top to be NULL, so set it to the last valid object */
1314 top = last; 1316 top = last;
1315 1317
1317 * looks like instead of lots of conditions here. 1319 * looks like instead of lots of conditions here.
1318 * makes things faster, and effectively the same result. 1320 * makes things faster, and effectively the same result.
1319 */ 1321 */
1320 1322
1321 /* Have object 'fall below' other objects that block view. 1323 /* Have object 'fall below' other objects that block view.
1322 * Unless those objects are exits, type 66 1324 * Unless those objects are exits.
1323 * If INS_ON_TOP is used, don't do this processing 1325 * If INS_ON_TOP is used, don't do this processing
1324 * Need to find the object that in fact blocks view, otherwise 1326 * Need to find the object that in fact blocks view, otherwise
1325 * stacking is a bit odd. 1327 * stacking is a bit odd.
1326 */ 1328 */
1327 if (!(flag & INS_ON_TOP) && 1329 if (!(flag & INS_ON_TOP)
1328 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1330 && ms.flags () & P_BLOCKSVIEW
1331 && (op->face && !faces [op->face].visibility))
1329 { 1332 {
1330 for (last = top; last != floor; last = last->below) 1333 for (last = top; last != floor; last = last->below)
1331 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1334 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1332 break; 1335 break;
1336
1333 /* Check to see if we found the object that blocks view, 1337 /* Check to see if we found the object that blocks view,
1334 * and make sure we have a below pointer for it so that 1338 * and make sure we have a below pointer for it so that
1335 * we can get inserted below this one, which requires we 1339 * we can get inserted below this one, which requires we
1336 * set top to the object below us. 1340 * set top to the object below us.
1337 */ 1341 */
1339 top = last->below; 1343 top = last->below;
1340 } 1344 }
1341 } /* If objects on this space */ 1345 } /* If objects on this space */
1342 1346
1343 if (flag & INS_MAP_LOAD) 1347 if (flag & INS_MAP_LOAD)
1344 top = GET_MAP_TOP (op->map, op->x, op->y); 1348 top = ms.top;
1345 1349
1346 if (flag & INS_ABOVE_FLOOR_ONLY) 1350 if (flag & INS_ABOVE_FLOOR_ONLY)
1347 top = floor; 1351 top = floor;
1348 1352
1349 /* Top is the object that our object (op) is going to get inserted above. 1353 /* Top is the object that our object (op) is going to get inserted above.
1350 */ 1354 */
1351 1355
1352 /* First object on this space */ 1356 /* First object on this space */
1353 if (!top) 1357 if (!top)
1354 { 1358 {
1355 op->above = GET_MAP_OB (op->map, op->x, op->y); 1359 op->above = ms.bot;
1356 1360
1357 if (op->above) 1361 if (op->above)
1358 op->above->below = op; 1362 op->above->below = op;
1359 1363
1360 op->below = NULL; 1364 op->below = 0;
1361 op->ms ().bot = op; 1365 ms.bot = op;
1362 } 1366 }
1363 else 1367 else
1364 { /* get inserted into the stack above top */ 1368 { /* get inserted into the stack above top */
1365 op->above = top->above; 1369 op->above = top->above;
1366 1370
1369 1373
1370 op->below = top; 1374 op->below = top;
1371 top->above = op; 1375 top->above = op;
1372 } 1376 }
1373 1377
1374 if (op->above == NULL) 1378 if (!op->above)
1375 op->ms ().top = op; 1379 ms.top = op;
1376 } /* else not INS_BELOW_ORIGINATOR */ 1380 } /* else not INS_BELOW_ORIGINATOR */
1377 1381
1378 if (op->type == PLAYER) 1382 if (op->type == PLAYER)
1383 {
1379 op->contr->do_los = 1; 1384 op->contr->do_los = 1;
1385 ++op->map->players;
1386 op->map->touch ();
1387 }
1388
1389 op->map->dirty = true;
1380 1390
1381 /* If we have a floor, we know the player, if any, will be above 1391 /* If we have a floor, we know the player, if any, will be above
1382 * it, so save a few ticks and start from there. 1392 * it, so save a few ticks and start from there.
1383 */ 1393 */
1384 if (!(flag & INS_MAP_LOAD)) 1394 if (!(flag & INS_MAP_LOAD))
1385 if (object *pl = op->ms ().player ()) 1395 if (object *pl = ms.player ())
1386 if (pl->contr->ns) 1396 if (pl->contr->ns)
1387 pl->contr->ns->floorbox_update (); 1397 pl->contr->ns->floorbox_update ();
1388 1398
1389 /* If this object glows, it may affect lighting conditions that are 1399 /* If this object glows, it may affect lighting conditions that are
1390 * visible to others on this map. But update_all_los is really 1400 * visible to others on this map. But update_all_los is really
1391 * an inefficient way to do this, as it means los for all players 1401 * an inefficient way to do this, as it means los for all players
1392 * on the map will get recalculated. The players could very well 1402 * on the map will get recalculated. The players could very well
1393 * be far away from this change and not affected in any way - 1403 * be far away from this change and not affected in any way -
1394 * this should get redone to only look for players within range, 1404 * this should get redone to only look for players within range,
1395 * or just updating the P_NEED_UPDATE for spaces within this area 1405 * or just updating the P_UPTODATE for spaces within this area
1396 * of effect may be sufficient. 1406 * of effect may be sufficient.
1397 */ 1407 */
1398 if (op->map->darkness && (op->glow_radius != 0)) 1408 if (op->map->darkness && (op->glow_radius != 0))
1399 update_all_los (op->map, op->x, op->y); 1409 update_all_los (op->map, op->x, op->y);
1400 1410
1438{ 1448{
1439 object *tmp, *tmp1; 1449 object *tmp, *tmp1;
1440 1450
1441 /* first search for itself and remove any old instances */ 1451 /* first search for itself and remove any old instances */
1442 1452
1443 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1453 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1444 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1454 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1445 tmp->destroy (); 1455 tmp->destroy ();
1446 1456
1447 tmp1 = arch_to_object (archetype::find (arch_string)); 1457 tmp1 = arch_to_object (archetype::find (arch_string));
1448 1458
1449 tmp1->x = op->x; 1459 tmp1->x = op->x;
1450 tmp1->y = op->y; 1460 tmp1->y = op->y;
1451 insert_ob_in_map (tmp1, op->map, op, 0); 1461 insert_ob_in_map (tmp1, op->map, op, 0);
1462}
1463
1464object *
1465object::insert_at (object *where, object *originator, int flags)
1466{
1467 return where->map->insert (this, where->x, where->y, originator, flags);
1452} 1468}
1453 1469
1454/* 1470/*
1455 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1471 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1456 * is returned contains nr objects, and the remaining parts contains 1472 * is returned contains nr objects, and the remaining parts contains
1457 * the rest (or is removed and freed if that number is 0). 1473 * the rest (or is removed and freed if that number is 0).
1458 * On failure, NULL is returned, and the reason put into the 1474 * On failure, NULL is returned, and the reason put into the
1459 * global static errmsg array. 1475 * global static errmsg array.
1460 */ 1476 */
1461
1462object * 1477object *
1463get_split_ob (object *orig_ob, uint32 nr) 1478get_split_ob (object *orig_ob, uint32 nr)
1464{ 1479{
1465 object *newob; 1480 object *newob;
1466 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1481 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1497 * the amount of an object. If the amount reaches 0, the object 1512 * the amount of an object. If the amount reaches 0, the object
1498 * is subsequently removed and freed. 1513 * is subsequently removed and freed.
1499 * 1514 *
1500 * Return value: 'op' if something is left, NULL if the amount reached 0 1515 * Return value: 'op' if something is left, NULL if the amount reached 0
1501 */ 1516 */
1502
1503object * 1517object *
1504decrease_ob_nr (object *op, uint32 i) 1518decrease_ob_nr (object *op, uint32 i)
1505{ 1519{
1506 object *tmp; 1520 object *tmp;
1507 1521
1582 1596
1583/* 1597/*
1584 * add_weight(object, weight) adds the specified weight to an object, 1598 * add_weight(object, weight) adds the specified weight to an object,
1585 * and also updates how much the environment(s) is/are carrying. 1599 * and also updates how much the environment(s) is/are carrying.
1586 */ 1600 */
1587
1588void 1601void
1589add_weight (object *op, signed long weight) 1602add_weight (object *op, signed long weight)
1590{ 1603{
1591 while (op != NULL) 1604 while (op != NULL)
1592 { 1605 {
1624 * inside the object environment. 1637 * inside the object environment.
1625 * 1638 *
1626 * The function returns now pointer to inserted item, and return value can 1639 * The function returns now pointer to inserted item, and return value can
1627 * be != op, if items are merged. -Tero 1640 * be != op, if items are merged. -Tero
1628 */ 1641 */
1629
1630object * 1642object *
1631object::insert (object *op) 1643object::insert (object *op)
1632{ 1644{
1633 object *tmp, *otmp; 1645 object *tmp, *otmp;
1634 1646
1730 * 1742 *
1731 * MSW 2001-07-08: Check all objects on space, not just those below 1743 * MSW 2001-07-08: Check all objects on space, not just those below
1732 * object being inserted. insert_ob_in_map may not put new objects 1744 * object being inserted. insert_ob_in_map may not put new objects
1733 * on top. 1745 * on top.
1734 */ 1746 */
1735
1736int 1747int
1737check_move_on (object *op, object *originator) 1748check_move_on (object *op, object *originator)
1738{ 1749{
1739 object *tmp; 1750 object *tmp;
1740 maptile *m = op->map; 1751 maptile *m = op->map;
1767 1778
1768 /* The objects have to be checked from top to bottom. 1779 /* The objects have to be checked from top to bottom.
1769 * Hence, we first go to the top: 1780 * Hence, we first go to the top:
1770 */ 1781 */
1771 1782
1772 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1783 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1773 { 1784 {
1774 /* Trim the search when we find the first other spell effect 1785 /* Trim the search when we find the first other spell effect
1775 * this helps performance so that if a space has 50 spell objects, 1786 * this helps performance so that if a space has 50 spell objects,
1776 * we don't need to check all of them. 1787 * we don't need to check all of them.
1777 */ 1788 */
1795 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1806 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1796 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1807 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1797 { 1808 {
1798 1809
1799 float 1810 float
1800 diff = tmp->move_slow_penalty * FABS (op->speed); 1811 diff = tmp->move_slow_penalty * fabs (op->speed);
1801 1812
1802 if (op->type == PLAYER) 1813 if (op->type == PLAYER)
1803 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1814 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1804 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1815 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1805 diff /= 4.0; 1816 diff /= 4.0;
1835 * The first matching object is returned, or NULL if none. 1846 * The first matching object is returned, or NULL if none.
1836 */ 1847 */
1837object * 1848object *
1838present_arch (const archetype *at, maptile *m, int x, int y) 1849present_arch (const archetype *at, maptile *m, int x, int y)
1839{ 1850{
1840 if (m == NULL || out_of_map (m, x, y)) 1851 if (!m || out_of_map (m, x, y))
1841 { 1852 {
1842 LOG (llevError, "Present_arch called outside map.\n"); 1853 LOG (llevError, "Present_arch called outside map.\n");
1843 return NULL; 1854 return NULL;
1844 } 1855 }
1845 1856
1846 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1857 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1847 if (tmp->arch == at) 1858 if (tmp->arch == at)
1848 return tmp; 1859 return tmp;
1849 1860
1850 return NULL; 1861 return NULL;
1851} 1862}
1862 { 1873 {
1863 LOG (llevError, "Present called outside map.\n"); 1874 LOG (llevError, "Present called outside map.\n");
1864 return NULL; 1875 return NULL;
1865 } 1876 }
1866 1877
1867 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1878 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1868 if (tmp->type == type) 1879 if (tmp->type == type)
1869 return tmp; 1880 return tmp;
1870 1881
1871 return NULL; 1882 return NULL;
1872} 1883}
2012 } 2023 }
2013 2024
2014 if (!index) 2025 if (!index)
2015 return -1; 2026 return -1;
2016 2027
2017 return altern[RANDOM () % index]; 2028 return altern [rndm (index)];
2018} 2029}
2019 2030
2020/* 2031/*
2021 * find_first_free_spot(archetype, maptile, x, y) works like 2032 * find_first_free_spot(archetype, maptile, x, y) works like
2022 * find_free_spot(), but it will search max number of squares. 2033 * find_free_spot(), but it will search max number of squares.
2043{ 2054{
2044 arr += begin; 2055 arr += begin;
2045 end -= begin; 2056 end -= begin;
2046 2057
2047 while (--end) 2058 while (--end)
2048 swap (arr [end], arr [RANDOM () % (end + 1)]); 2059 swap (arr [end], arr [rndm (end + 1)]);
2049} 2060}
2050 2061
2051/* new function to make monster searching more efficient, and effective! 2062/* new function to make monster searching more efficient, and effective!
2052 * This basically returns a randomized array (in the passed pointer) of 2063 * This basically returns a randomized array (in the passed pointer) of
2053 * the spaces to find monsters. In this way, it won't always look for 2064 * the spaces to find monsters. In this way, it won't always look for
2187 2198
2188 return 3; 2199 return 3;
2189} 2200}
2190 2201
2191/* 2202/*
2192 * absdir(int): Returns a number between 1 and 8, which represent
2193 * the "absolute" direction of a number (it actually takes care of
2194 * "overflow" in previous calculations of a direction).
2195 */
2196
2197int
2198absdir (int d)
2199{
2200 while (d < 1)
2201 d += 8;
2202
2203 while (d > 8)
2204 d -= 8;
2205
2206 return d;
2207}
2208
2209/*
2210 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2203 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2211 * between two directions (which are expected to be absolute (see absdir()) 2204 * between two directions (which are expected to be absolute (see absdir())
2212 */ 2205 */
2213
2214int 2206int
2215dirdiff (int dir1, int dir2) 2207dirdiff (int dir1, int dir2)
2216{ 2208{
2217 int d; 2209 int d;
2218 2210
2384 insert_ob_in_ob (object_create_clone (item), dst); 2376 insert_ob_in_ob (object_create_clone (item), dst);
2385 2377
2386 return dst; 2378 return dst;
2387} 2379}
2388 2380
2389/* GROS - Creates an object using a string representing its content. */
2390/* Basically, we save the content of the string to a temp file, then call */
2391/* load_object on it. I admit it is a highly inefficient way to make things, */
2392/* but it was simple to make and allows reusing the load_object function. */
2393/* Remember not to use load_object_str in a time-critical situation. */
2394/* Also remember that multiparts objects are not supported for now. */
2395object *
2396load_object_str (const char *obstr)
2397{
2398 object *op;
2399 char filename[MAX_BUF];
2400
2401 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2402
2403 FILE *tempfile = fopen (filename, "w");
2404
2405 if (tempfile == NULL)
2406 {
2407 LOG (llevError, "Error - Unable to access load object temp file\n");
2408 return NULL;
2409 }
2410
2411 fprintf (tempfile, obstr);
2412 fclose (tempfile);
2413
2414 op = object::create ();
2415
2416 object_thawer thawer (filename);
2417
2418 if (thawer)
2419 load_object (thawer, op, 0);
2420
2421 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2422 CLEAR_FLAG (op, FLAG_REMOVED);
2423
2424 return op;
2425}
2426
2427/* This returns the first object in who's inventory that 2381/* This returns the first object in who's inventory that
2428 * has the same type and subtype match. 2382 * has the same type and subtype match.
2429 * returns NULL if no match. 2383 * returns NULL if no match.
2430 */ 2384 */
2431object * 2385object *
2484 if (link->key == canonical_key) 2438 if (link->key == canonical_key)
2485 return link->value; 2439 return link->value;
2486 2440
2487 return 0; 2441 return 0;
2488} 2442}
2489
2490 2443
2491/* 2444/*
2492 * Updates the canonical_key in op to value. 2445 * Updates the canonical_key in op to value.
2493 * 2446 *
2494 * canonical_key is a shared string (value doesn't have to be). 2447 * canonical_key is a shared string (value doesn't have to be).
2597 } 2550 }
2598 else 2551 else
2599 item = item->env; 2552 item = item->env;
2600} 2553}
2601 2554
2555
2556const char *
2557object::flag_desc (char *desc, int len) const
2558{
2559 char *p = desc;
2560 bool first = true;
2561
2562 *p = 0;
2563
2564 for (int i = 0; i < NUM_FLAGS; i++)
2565 {
2566 if (len <= 10) // magic constant!
2567 {
2568 snprintf (p, len, ",...");
2569 break;
2570 }
2571
2572 if (flag [i])
2573 {
2574 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2575 len -= cnt;
2576 p += cnt;
2577 first = false;
2578 }
2579 }
2580
2581 return desc;
2582}
2583
2602// return a suitable string describing an objetc in enough detail to find it 2584// return a suitable string describing an object in enough detail to find it
2603const char * 2585const char *
2604object::debug_desc (char *info) const 2586object::debug_desc (char *info) const
2605{ 2587{
2588 char flagdesc[512];
2606 char info2[256 * 3]; 2589 char info2[256 * 4];
2607 char *p = info; 2590 char *p = info;
2608 2591
2609 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2592 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2610 count, 2593 count, uuid.seq,
2611 &name, 2594 &name,
2612 title ? " " : "", 2595 title ? "\",title:\"" : "",
2613 title ? (const char *)title : ""); 2596 title ? (const char *)title : "",
2597 flag_desc (flagdesc, 512), type);
2614 2598
2615 if (env) 2599 if (env)
2616 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2600 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2617 2601
2618 if (map) 2602 if (map)
2619 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2603 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2620 2604
2621 return info; 2605 return info;
2622} 2606}
2623 2607
2624const char * 2608const char *
2625object::debug_desc () const 2609object::debug_desc () const
2626{ 2610{
2627 static char info[256 * 3]; 2611 static char info[3][256 * 4];
2612 static int info_idx;
2613
2628 return debug_desc (info); 2614 return debug_desc (info [++info_idx % 3]);
2629} 2615}
2630 2616
2617struct region *
2618object::region () const
2619{
2620 return map ? map->region (x, y)
2621 : region::default_region ();
2622}
2623
2624const materialtype_t *
2625object::dominant_material () const
2626{
2627 if (materialtype_t *mat = name_to_material (materialname))
2628 return mat;
2629
2630 // omfg this is slow, this has to be temporary :)
2631 shstr unknown ("unknown");
2632
2633 return name_to_material (unknown);
2634}
2635
2636void
2637object::open_container (object *new_container)
2638{
2639 if (container == new_container)
2640 return;
2641
2642 if (object *old_container = container)
2643 {
2644 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2645 return;
2646
2647#if 0
2648 // remove the "Close old_container" object.
2649 if (object *closer = old_container->inv)
2650 if (closer->type == CLOSE_CON)
2651 closer->destroy ();
2652#endif
2653
2654 old_container->flag [FLAG_APPLIED] = 0;
2655 container = 0;
2656
2657 esrv_update_item (UPD_FLAGS, this, old_container);
2658 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2659 }
2660
2661 if (new_container)
2662 {
2663 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2664 return;
2665
2666 // TODO: this does not seem to serve any purpose anymore?
2667#if 0
2668 // insert the "Close Container" object.
2669 if (archetype *closer = new_container->other_arch)
2670 {
2671 object *closer = arch_to_object (new_container->other_arch);
2672 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2673 new_container->insert (closer);
2674 }
2675#endif
2676
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2678
2679 new_container->flag [FLAG_APPLIED] = 1;
2680 container = new_container;
2681
2682 esrv_update_item (UPD_FLAGS, this, new_container);
2683 esrv_send_inventory (this, new_container);
2684 }
2685}
2686
2687

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines