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.86 by root, Tue Dec 26 08:17:58 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}
526 531
527 update_ob_speed (dst); 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 ();
547
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/*
554 * Updates the speed of an object. If the speed changes from 0 to another 594 * Updates the speed of an object. If the speed changes from 0 to another
555 * value, or vice versa, then add/remove the object from the active list. 595 * value, or vice versa, then add/remove the object from the active list.
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
559update_ob_speed (object *op) 599object::set_speed (float speed)
560{ 600{
561 extern int arch_init; 601 if (flag [FLAG_FREED] && speed)
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
567 { 602 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 603 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 op->speed = 0; 604 speed = 0;
570 }
571
572 if (arch_init)
573 return;
574
575 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
576 { 605 }
577 /* If already on active list, don't do anything */
578 if (op->active_next || op->active_prev || op == active_objects)
579 return;
580 606
581 /* process_events() expects us to insert the object at the beginning 607 this->speed = speed;
582 * of the list. */
583 op->active_next = active_objects;
584 608
585 if (op->active_next != NULL) 609 if (has_active_speed ())
586 op->active_next->active_prev = op; 610 activate ();
587
588 active_objects = op;
589 }
590 else 611 else
591 { 612 deactivate ();
592 /* If not on the active list, nothing needs to be done */
593 if (!op->active_next && !op->active_prev && op != active_objects)
594 return;
595
596 if (op->active_prev == NULL)
597 {
598 active_objects = op->active_next;
599
600 if (op->active_next != NULL)
601 op->active_next->active_prev = NULL;
602 }
603 else
604 {
605 op->active_prev->active_next = op->active_next;
606
607 if (op->active_next)
608 op->active_next->active_prev = op->active_prev;
609 }
610
611 op->active_next = NULL;
612 op->active_prev = NULL;
613 }
614}
615
616/* This function removes object 'op' from the list of active
617 * objects.
618 * This should only be used for style maps or other such
619 * reference maps where you don't want an object that isn't
620 * in play chewing up cpu time getting processed.
621 * The reverse of this is to call update_ob_speed, which
622 * will do the right thing based on the speed of the object.
623 */
624void
625remove_from_active_list (object *op)
626{
627 /* If not on the active list, nothing needs to be done */
628 if (!op->active_next && !op->active_prev && op != active_objects)
629 return;
630
631 if (op->active_prev == NULL)
632 {
633 active_objects = op->active_next;
634 if (op->active_next != NULL)
635 op->active_next->active_prev = NULL;
636 }
637 else
638 {
639 op->active_prev->active_next = op->active_next;
640 if (op->active_next)
641 op->active_next->active_prev = op->active_prev;
642 }
643 op->active_next = NULL;
644 op->active_prev = NULL;
645} 613}
646 614
647/* 615/*
648 * update_object() updates the the map. 616 * update_object() updates the the map.
649 * It takes into account invisible objects (and represent squares covered 617 * It takes into account invisible objects (and represent squares covered
662 * UP_OBJ_FACE: only the objects face has changed. 630 * UP_OBJ_FACE: only the objects face has changed.
663 */ 631 */
664void 632void
665update_object (object *op, int action) 633update_object (object *op, int action)
666{ 634{
667 MoveType move_on, move_off, move_block, move_slow;
668
669 if (op == NULL) 635 if (op == NULL)
670 { 636 {
671 /* this should never happen */ 637 /* this should never happen */
672 LOG (llevDebug, "update_object() called for NULL object.\n"); 638 LOG (llevDebug, "update_object() called for NULL object.\n");
673 return; 639 return;
697 return; 663 return;
698 } 664 }
699 665
700 mapspace &m = op->ms (); 666 mapspace &m = op->ms ();
701 667
702 if (m.flags_ & P_NEED_UPDATE) 668 if (!(m.flags_ & P_UPTODATE))
703 /* nop */; 669 /* nop */;
704 else if (action == UP_OBJ_INSERT) 670 else if (action == UP_OBJ_INSERT)
705 { 671 {
706 // this is likely overkill, TODO: revisit (schmorp) 672 // this is likely overkill, TODO: revisit (schmorp)
707 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 673 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
716 /* 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
717 * to have move_allow right now. 683 * to have move_allow right now.
718 */ 684 */
719 || ((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
720 || 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)
721 m.flags_ = P_NEED_UPDATE; 687 m.flags_ = 0;
722 } 688 }
723 /* if the object is being removed, we can't make intelligent 689 /* if the object is being removed, we can't make intelligent
724 * decisions, because remove_ob can't really pass the object 690 * decisions, because remove_ob can't really pass the object
725 * that is being removed. 691 * that is being removed.
726 */ 692 */
727 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 693 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
728 m.flags_ = P_NEED_UPDATE; 694 m.flags_ = 0;
729 else if (action == UP_OBJ_FACE) 695 else if (action == UP_OBJ_FACE)
730 /* Nothing to do for that case */ ; 696 /* Nothing to do for that case */ ;
731 else 697 else
732 LOG (llevError, "update_object called with invalid action: %d\n", action); 698 LOG (llevError, "update_object called with invalid action: %d\n", action);
733 699
734 if (op->more) 700 if (op->more)
735 update_object (op->more, action); 701 update_object (op->more, action);
736} 702}
737 703
738object::vector object::objects; // not yet used
739object *object::first;
740
741object::object () 704object::object ()
742{ 705{
743 SET_FLAG (this, FLAG_REMOVED); 706 SET_FLAG (this, FLAG_REMOVED);
744 707
745 expmul = 1.0; 708 expmul = 1.0;
746 face = blank_face; 709 face = blank_face;
747} 710}
748 711
749object::~object () 712object::~object ()
750{ 713{
714 unlink ();
715
751 free_key_values (this); 716 free_key_values (this);
752} 717}
753 718
719static int object_count;
720
754void object::link () 721void object::link ()
755{ 722{
756 count = ++ob_count; 723 assert (!index);//D
757 uuid = gen_uuid (); 724 uuid = gen_uuid ();
725 count = ++object_count;
758 726
759 prev = 0; 727 refcnt_inc ();
760 next = object::first; 728 objects.insert (this);
761
762 if (object::first)
763 object::first->prev = this;
764
765 object::first = this;
766} 729}
767 730
768void object::unlink () 731void object::unlink ()
769{ 732{
770 if (this == object::first) 733 if (!index)
771 object::first = next; 734 return;
772 735
773 /* Remove this object from the list of used objects */ 736 objects.erase (this);
774 if (prev) prev->next = next; 737 refcnt_dec ();
775 if (next) next->prev = prev; 738}
776 739
777 prev = 0; 740void
778 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 }
779} 845}
780 846
781object *object::create () 847object *object::create ()
782{ 848{
783 object *op = new object; 849 object *op = new object;
784 op->link (); 850 op->link ();
785 return op; 851 return op;
786} 852}
787 853
788/*
789 * free_object() frees everything allocated by an object, removes
790 * it from the list of used objects, and puts it on the list of
791 * free objects. The IS_FREED() flag is set in the object.
792 * The object must have been removed by remove_ob() first for
793 * this function to succeed.
794 *
795 * If destroy_inventory is set, free inventory as well. Else drop items in
796 * inventory to the ground.
797 */
798void 854void
799object::do_destroy () 855object::do_destroy ()
800{ 856{
801 attachable::do_destroy (); 857 attachable::do_destroy ();
802 858
807 remove_friendly_object (this); 863 remove_friendly_object (this);
808 864
809 if (!flag [FLAG_REMOVED]) 865 if (!flag [FLAG_REMOVED])
810 remove (); 866 remove ();
811 867
812 if (flag [FLAG_FREED]) 868 destroy_inv (true);
813 return; 869
870 deactivate ();
871 unlink ();
814 872
815 flag [FLAG_FREED] = 1; 873 flag [FLAG_FREED] = 1;
816 874
817 // hack to ensure that freed objects still have a valid map 875 // hack to ensure that freed objects still have a valid map
818 { 876 {
824 882
825 freed_map->name = "/internal/freed_objects_map"; 883 freed_map->name = "/internal/freed_objects_map";
826 freed_map->width = 3; 884 freed_map->width = 3;
827 freed_map->height = 3; 885 freed_map->height = 3;
828 886
829 freed_map->allocate (); 887 freed_map->alloc ();
888 freed_map->in_memory = MAP_IN_MEMORY;
830 } 889 }
831 890
832 map = freed_map; 891 map = freed_map;
833 x = 1; 892 x = 1;
834 y = 1; 893 y = 1;
835 } 894 }
836 895
837 more = 0;
838 head = 0; 896 head = 0;
839 inv = 0; 897
898 if (more)
899 {
900 more->destroy ();
901 more = 0;
902 }
840 903
841 // clear those pointers that likely might have circular references to us 904 // clear those pointers that likely might have circular references to us
842 owner = 0; 905 owner = 0;
843 enemy = 0; 906 enemy = 0;
844 attacked_by = 0; 907 attacked_by = 0;
845
846 // only relevant for players(?), but make sure of it anyways
847 contr = 0;
848
849 /* Remove object from the active list */
850 speed = 0;
851 update_ob_speed (this);
852
853 unlink ();
854}
855
856/*
857 * Remove and free all objects in the inventory of the given object.
858 * object.c ?
859 */
860void
861object::destroy_inv (bool drop_to_ground)
862{
863 if (!inv)
864 return;
865
866 /* Only if the space blocks everything do we not process -
867 * if some form of movement is allowed, let objects
868 * drop on that space.
869 */
870 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
871 {
872 while (inv)
873 {
874 inv->destroy_inv (drop_to_ground);
875 inv->destroy ();
876 }
877 }
878 else
879 { /* Put objects in inventory onto this space */
880 while (inv)
881 {
882 object *op = inv;
883
884 if (op->flag [FLAG_STARTEQUIP]
885 || op->flag [FLAG_NO_DROP]
886 || op->type == RUNE
887 || op->type == TRAP
888 || op->flag [FLAG_IS_A_TEMPLATE])
889 op->destroy ();
890 else
891 {
892 op->remove ();
893 op->x = x;
894 op->y = y;
895 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
896 }
897 }
898 }
899} 908}
900 909
901void 910void
902object::destroy (bool destroy_inventory) 911object::destroy (bool destroy_inventory)
903{ 912{
904 if (destroyed ()) 913 if (destroyed ())
905 return; 914 return;
906 915
907 if (more)
908 {
909 //TODO: non-head objects must not have inventory
910 more->destroy (destroy_inventory);
911 more = 0;
912 }
913
914 if (destroy_inventory) 916 if (destroy_inventory)
915 destroy_inv (true); 917 destroy_inv (false);
916 918
917 attachable::destroy (); 919 attachable::destroy ();
918} 920}
919 921
920/* 922/*
938 * 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
939 * 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
940 * object will have no environment. If the object previously had an 942 * object will have no environment. If the object previously had an
941 * environment, the x and y coordinates will be updated to 943 * environment, the x and y coordinates will be updated to
942 * the previous environment. 944 * the previous environment.
943 * Beware: This function is called from the editor as well!
944 */ 945 */
945void 946void
946object::remove () 947object::do_remove ()
947{ 948{
948 object *tmp, *last = 0; 949 object *tmp, *last = 0;
949 object *otmp; 950 object *otmp;
950 951
951 if (QUERY_FLAG (this, FLAG_REMOVED)) 952 if (QUERY_FLAG (this, FLAG_REMOVED))
973 * to save cpu time. 974 * to save cpu time.
974 */ 975 */
975 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))
976 otmp->update_stats (); 977 otmp->update_stats ();
977 978
978 if (above != NULL) 979 if (above)
979 above->below = below; 980 above->below = below;
980 else 981 else
981 env->inv = below; 982 env->inv = below;
982 983
983 if (below != NULL) 984 if (below)
984 below->above = above; 985 below->above = above;
985 986
986 /* we set up values so that it could be inserted into 987 /* we set up values so that it could be inserted into
987 * 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
988 * to the caller to decide what we want to do. 989 * to the caller to decide what we want to do.
992 above = 0, below = 0; 993 above = 0, below = 0;
993 env = 0; 994 env = 0;
994 } 995 }
995 else if (map) 996 else if (map)
996 { 997 {
997 /* Re did the following section of code - it looks like it had 998 if (type == PLAYER)
998 * lots of logic for things we no longer care about
999 */ 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 ();
1000 1012
1001 /* link the object above us */ 1013 /* link the object above us */
1002 if (above) 1014 if (above)
1003 above->below = below; 1015 above->below = below;
1004 else 1016 else
1005 map->at (x, y).top = below; /* we were top, set new top */ 1017 ms.top = below; /* we were top, set new top */
1006 1018
1007 /* Relink the object below us, if there is one */ 1019 /* Relink the object below us, if there is one */
1008 if (below) 1020 if (below)
1009 below->above = above; 1021 below->above = above;
1010 else 1022 else
1012 /* 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
1013 * use translated coordinates in case some oddness with map tiling is 1025 * use translated coordinates in case some oddness with map tiling is
1014 * evident 1026 * evident
1015 */ 1027 */
1016 if (GET_MAP_OB (map, x, y) != this) 1028 if (GET_MAP_OB (map, x, y) != this)
1017 {
1018 char *dump = dump_object (this);
1019 LOG (llevError,
1020 "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 ());
1021 free (dump);
1022 dump = dump_object (GET_MAP_OB (map, x, y));
1023 LOG (llevError, "%s\n", dump);
1024 free (dump);
1025 }
1026 1030
1027 map->at (x, y).bot = above; /* goes on above it. */ 1031 ms.bot = above; /* goes on above it. */
1028 } 1032 }
1029 1033
1030 above = 0; 1034 above = 0;
1031 below = 0; 1035 below = 0;
1032 1036
1033 if (map->in_memory == MAP_SAVING) 1037 if (map->in_memory == MAP_SAVING)
1034 return; 1038 return;
1035 1039
1036 int check_walk_off = !flag [FLAG_NO_APPLY]; 1040 int check_walk_off = !flag [FLAG_NO_APPLY];
1037 1041
1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1042 for (tmp = ms.bot; tmp; tmp = tmp->above)
1039 { 1043 {
1040 /* 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
1041 * being removed. 1045 * being removed.
1042 */ 1046 */
1043 1047
1055 1059
1056 if (tmp->contr->ns) 1060 if (tmp->contr->ns)
1057 tmp->contr->ns->floorbox_update (); 1061 tmp->contr->ns->floorbox_update ();
1058 } 1062 }
1059 1063
1060 /* See if player moving off should effect something */ 1064 /* See if object moving off should effect something */
1061 if (check_walk_off 1065 if (check_walk_off
1062 && ((move_type & tmp->move_off) 1066 && ((move_type & tmp->move_off)
1063 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1067 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064 { 1068 {
1065 move_apply (tmp, this, 0); 1069 move_apply (tmp, this, 0);
1067 if (destroyed ()) 1071 if (destroyed ())
1068 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 ());
1069 } 1073 }
1070 1074
1071 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1075 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072 1076 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1073 if (tmp->above == tmp) 1077 if (tmp->above == tmp)
1074 tmp->above = 0; 1078 tmp->above = 0;
1075 1079
1076 last = tmp; 1080 last = tmp;
1077 } 1081 }
1078 1082
1079 /* 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?
1080 if (!last) 1085 if (!last)
1081 map->at (x, y).flags_ = P_NEED_UPDATE; 1086 map->at (x, y).flags_ = 0;
1082 else 1087 else
1083 update_object (last, UP_OBJ_REMOVE); 1088 update_object (last, UP_OBJ_REMOVE);
1084 1089
1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1090 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1086 update_all_los (map, x, y); 1091 update_all_los (map, x, y);
1122 } 1127 }
1123 1128
1124 return 0; 1129 return 0;
1125} 1130}
1126 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
1127/* 1155/*
1128 * 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
1129 * job preparing multi-part monsters 1157 * job preparing multi-part monsters.
1130 */ 1158 */
1131object * 1159object *
1132insert_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)
1133{ 1161{
1134 object *tmp;
1135
1136 if (op->head)
1137 op = op->head;
1138
1139 for (tmp = op; tmp; tmp = tmp->more) 1162 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140 { 1163 {
1141 tmp->x = x + tmp->arch->clone.x; 1164 tmp->x = x + tmp->arch->clone.x;
1142 tmp->y = y + tmp->arch->clone.y; 1165 tmp->y = y + tmp->arch->clone.y;
1143 } 1166 }
1144 1167
1166 * just 'op' otherwise 1189 * just 'op' otherwise
1167 */ 1190 */
1168object * 1191object *
1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1192insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1170{ 1193{
1194 assert (!op->flag [FLAG_FREED]);
1195
1171 object *tmp, *top, *floor = NULL; 1196 object *tmp, *top, *floor = NULL;
1172 sint16 x, y;
1173 1197
1174 if (QUERY_FLAG (op, FLAG_FREED)) 1198 op->remove ();
1175 {
1176 LOG (llevError, "Trying to insert freed object!\n");
1177 return NULL;
1178 }
1179 1199
1180 if (m == NULL) 1200#if 0
1181 { 1201 if (!m->active != !op->active)
1182 char *dump = dump_object (op); 1202 if (m->active)
1183 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1203 op->activate_recursive ();
1184 free (dump); 1204 else
1185 return op; 1205 op->deactivate_recursive ();
1186 } 1206#endif
1187 1207
1188 if (out_of_map (m, op->x, op->y)) 1208 if (out_of_map (m, op->x, op->y))
1189 { 1209 {
1190 char *dump = dump_object (op);
1191 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 ());
1192#ifdef MANY_CORES 1211#ifdef MANY_CORES
1193 /* 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
1194 * 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
1195 * improperly inserted. 1214 * improperly inserted.
1196 */ 1215 */
1197 abort (); 1216 abort ();
1198#endif 1217#endif
1199 free (dump);
1200 return op; 1218 return op;
1201 } 1219 }
1202 1220
1203 if (!QUERY_FLAG (op, FLAG_REMOVED))
1204 {
1205 char *dump = dump_object (op);
1206 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1207 free (dump);
1208 return op;
1209 }
1210
1211 if (op->more)
1212 {
1213 /* The part may be on a different map. */
1214
1215 object *more = op->more; 1221 if (object *more = op->more)
1216 1222 {
1217 /* We really need the caller to normalize coordinates - if
1218 * we set the map, that doesn't work if the location is within
1219 * a map and this is straddling an edge. So only if coordinate
1220 * is clear wrong do we normalize it.
1221 */
1222 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1223 more->map = get_map_from_coord (m, &more->x, &more->y);
1224 else if (!more->map)
1225 {
1226 /* For backwards compatibility - when not dealing with tiled maps,
1227 * more->map should always point to the parent.
1228 */
1229 more->map = m;
1230 }
1231
1232 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1223 if (!insert_ob_in_map (more, m, originator, flag))
1233 { 1224 {
1234 if (!op->head) 1225 if (!op->head)
1235 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");
1236 1227
1237 return 0; 1228 return 0;
1242 1233
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1234 /* Ideally, the caller figures this out. However, it complicates a lot
1244 * 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
1245 * need extra work 1236 * need extra work
1246 */ 1237 */
1247 op->map = get_map_from_coord (m, &op->x, &op->y); 1238 if (!xy_normalise (m, op->x, op->y))
1248 x = op->x; 1239 return 0;
1249 y = op->y; 1240
1241 op->map = m;
1242 mapspace &ms = op->ms ();
1250 1243
1251 /* this has to be done after we translate the coordinates. 1244 /* this has to be done after we translate the coordinates.
1252 */ 1245 */
1253 if (op->nrof && !(flag & INS_NO_MERGE)) 1246 if (op->nrof && !(flag & INS_NO_MERGE))
1254 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1247 for (tmp = ms.bot; tmp; tmp = tmp->above)
1255 if (object::can_merge (op, tmp)) 1248 if (object::can_merge (op, tmp))
1256 { 1249 {
1257 op->nrof += tmp->nrof; 1250 op->nrof += tmp->nrof;
1258 tmp->destroy (); 1251 tmp->destroy ();
1259 } 1252 }
1276 op->below = originator->below; 1269 op->below = originator->below;
1277 1270
1278 if (op->below) 1271 if (op->below)
1279 op->below->above = op; 1272 op->below->above = op;
1280 else 1273 else
1281 op->ms ().bot = op; 1274 ms.bot = op;
1282 1275
1283 /* since *below* originator, no need to update top */ 1276 /* since *below* originator, no need to update top */
1284 originator->below = op; 1277 originator->below = op;
1285 } 1278 }
1286 else 1279 else
1287 { 1280 {
1281 top = ms.bot;
1282
1288 /* If there are other objects, then */ 1283 /* If there are other objects, then */
1289 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1284 if ((!(flag & INS_MAP_LOAD)) && top)
1290 { 1285 {
1291 object *last = NULL; 1286 object *last = 0;
1292 1287
1293 /* 1288 /*
1294 * 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.
1295 * We've already dealt with merging if appropriate. 1290 * We've already dealt with merging if appropriate.
1296 * 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
1300 * 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
1301 * 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
1302 * 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
1303 * that flying non pickable objects are spell objects. 1298 * that flying non pickable objects are spell objects.
1304 */ 1299 */
1305 1300 for (top = ms.bot; top; top = top->above)
1306 while (top != NULL)
1307 { 1301 {
1308 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))
1309 floor = top; 1303 floor = top;
1310 1304
1311 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))
1314 top = top->below; 1308 top = top->below;
1315 break; 1309 break;
1316 } 1310 }
1317 1311
1318 last = top; 1312 last = top;
1319 top = top->above;
1320 } 1313 }
1321 1314
1322 /* 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 */
1323 top = last; 1316 top = last;
1324 1317
1326 * looks like instead of lots of conditions here. 1319 * looks like instead of lots of conditions here.
1327 * makes things faster, and effectively the same result. 1320 * makes things faster, and effectively the same result.
1328 */ 1321 */
1329 1322
1330 /* Have object 'fall below' other objects that block view. 1323 /* Have object 'fall below' other objects that block view.
1331 * Unless those objects are exits, type 66 1324 * Unless those objects are exits.
1332 * If INS_ON_TOP is used, don't do this processing 1325 * If INS_ON_TOP is used, don't do this processing
1333 * Need to find the object that in fact blocks view, otherwise 1326 * Need to find the object that in fact blocks view, otherwise
1334 * stacking is a bit odd. 1327 * stacking is a bit odd.
1335 */ 1328 */
1336 if (!(flag & INS_ON_TOP) && 1329 if (!(flag & INS_ON_TOP)
1337 (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))
1338 { 1332 {
1339 for (last = top; last != floor; last = last->below) 1333 for (last = top; last != floor; last = last->below)
1340 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1334 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1341 break; 1335 break;
1336
1342 /* Check to see if we found the object that blocks view, 1337 /* Check to see if we found the object that blocks view,
1343 * 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
1344 * we can get inserted below this one, which requires we 1339 * we can get inserted below this one, which requires we
1345 * set top to the object below us. 1340 * set top to the object below us.
1346 */ 1341 */
1348 top = last->below; 1343 top = last->below;
1349 } 1344 }
1350 } /* If objects on this space */ 1345 } /* If objects on this space */
1351 1346
1352 if (flag & INS_MAP_LOAD) 1347 if (flag & INS_MAP_LOAD)
1353 top = GET_MAP_TOP (op->map, op->x, op->y); 1348 top = ms.top;
1354 1349
1355 if (flag & INS_ABOVE_FLOOR_ONLY) 1350 if (flag & INS_ABOVE_FLOOR_ONLY)
1356 top = floor; 1351 top = floor;
1357 1352
1358 /* 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.
1359 */ 1354 */
1360 1355
1361 /* First object on this space */ 1356 /* First object on this space */
1362 if (!top) 1357 if (!top)
1363 { 1358 {
1364 op->above = GET_MAP_OB (op->map, op->x, op->y); 1359 op->above = ms.bot;
1365 1360
1366 if (op->above) 1361 if (op->above)
1367 op->above->below = op; 1362 op->above->below = op;
1368 1363
1369 op->below = NULL; 1364 op->below = 0;
1370 op->ms ().bot = op; 1365 ms.bot = op;
1371 } 1366 }
1372 else 1367 else
1373 { /* get inserted into the stack above top */ 1368 { /* get inserted into the stack above top */
1374 op->above = top->above; 1369 op->above = top->above;
1375 1370
1378 1373
1379 op->below = top; 1374 op->below = top;
1380 top->above = op; 1375 top->above = op;
1381 } 1376 }
1382 1377
1383 if (op->above == NULL) 1378 if (!op->above)
1384 op->ms ().top = op; 1379 ms.top = op;
1385 } /* else not INS_BELOW_ORIGINATOR */ 1380 } /* else not INS_BELOW_ORIGINATOR */
1386 1381
1387 if (op->type == PLAYER) 1382 if (op->type == PLAYER)
1383 {
1388 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;
1389 1390
1390 /* 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
1391 * it, so save a few ticks and start from there. 1392 * it, so save a few ticks and start from there.
1392 */ 1393 */
1393 if (!(flag & INS_MAP_LOAD)) 1394 if (!(flag & INS_MAP_LOAD))
1394 if (object *pl = op->ms ().player ()) 1395 if (object *pl = ms.player ())
1395 if (pl->contr->ns) 1396 if (pl->contr->ns)
1396 pl->contr->ns->floorbox_update (); 1397 pl->contr->ns->floorbox_update ();
1397 1398
1398 /* If this object glows, it may affect lighting conditions that are 1399 /* If this object glows, it may affect lighting conditions that are
1399 * 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
1400 * 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
1401 * on the map will get recalculated. The players could very well 1402 * on the map will get recalculated. The players could very well
1402 * 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 -
1403 * this should get redone to only look for players within range, 1404 * this should get redone to only look for players within range,
1404 * or just updating the P_NEED_UPDATE for spaces within this area 1405 * or just updating the P_UPTODATE for spaces within this area
1405 * of effect may be sufficient. 1406 * of effect may be sufficient.
1406 */ 1407 */
1407 if (op->map->darkness && (op->glow_radius != 0)) 1408 if (op->map->darkness && (op->glow_radius != 0))
1408 update_all_los (op->map, op->x, op->y); 1409 update_all_los (op->map, op->x, op->y);
1409 1410
1447{ 1448{
1448 object *tmp, *tmp1; 1449 object *tmp, *tmp1;
1449 1450
1450 /* first search for itself and remove any old instances */ 1451 /* first search for itself and remove any old instances */
1451 1452
1452 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)
1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1454 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454 tmp->destroy (); 1455 tmp->destroy ();
1455 1456
1456 tmp1 = arch_to_object (archetype::find (arch_string)); 1457 tmp1 = arch_to_object (archetype::find (arch_string));
1457 1458
1458 tmp1->x = op->x; 1459 tmp1->x = op->x;
1459 tmp1->y = op->y; 1460 tmp1->y = op->y;
1460 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);
1461} 1468}
1462 1469
1463/* 1470/*
1464 * 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
1465 * is returned contains nr objects, and the remaining parts contains 1472 * is returned contains nr objects, and the remaining parts contains
1466 * 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).
1467 * On failure, NULL is returned, and the reason put into the 1474 * On failure, NULL is returned, and the reason put into the
1468 * global static errmsg array. 1475 * global static errmsg array.
1469 */ 1476 */
1470
1471object * 1477object *
1472get_split_ob (object *orig_ob, uint32 nr) 1478get_split_ob (object *orig_ob, uint32 nr)
1473{ 1479{
1474 object *newob; 1480 object *newob;
1475 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1481 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1506 * 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
1507 * is subsequently removed and freed. 1513 * is subsequently removed and freed.
1508 * 1514 *
1509 * 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
1510 */ 1516 */
1511
1512object * 1517object *
1513decrease_ob_nr (object *op, uint32 i) 1518decrease_ob_nr (object *op, uint32 i)
1514{ 1519{
1515 object *tmp; 1520 object *tmp;
1516 1521
1591 1596
1592/* 1597/*
1593 * add_weight(object, weight) adds the specified weight to an object, 1598 * add_weight(object, weight) adds the specified weight to an object,
1594 * and also updates how much the environment(s) is/are carrying. 1599 * and also updates how much the environment(s) is/are carrying.
1595 */ 1600 */
1596
1597void 1601void
1598add_weight (object *op, signed long weight) 1602add_weight (object *op, signed long weight)
1599{ 1603{
1600 while (op != NULL) 1604 while (op != NULL)
1601 { 1605 {
1633 * inside the object environment. 1637 * inside the object environment.
1634 * 1638 *
1635 * 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
1636 * be != op, if items are merged. -Tero 1640 * be != op, if items are merged. -Tero
1637 */ 1641 */
1638
1639object * 1642object *
1640object::insert (object *op) 1643object::insert (object *op)
1641{ 1644{
1642 object *tmp, *otmp; 1645 object *tmp, *otmp;
1643 1646
1739 * 1742 *
1740 * 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
1741 * 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
1742 * on top. 1745 * on top.
1743 */ 1746 */
1744
1745int 1747int
1746check_move_on (object *op, object *originator) 1748check_move_on (object *op, object *originator)
1747{ 1749{
1748 object *tmp; 1750 object *tmp;
1749 maptile *m = op->map; 1751 maptile *m = op->map;
1776 1778
1777 /* The objects have to be checked from top to bottom. 1779 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1780 * Hence, we first go to the top:
1779 */ 1781 */
1780 1782
1781 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)
1782 { 1784 {
1783 /* Trim the search when we find the first other spell effect 1785 /* Trim the search when we find the first other spell effect
1784 * 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,
1785 * we don't need to check all of them. 1787 * we don't need to check all of them.
1786 */ 1788 */
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1806 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805 ((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))
1806 { 1808 {
1807 1809
1808 float 1810 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1811 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1812
1811 if (op->type == PLAYER) 1813 if (op->type == PLAYER)
1812 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)) ||
1813 (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)))
1814 diff /= 4.0; 1816 diff /= 4.0;
1844 * The first matching object is returned, or NULL if none. 1846 * The first matching object is returned, or NULL if none.
1845 */ 1847 */
1846object * 1848object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1849present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1850{
1849 if (m == NULL || out_of_map (m, x, y)) 1851 if (!m || out_of_map (m, x, y))
1850 { 1852 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1853 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1854 return NULL;
1853 } 1855 }
1854 1856
1855 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)
1856 if (tmp->arch == at) 1858 if (tmp->arch == at)
1857 return tmp; 1859 return tmp;
1858 1860
1859 return NULL; 1861 return NULL;
1860} 1862}
1871 { 1873 {
1872 LOG (llevError, "Present called outside map.\n"); 1874 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1875 return NULL;
1874 } 1876 }
1875 1877
1876 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)
1877 if (tmp->type == type) 1879 if (tmp->type == type)
1878 return tmp; 1880 return tmp;
1879 1881
1880 return NULL; 1882 return NULL;
1881} 1883}
2021 } 2023 }
2022 2024
2023 if (!index) 2025 if (!index)
2024 return -1; 2026 return -1;
2025 2027
2026 return altern[RANDOM () % index]; 2028 return altern [rndm (index)];
2027} 2029}
2028 2030
2029/* 2031/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2032 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2033 * find_free_spot(), but it will search max number of squares.
2052{ 2054{
2053 arr += begin; 2055 arr += begin;
2054 end -= begin; 2056 end -= begin;
2055 2057
2056 while (--end) 2058 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2059 swap (arr [end], arr [rndm (end + 1)]);
2058} 2060}
2059 2061
2060/* new function to make monster searching more efficient, and effective! 2062/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2063 * This basically returns a randomized array (in the passed pointer) of
2062 * 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
2196 2198
2197 return 3; 2199 return 3;
2198} 2200}
2199 2201
2200/* 2202/*
2201 * absdir(int): Returns a number between 1 and 8, which represent
2202 * the "absolute" direction of a number (it actually takes care of
2203 * "overflow" in previous calculations of a direction).
2204 */
2205
2206int
2207absdir (int d)
2208{
2209 while (d < 1)
2210 d += 8;
2211
2212 while (d > 8)
2213 d -= 8;
2214
2215 return d;
2216}
2217
2218/*
2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2203 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2204 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2205 */
2222
2223int 2206int
2224dirdiff (int dir1, int dir2) 2207dirdiff (int dir1, int dir2)
2225{ 2208{
2226 int d; 2209 int d;
2227 2210
2393 insert_ob_in_ob (object_create_clone (item), dst); 2376 insert_ob_in_ob (object_create_clone (item), dst);
2394 2377
2395 return dst; 2378 return dst;
2396} 2379}
2397 2380
2398/* GROS - Creates an object using a string representing its content. */
2399/* Basically, we save the content of the string to a temp file, then call */
2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2401/* but it was simple to make and allows reusing the load_object function. */
2402/* Remember not to use load_object_str in a time-critical situation. */
2403/* Also remember that multiparts objects are not supported for now. */
2404object *
2405load_object_str (const char *obstr)
2406{
2407 object *op;
2408 char filename[MAX_BUF];
2409
2410 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412 FILE *tempfile = fopen (filename, "w");
2413
2414 if (tempfile == NULL)
2415 {
2416 LOG (llevError, "Error - Unable to access load object temp file\n");
2417 return NULL;
2418 }
2419
2420 fprintf (tempfile, obstr);
2421 fclose (tempfile);
2422
2423 op = object::create ();
2424
2425 object_thawer thawer (filename);
2426
2427 if (thawer)
2428 load_object (thawer, op, 0);
2429
2430 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431 CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433 return op;
2434}
2435
2436/* This returns the first object in who's inventory that 2381/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2382 * has the same type and subtype match.
2438 * returns NULL if no match. 2383 * returns NULL if no match.
2439 */ 2384 */
2440object * 2385object *
2493 if (link->key == canonical_key) 2438 if (link->key == canonical_key)
2494 return link->value; 2439 return link->value;
2495 2440
2496 return 0; 2441 return 0;
2497} 2442}
2498
2499 2443
2500/* 2444/*
2501 * Updates the canonical_key in op to value. 2445 * Updates the canonical_key in op to value.
2502 * 2446 *
2503 * 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).
2606 } 2550 }
2607 else 2551 else
2608 item = item->env; 2552 item = item->env;
2609} 2553}
2610 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
2611// 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
2612const char * 2585const char *
2613object::debug_desc (char *info) const 2586object::debug_desc (char *info) const
2614{ 2587{
2588 char flagdesc[512];
2615 char info2[256 * 3]; 2589 char info2[256 * 4];
2616 char *p = info; 2590 char *p = info;
2617 2591
2618 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}",
2619 count, 2593 count, uuid.seq,
2620 &name, 2594 &name,
2621 title ? " " : "", 2595 title ? "\",title:\"" : "",
2622 title ? (const char *)title : ""); 2596 title ? (const char *)title : "",
2597 flag_desc (flagdesc, 512), type);
2623 2598
2624 if (env) 2599 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2600 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626 2601
2627 if (map) 2602 if (map)
2628 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);
2629 2604
2630 return info; 2605 return info;
2631} 2606}
2632 2607
2633const char * 2608const char *
2634object::debug_desc () const 2609object::debug_desc () const
2635{ 2610{
2636 static char info[256 * 3]; 2611 static char info[3][256 * 4];
2612 static int info_idx;
2613
2637 return debug_desc (info); 2614 return debug_desc (info [++info_idx % 3]);
2638} 2615}
2639 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