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.83 by root, Mon Dec 25 14:43:22 2006 UTC vs.
Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines