ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.81 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.161 by root, Wed Jun 13 21:09:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines