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.92 by root, Tue Dec 26 17:39:29 2006 UTC vs.
Revision 1.173 by root, Sat Aug 4 22:23:47 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
27#include <global.h> 27#include <global.h>
28#include <stdio.h> 28#include <stdio.h>
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
33#include <loader.h> 34#include <loader.h>
34 35
35#include <bitset> 36#include <bitset>
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,
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:
298 return 0; 299 return 0;
299 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 301 return 0;
301 } 302 }
302 303
303 //TODO: generate an event or call into perl for additional checks
304 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
305 { 305 {
306 ob1->optimise (); 306 ob1->optimise ();
307 ob2->optimise (); 307 ob2->optimise ();
308 308
309 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
310 return 0; 311 return 0;
311 } 312 }
312 313
313 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
314 return 1; 315 return 1;
315} 316}
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, 1); 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
454int
455object::slottype () const
456{
457 if (type == SKILL)
458 {
459 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
460 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
461 }
462 else
463 {
464 if (slot [body_combat].info) return slot_combat;
465 if (slot [body_range ].info) return slot_ranged;
466 }
467
468 return slot_none;
469}
470
471bool
472object::change_weapon (object *ob)
473{
474 if (current_weapon == ob)
475 return true;
476
477 if (chosen_skill)
478 chosen_skill->flag [FLAG_APPLIED] = false;
479
480 current_weapon = ob;
481 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
482
483 if (chosen_skill)
484 chosen_skill->flag [FLAG_APPLIED] = true;
485
486 update_stats ();
487
488 if (ob)
489 {
490 // now check wether any body locations became invalid, in which case
491 // we cannot apply the weapon at the moment.
492 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
493 if (slot[i].used < 0)
494 {
495 current_weapon = chosen_skill = 0;
496 update_stats ();
497
498 new_draw_info_format (NDI_UNIQUE, 0, this,
499 "You try to balance all your items at once, "
500 "but the %s is just too much for your body. "
501 "[You need to unapply some items first.]", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
511 {
512 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
513 &name, ob->debug_desc ());
514 return false;
515 }
516
517 return true;
518}
519
455/* Zero the key_values on op, decrementing the shared-string 520/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 521 * refcounts and freeing the links.
457 */ 522 */
458static void 523static void
459free_key_values (object *op) 524free_key_values (object *op)
460{ 525{
461 for (key_value *i = op->key_values; i != 0;) 526 for (key_value *i = op->key_values; i; )
462 { 527 {
463 key_value *next = i->next; 528 key_value *next = i->next;
464 delete i; 529 delete i;
465 530
466 i = next; 531 i = next;
467 } 532 }
468 533
469 op->key_values = 0; 534 op->key_values = 0;
470} 535}
471 536
472/* 537object &
473 * copy_to first frees everything allocated by the dst object, 538object::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{ 539{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 540 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 541 bool is_removed = flag [FLAG_REMOVED];
485 542
486 *(object_copy *)dst = *this; 543 *(object_copy *)this = src;
487 544
488 if (is_freed) 545 flag [FLAG_FREED] = is_freed;
489 SET_FLAG (dst, FLAG_FREED); 546 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 547
497 /* Copy over key_values, if any. */ 548 /* Copy over key_values, if any. */
498 if (key_values) 549 if (src.key_values)
499 { 550 {
500 key_value *tail = 0; 551 key_value *tail = 0;
501 key_value *i;
502
503 dst->key_values = 0; 552 key_values = 0;
504 553
505 for (i = key_values; i; i = i->next) 554 for (key_value *i = src.key_values; i; i = i->next)
506 { 555 {
507 key_value *new_link = new key_value; 556 key_value *new_link = new key_value;
508 557
509 new_link->next = 0; 558 new_link->next = 0;
510 new_link->key = i->key; 559 new_link->key = i->key;
511 new_link->value = i->value; 560 new_link->value = i->value;
512 561
513 /* Try and be clever here, too. */ 562 /* Try and be clever here, too. */
514 if (!dst->key_values) 563 if (!key_values)
515 { 564 {
516 dst->key_values = new_link; 565 key_values = new_link;
517 tail = new_link; 566 tail = new_link;
518 } 567 }
519 else 568 else
520 { 569 {
521 tail->next = new_link; 570 tail->next = new_link;
522 tail = new_link; 571 tail = new_link;
523 } 572 }
524 } 573 }
525 } 574 }
575}
576
577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589
590 if (speed < 0)
591 dst->speed_left = speed_left - rndm ();
526 592
527 dst->set_speed (dst->speed); 593 dst->set_speed (dst->speed);
594}
595
596void
597object::instantiate ()
598{
599 if (!uuid.seq) // HACK
600 uuid = gen_uuid ();
601
602 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting
606 * values for the body_used info, so when items are created
607 * for it, they can be properly equipped.
608 */
609 for (int i = NUM_BODY_LOCATIONS; i--; )
610 slot[i].used = slot[i].info;
611
612 attachable::instantiate ();
528} 613}
529 614
530object * 615object *
531object::clone () 616object::clone ()
532{ 617{
538/* 623/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 624 * 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 625 * 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. 626 * be called to update the face variable, _and_ how it looks on the map.
542 */ 627 */
543
544void 628void
545update_turn_face (object *op) 629update_turn_face (object *op)
546{ 630{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 631 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 632 return;
633
549 SET_ANIMATION (op, op->direction); 634 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 635 update_object (op, UP_OBJ_FACE);
551} 636}
552 637
553/* 638/*
556 * This function needs to be called whenever the speed of an object changes. 641 * This function needs to be called whenever the speed of an object changes.
557 */ 642 */
558void 643void
559object::set_speed (float speed) 644object::set_speed (float speed)
560{ 645{
561 extern int arch_init;
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (flag [FLAG_FREED] && speed) 646 if (flag [FLAG_FREED] && speed)
567 { 647 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name); 648 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0; 649 speed = 0;
570 } 650 }
571 651
572 this->speed = speed; 652 this->speed = speed;
573 653
574 if (arch_init) 654 if (has_active_speed ())
575 return; 655 activate ();
576
577 if (FABS (speed) > MIN_ACTIVE_SPEED)
578 {
579 /* If already on active list, don't do anything */
580 if (active_next || active_prev || this == active_objects)
581 return;
582
583 /* process_events() expects us to insert the object at the beginning
584 * of the list. */
585 active_next = active_objects;
586
587 if (active_next)
588 active_next->active_prev = this;
589
590 active_objects = this;
591 }
592 else 656 else
593 { 657 deactivate ();
594 /* If not on the active list, nothing needs to be done */
595 if (!active_next && !active_prev && this != active_objects)
596 return;
597
598 if (!active_prev)
599 {
600 active_objects = active_next;
601
602 if (active_next)
603 active_next->active_prev = 0;
604 }
605 else
606 {
607 active_prev->active_next = active_next;
608
609 if (active_next)
610 active_next->active_prev = active_prev;
611 }
612
613 active_next = 0;
614 active_prev = 0;
615 }
616}
617
618/* This function removes object 'op' from the list of active
619 * objects.
620 * This should only be used for style maps or other such
621 * reference maps where you don't want an object that isn't
622 * in play chewing up cpu time getting processed.
623 * The reverse of this is to call update_ob_speed, which
624 * will do the right thing based on the speed of the object.
625 */
626void
627remove_from_active_list (object *op)
628{
629 /* If not on the active list, nothing needs to be done */
630 if (!op->active_next && !op->active_prev && op != active_objects)
631 return;
632
633 if (op->active_prev == NULL)
634 {
635 active_objects = op->active_next;
636 if (op->active_next != NULL)
637 op->active_next->active_prev = NULL;
638 }
639 else
640 {
641 op->active_prev->active_next = op->active_next;
642 if (op->active_next)
643 op->active_next->active_prev = op->active_prev;
644 }
645 op->active_next = NULL;
646 op->active_prev = NULL;
647} 658}
648 659
649/* 660/*
650 * update_object() updates the the map. 661 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 662 * It takes into account invisible objects (and represent squares covered
664 * UP_OBJ_FACE: only the objects face has changed. 675 * UP_OBJ_FACE: only the objects face has changed.
665 */ 676 */
666void 677void
667update_object (object *op, int action) 678update_object (object *op, int action)
668{ 679{
669 MoveType move_on, move_off, move_block, move_slow;
670
671 if (op == NULL) 680 if (op == NULL)
672 { 681 {
673 /* this should never happen */ 682 /* this should never happen */
674 LOG (llevDebug, "update_object() called for NULL object.\n"); 683 LOG (llevDebug, "update_object() called for NULL object.\n");
675 return; 684 return;
699 return; 708 return;
700 } 709 }
701 710
702 mapspace &m = op->ms (); 711 mapspace &m = op->ms ();
703 712
704 if (m.flags_ & P_NEED_UPDATE) 713 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 714 /* nop */;
706 else if (action == UP_OBJ_INSERT) 715 else if (action == UP_OBJ_INSERT)
707 { 716 {
708 // this is likely overkill, TODO: revisit (schmorp) 717 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 718 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
718 /* This isn't perfect, but I don't expect a lot of objects to 727 /* This isn't perfect, but I don't expect a lot of objects to
719 * to have move_allow right now. 728 * to have move_allow right now.
720 */ 729 */
721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 730 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 731 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723 m.flags_ = P_NEED_UPDATE; 732 m.flags_ = 0;
724 } 733 }
725 /* if the object is being removed, we can't make intelligent 734 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 735 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 736 * that is being removed.
728 */ 737 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 738 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 739 m.flags_ = 0;
731 else if (action == UP_OBJ_FACE) 740 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 741 /* Nothing to do for that case */ ;
733 else 742 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 743 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 744
736 if (op->more) 745 if (op->more)
737 update_object (op->more, action); 746 update_object (op->more, action);
738} 747}
739 748
740object::vector object::objects; // not yet used
741object *object::first;
742
743object::object () 749object::object ()
744{ 750{
745 SET_FLAG (this, FLAG_REMOVED); 751 SET_FLAG (this, FLAG_REMOVED);
746 752
747 expmul = 1.0; 753 expmul = 1.0;
748 face = blank_face; 754 face = blank_face;
749} 755}
750 756
751object::~object () 757object::~object ()
752{ 758{
759 unlink ();
760
753 free_key_values (this); 761 free_key_values (this);
754} 762}
755 763
764static int object_count;
765
756void object::link () 766void object::link ()
757{ 767{
758 count = ++ob_count; 768 assert (!index);//D
759 uuid = gen_uuid (); 769 uuid = gen_uuid ();
770 count = ++object_count;
760 771
761 prev = 0; 772 refcnt_inc ();
762 next = object::first; 773 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 774}
769 775
770void object::unlink () 776void object::unlink ()
771{ 777{
772 if (this == object::first) 778 if (!index)
773 object::first = next; 779 return;
774 780
775 /* Remove this object from the list of used objects */ 781 objects.erase (this);
776 if (prev) prev->next = next; 782 refcnt_dec ();
777 if (next) next->prev = prev; 783}
778 784
779 prev = 0; 785void
780 next = 0; 786object::activate ()
787{
788 /* If already on active list, don't do anything */
789 if (active)
790 return;
791
792 if (has_active_speed ())
793 actives.insert (this);
794}
795
796void
797object::activate_recursive ()
798{
799 activate ();
800
801 for (object *op = inv; op; op = op->below)
802 op->activate_recursive ();
803}
804
805/* This function removes object 'op' from the list of active
806 * objects.
807 * This should only be used for style maps or other such
808 * reference maps where you don't want an object that isn't
809 * in play chewing up cpu time getting processed.
810 * The reverse of this is to call update_ob_speed, which
811 * will do the right thing based on the speed of the object.
812 */
813void
814object::deactivate ()
815{
816 /* If not on the active list, nothing needs to be done */
817 if (!active)
818 return;
819
820 actives.erase (this);
821}
822
823void
824object::deactivate_recursive ()
825{
826 for (object *op = inv; op; op = op->below)
827 op->deactivate_recursive ();
828
829 deactivate ();
830}
831
832void
833object::set_flag_inv (int flag, int value)
834{
835 for (object *op = inv; op; op = op->below)
836 {
837 op->flag [flag] = value;
838 op->set_flag_inv (flag, value);
839 }
781} 840}
782 841
783/* 842/*
784 * Remove and free all objects in the inventory of the given object. 843 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 844 * object.c ?
786 */ 845 */
787void 846void
788object::destroy_inv (bool drop_to_ground) 847object::destroy_inv (bool drop_to_ground)
789{ 848{
849 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory,
853 // cf will crash below with off-map x and y
854 if (!inv)
855 return;
856
790 /* Only if the space blocks everything do we not process - 857 /* Only if the space blocks everything do we not process -
791 * if some form of movement is allowed, let objects 858 * if some form of movement is allowed, let objects
792 * drop on that space. 859 * drop on that space.
793 */ 860 */
794 if (!drop_to_ground 861 if (!drop_to_ground
795 || !map 862 || !map
796 || map->in_memory != MAP_IN_MEMORY 863 || map->in_memory != MAP_IN_MEMORY
864 || map->nodrop
797 || map->at (x, y).move_block == MOVE_ALL) 865 || ms ().move_block == MOVE_ALL)
798 { 866 {
799 while (inv) 867 while (inv)
800 { 868 {
801 inv->destroy_inv (drop_to_ground); 869 inv->destroy_inv (drop_to_ground);
802 inv->destroy (); 870 inv->destroy ();
810 878
811 if (op->flag [FLAG_STARTEQUIP] 879 if (op->flag [FLAG_STARTEQUIP]
812 || op->flag [FLAG_NO_DROP] 880 || op->flag [FLAG_NO_DROP]
813 || op->type == RUNE 881 || op->type == RUNE
814 || op->type == TRAP 882 || op->type == TRAP
815 || op->flag [FLAG_IS_A_TEMPLATE]) 883 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH])
816 op->destroy (); 885 op->destroy ();
817 else 886 else
818 { 887 map->insert (op, x, y);
819 op->remove ();
820 op->x = x;
821 op->y = y;
822 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
823 }
824 } 888 }
825 } 889 }
826} 890}
827 891
828object *object::create () 892object *object::create ()
833} 897}
834 898
835void 899void
836object::do_destroy () 900object::do_destroy ()
837{ 901{
902 attachable::do_destroy ();
903
838 if (flag [FLAG_IS_LINKED]) 904 if (flag [FLAG_IS_LINKED])
839 remove_button_link (this); 905 remove_button_link (this);
840 906
841 if (flag [FLAG_FRIENDLY]) 907 if (flag [FLAG_FRIENDLY])
842 remove_friendly_object (this); 908 remove_friendly_object (this);
843 909
844 if (!flag [FLAG_REMOVED]) 910 if (!flag [FLAG_REMOVED])
845 remove (); 911 remove ();
846 912
847 if (flag [FLAG_FREED]) 913 destroy_inv (true);
848 return;
849 914
850 set_speed (0); 915 deactivate ();
916 unlink ();
851 917
852 flag [FLAG_FREED] = 1; 918 flag [FLAG_FREED] = 1;
853
854 attachable::do_destroy ();
855
856 destroy_inv (true);
857 unlink ();
858 919
859 // hack to ensure that freed objects still have a valid map 920 // hack to ensure that freed objects still have a valid map
860 { 921 {
861 static maptile *freed_map; // freed objects are moved here to avoid crashes 922 static maptile *freed_map; // freed objects are moved here to avoid crashes
862 923
866 927
867 freed_map->name = "/internal/freed_objects_map"; 928 freed_map->name = "/internal/freed_objects_map";
868 freed_map->width = 3; 929 freed_map->width = 3;
869 freed_map->height = 3; 930 freed_map->height = 3;
870 931
871 freed_map->allocate (); 932 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY;
872 } 934 }
873 935
874 map = freed_map; 936 map = freed_map;
875 x = 1; 937 x = 1;
876 y = 1; 938 y = 1;
877 } 939 }
878 940
879 head = 0;
880
881 if (more) 941 if (more)
882 { 942 {
883 more->destroy (); 943 more->destroy ();
884 more = 0; 944 more = 0;
885 } 945 }
886 946
947 head = 0;
948
887 // clear those pointers that likely might have circular references to us 949 // clear those pointers that likely might cause circular references
888 owner = 0; 950 owner = 0;
889 enemy = 0; 951 enemy = 0;
890 attacked_by = 0; 952 attacked_by = 0;
891 953 current_weapon = 0;
892 // only relevant for players(?), but make sure of it anyways
893 contr = 0;
894} 954}
895 955
896void 956void
897object::destroy (bool destroy_inventory) 957object::destroy (bool destroy_inventory)
898{ 958{
899 if (destroyed ()) 959 if (destroyed ())
900 return; 960 return;
901 961
902 if (destroy_inventory) 962 if (destroy_inventory)
903 destroy_inv (false); 963 destroy_inv (false);
964
965 if (is_head ())
966 if (sound_destroy)
967 play_sound (sound_destroy);
968 else if (flag [FLAG_MONSTER])
969 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
904 970
905 attachable::destroy (); 971 attachable::destroy ();
906} 972}
907 973
908/* 974/*
926 * This function removes the object op from the linked list of objects 992 * This function removes the object op from the linked list of objects
927 * which it is currently tied to. When this function is done, the 993 * which it is currently tied to. When this function is done, the
928 * object will have no environment. If the object previously had an 994 * object will have no environment. If the object previously had an
929 * environment, the x and y coordinates will be updated to 995 * environment, the x and y coordinates will be updated to
930 * the previous environment. 996 * the previous environment.
931 * Beware: This function is called from the editor as well!
932 */ 997 */
933void 998void
934object::remove () 999object::do_remove ()
935{ 1000{
936 object *tmp, *last = 0; 1001 object *tmp, *last = 0;
937 object *otmp; 1002 object *otmp;
938 1003
939 if (QUERY_FLAG (this, FLAG_REMOVED)) 1004 if (QUERY_FLAG (this, FLAG_REMOVED))
961 * to save cpu time. 1026 * to save cpu time.
962 */ 1027 */
963 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1028 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
964 otmp->update_stats (); 1029 otmp->update_stats ();
965 1030
966 if (above != NULL) 1031 if (above)
967 above->below = below; 1032 above->below = below;
968 else 1033 else
969 env->inv = below; 1034 env->inv = below;
970 1035
971 if (below != NULL) 1036 if (below)
972 below->above = above; 1037 below->above = above;
973 1038
974 /* we set up values so that it could be inserted into 1039 /* we set up values so that it could be inserted into
975 * the map, but we don't actually do that - it is up 1040 * the map, but we don't actually do that - it is up
976 * to the caller to decide what we want to do. 1041 * to the caller to decide what we want to do.
980 above = 0, below = 0; 1045 above = 0, below = 0;
981 env = 0; 1046 env = 0;
982 } 1047 }
983 else if (map) 1048 else if (map)
984 { 1049 {
985 /* Re did the following section of code - it looks like it had 1050 if (type == PLAYER)
986 * lots of logic for things we no longer care about
987 */ 1051 {
1052 // leaving a spot always closes any open container on the ground
1053 if (container && !container->env)
1054 // this causes spurious floorbox updates, but it ensures
1055 // that the CLOSE event is being sent.
1056 close_container ();
1057
1058 --map->players;
1059 map->touch ();
1060 }
1061
1062 map->dirty = true;
1063 mapspace &ms = this->ms ();
988 1064
989 /* link the object above us */ 1065 /* link the object above us */
990 if (above) 1066 if (above)
991 above->below = below; 1067 above->below = below;
992 else 1068 else
993 map->at (x, y).top = below; /* we were top, set new top */ 1069 ms.top = below; /* we were top, set new top */
994 1070
995 /* Relink the object below us, if there is one */ 1071 /* Relink the object below us, if there is one */
996 if (below) 1072 if (below)
997 below->above = above; 1073 below->above = above;
998 else 1074 else
1000 /* Nothing below, which means we need to relink map object for this space 1076 /* Nothing below, which means we need to relink map object for this space
1001 * use translated coordinates in case some oddness with map tiling is 1077 * use translated coordinates in case some oddness with map tiling is
1002 * evident 1078 * evident
1003 */ 1079 */
1004 if (GET_MAP_OB (map, x, y) != this) 1080 if (GET_MAP_OB (map, x, y) != this)
1005 {
1006 char *dump = dump_object (this);
1007 LOG (llevError,
1008 "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); 1081 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 ());
1009 free (dump);
1010 dump = dump_object (GET_MAP_OB (map, x, y));
1011 LOG (llevError, "%s\n", dump);
1012 free (dump);
1013 }
1014 1082
1015 map->at (x, y).bot = above; /* goes on above it. */ 1083 ms.bot = above; /* goes on above it. */
1016 } 1084 }
1017 1085
1018 above = 0; 1086 above = 0;
1019 below = 0; 1087 below = 0;
1020 1088
1021 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
1022 return; 1090 return;
1023 1091
1024 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
1025 1093
1026 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1094 for (tmp = ms.bot; tmp; tmp = tmp->above)
1027 { 1095 {
1028 /* No point updating the players look faces if he is the object 1096 /* No point updating the players look faces if he is the object
1029 * being removed. 1097 * being removed.
1030 */ 1098 */
1031 1099
1043 1111
1044 if (tmp->contr->ns) 1112 if (tmp->contr->ns)
1045 tmp->contr->ns->floorbox_update (); 1113 tmp->contr->ns->floorbox_update ();
1046 } 1114 }
1047 1115
1048 /* See if player moving off should effect something */ 1116 /* See if object moving off should effect something */
1049 if (check_walk_off 1117 if (check_walk_off
1050 && ((move_type & tmp->move_off) 1118 && ((move_type & tmp->move_off)
1051 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1119 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1052 { 1120 {
1053 move_apply (tmp, this, 0); 1121 move_apply (tmp, this, 0);
1054 1122
1055 if (destroyed ()) 1123 if (destroyed ())
1056 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1124 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1057 } 1125 }
1058 1126
1059 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1060
1061 if (tmp->above == tmp)
1062 tmp->above = 0;
1063
1064 last = tmp; 1127 last = tmp;
1065 } 1128 }
1066 1129
1067 /* last == NULL of there are no objects on this space */ 1130 /* last == NULL if there are no objects on this space */
1131 //TODO: this makes little sense, why only update the topmost object?
1068 if (!last) 1132 if (!last)
1069 map->at (x, y).flags_ = P_NEED_UPDATE; 1133 map->at (x, y).flags_ = 0;
1070 else 1134 else
1071 update_object (last, UP_OBJ_REMOVE); 1135 update_object (last, UP_OBJ_REMOVE);
1072 1136
1073 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1137 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1074 update_all_los (map, x, y); 1138 update_all_los (map, x, y);
1110 } 1174 }
1111 1175
1112 return 0; 1176 return 0;
1113} 1177}
1114 1178
1179void
1180object::expand_tail ()
1181{
1182 if (more)
1183 return;
1184
1185 object *prev = this;
1186
1187 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1188 {
1189 object *op = arch_to_object (at);
1190
1191 op->name = name;
1192 op->name_pl = name_pl;
1193 op->title = title;
1194
1195 op->head = this;
1196 prev->more = op;
1197
1198 prev = op;
1199 }
1200}
1201
1115/* 1202/*
1116 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1203 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1117 * job preparing multi-part monsters 1204 * job preparing multi-part monsters.
1118 */ 1205 */
1119object * 1206object *
1120insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1207insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1121{ 1208{
1122 object *tmp;
1123
1124 if (op->head)
1125 op = op->head;
1126
1127 for (tmp = op; tmp; tmp = tmp->more) 1209 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1128 { 1210 {
1129 tmp->x = x + tmp->arch->clone.x; 1211 tmp->x = x + tmp->arch->x;
1130 tmp->y = y + tmp->arch->clone.y; 1212 tmp->y = y + tmp->arch->y;
1131 } 1213 }
1132 1214
1133 return insert_ob_in_map (op, m, originator, flag); 1215 return insert_ob_in_map (op, m, originator, flag);
1134} 1216}
1135 1217
1154 * just 'op' otherwise 1236 * just 'op' otherwise
1155 */ 1237 */
1156object * 1238object *
1157insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1239insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1158{ 1240{
1241 assert (!op->flag [FLAG_FREED]);
1242
1159 object *tmp, *top, *floor = NULL; 1243 object *top, *floor = NULL;
1160 sint16 x, y;
1161 1244
1162 if (QUERY_FLAG (op, FLAG_FREED)) 1245 op->remove ();
1163 {
1164 LOG (llevError, "Trying to insert freed object!\n");
1165 return NULL;
1166 }
1167 1246
1168 if (m == NULL) 1247#if 0
1169 { 1248 if (!m->active != !op->active)
1170 char *dump = dump_object (op); 1249 if (m->active)
1171 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1250 op->activate_recursive ();
1172 free (dump); 1251 else
1173 return op; 1252 op->deactivate_recursive ();
1174 } 1253#endif
1175 1254
1176 if (out_of_map (m, op->x, op->y)) 1255 if (out_of_map (m, op->x, op->y))
1177 { 1256 {
1178 char *dump = dump_object (op);
1179 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1257 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1180#ifdef MANY_CORES 1258#ifdef MANY_CORES
1181 /* Better to catch this here, as otherwise the next use of this object 1259 /* Better to catch this here, as otherwise the next use of this object
1182 * is likely to cause a crash. Better to find out where it is getting 1260 * is likely to cause a crash. Better to find out where it is getting
1183 * improperly inserted. 1261 * improperly inserted.
1184 */ 1262 */
1185 abort (); 1263 abort ();
1186#endif 1264#endif
1187 free (dump);
1188 return op; 1265 return op;
1189 } 1266 }
1190 1267
1191 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1268 if (object *more = op->more)
1192 { 1269 if (!insert_ob_in_map (more, m, originator, flag))
1193 char *dump = dump_object (op);
1194 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1195 free (dump);
1196 return op; 1270 return 0;
1197 }
1198
1199 if (op->more)
1200 {
1201 /* The part may be on a different map. */
1202
1203 object *more = op->more;
1204
1205 /* We really need the caller to normalize coordinates - if
1206 * we set the map, that doesn't work if the location is within
1207 * a map and this is straddling an edge. So only if coordinate
1208 * is clear wrong do we normalize it.
1209 */
1210 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1211 more->map = get_map_from_coord (m, &more->x, &more->y);
1212 else if (!more->map)
1213 {
1214 /* For backwards compatibility - when not dealing with tiled maps,
1215 * more->map should always point to the parent.
1216 */
1217 more->map = m;
1218 }
1219
1220 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1221 {
1222 if (!op->head)
1223 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1224
1225 return 0;
1226 }
1227 }
1228 1271
1229 CLEAR_FLAG (op, FLAG_REMOVED); 1272 CLEAR_FLAG (op, FLAG_REMOVED);
1230 1273
1231 /* Ideally, the caller figures this out. However, it complicates a lot 1274 /* Ideally, the caller figures this out. However, it complicates a lot
1232 * of areas of callers (eg, anything that uses find_free_spot would now 1275 * of areas of callers (eg, anything that uses find_free_spot would now
1233 * need extra work 1276 * need extra work
1234 */ 1277 */
1235 op->map = get_map_from_coord (m, &op->x, &op->y); 1278 if (!xy_normalise (m, op->x, op->y))
1236 x = op->x; 1279 return 0;
1237 y = op->y; 1280
1281 op->map = m;
1282 mapspace &ms = op->ms ();
1238 1283
1239 /* this has to be done after we translate the coordinates. 1284 /* this has to be done after we translate the coordinates.
1240 */ 1285 */
1241 if (op->nrof && !(flag & INS_NO_MERGE)) 1286 if (op->nrof && !(flag & INS_NO_MERGE))
1242 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1287 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1243 if (object::can_merge (op, tmp)) 1288 if (object::can_merge (op, tmp))
1244 { 1289 {
1245 op->nrof += tmp->nrof; 1290 op->nrof += tmp->nrof;
1246 tmp->destroy (); 1291 tmp->destroy ();
1247 } 1292 }
1264 op->below = originator->below; 1309 op->below = originator->below;
1265 1310
1266 if (op->below) 1311 if (op->below)
1267 op->below->above = op; 1312 op->below->above = op;
1268 else 1313 else
1269 op->ms ().bot = op; 1314 ms.bot = op;
1270 1315
1271 /* since *below* originator, no need to update top */ 1316 /* since *below* originator, no need to update top */
1272 originator->below = op; 1317 originator->below = op;
1273 } 1318 }
1274 else 1319 else
1275 { 1320 {
1321 top = ms.bot;
1322
1276 /* If there are other objects, then */ 1323 /* If there are other objects, then */
1277 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1324 if ((!(flag & INS_MAP_LOAD)) && top)
1278 { 1325 {
1279 object *last = NULL; 1326 object *last = 0;
1280 1327
1281 /* 1328 /*
1282 * If there are multiple objects on this space, we do some trickier handling. 1329 * If there are multiple objects on this space, we do some trickier handling.
1283 * We've already dealt with merging if appropriate. 1330 * We've already dealt with merging if appropriate.
1284 * Generally, we want to put the new object on top. But if 1331 * Generally, we want to put the new object on top. But if
1288 * once we get to them. This reduces the need to traverse over all of 1335 * once we get to them. This reduces the need to traverse over all of
1289 * them when adding another one - this saves quite a bit of cpu time 1336 * them when adding another one - this saves quite a bit of cpu time
1290 * when lots of spells are cast in one area. Currently, it is presumed 1337 * when lots of spells are cast in one area. Currently, it is presumed
1291 * that flying non pickable objects are spell objects. 1338 * that flying non pickable objects are spell objects.
1292 */ 1339 */
1293 1340 for (top = ms.bot; top; top = top->above)
1294 while (top != NULL)
1295 { 1341 {
1296 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1342 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1297 floor = top; 1343 floor = top;
1298 1344
1299 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1345 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1302 top = top->below; 1348 top = top->below;
1303 break; 1349 break;
1304 } 1350 }
1305 1351
1306 last = top; 1352 last = top;
1307 top = top->above;
1308 } 1353 }
1309 1354
1310 /* Don't want top to be NULL, so set it to the last valid object */ 1355 /* Don't want top to be NULL, so set it to the last valid object */
1311 top = last; 1356 top = last;
1312 1357
1314 * looks like instead of lots of conditions here. 1359 * looks like instead of lots of conditions here.
1315 * makes things faster, and effectively the same result. 1360 * makes things faster, and effectively the same result.
1316 */ 1361 */
1317 1362
1318 /* Have object 'fall below' other objects that block view. 1363 /* Have object 'fall below' other objects that block view.
1319 * Unless those objects are exits, type 66 1364 * Unless those objects are exits.
1320 * If INS_ON_TOP is used, don't do this processing 1365 * If INS_ON_TOP is used, don't do this processing
1321 * Need to find the object that in fact blocks view, otherwise 1366 * Need to find the object that in fact blocks view, otherwise
1322 * stacking is a bit odd. 1367 * stacking is a bit odd.
1323 */ 1368 */
1324 if (!(flag & INS_ON_TOP) && 1369 if (!(flag & INS_ON_TOP)
1325 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1370 && ms.flags () & P_BLOCKSVIEW
1371 && (op->face && !faces [op->face].visibility))
1326 { 1372 {
1327 for (last = top; last != floor; last = last->below) 1373 for (last = top; last != floor; last = last->below)
1328 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1374 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1329 break; 1375 break;
1376
1330 /* Check to see if we found the object that blocks view, 1377 /* Check to see if we found the object that blocks view,
1331 * and make sure we have a below pointer for it so that 1378 * and make sure we have a below pointer for it so that
1332 * we can get inserted below this one, which requires we 1379 * we can get inserted below this one, which requires we
1333 * set top to the object below us. 1380 * set top to the object below us.
1334 */ 1381 */
1335 if (last && last->below && last != floor) 1382 if (last && last->below && last != floor)
1336 top = last->below; 1383 top = last->below;
1337 } 1384 }
1338 } /* If objects on this space */ 1385 } /* If objects on this space */
1339
1340 if (flag & INS_MAP_LOAD) 1386 if (flag & INS_MAP_LOAD)
1341 top = GET_MAP_TOP (op->map, op->x, op->y); 1387 top = ms.top;
1342 1388
1343 if (flag & INS_ABOVE_FLOOR_ONLY) 1389 if (flag & INS_ABOVE_FLOOR_ONLY)
1344 top = floor; 1390 top = floor;
1345 1391
1346 /* Top is the object that our object (op) is going to get inserted above. 1392 /* Top is the object that our object (op) is going to get inserted above.
1347 */ 1393 */
1348 1394
1349 /* First object on this space */ 1395 /* First object on this space */
1350 if (!top) 1396 if (!top)
1351 { 1397 {
1352 op->above = GET_MAP_OB (op->map, op->x, op->y); 1398 op->above = ms.bot;
1353 1399
1354 if (op->above) 1400 if (op->above)
1355 op->above->below = op; 1401 op->above->below = op;
1356 1402
1357 op->below = NULL; 1403 op->below = 0;
1358 op->ms ().bot = op; 1404 ms.bot = op;
1359 } 1405 }
1360 else 1406 else
1361 { /* get inserted into the stack above top */ 1407 { /* get inserted into the stack above top */
1362 op->above = top->above; 1408 op->above = top->above;
1363 1409
1366 1412
1367 op->below = top; 1413 op->below = top;
1368 top->above = op; 1414 top->above = op;
1369 } 1415 }
1370 1416
1371 if (op->above == NULL) 1417 if (!op->above)
1372 op->ms ().top = op; 1418 ms.top = op;
1373 } /* else not INS_BELOW_ORIGINATOR */ 1419 } /* else not INS_BELOW_ORIGINATOR */
1374 1420
1375 if (op->type == PLAYER) 1421 if (op->type == PLAYER)
1422 {
1376 op->contr->do_los = 1; 1423 op->contr->do_los = 1;
1424 ++op->map->players;
1425 op->map->touch ();
1426 }
1427
1428 op->map->dirty = true;
1377 1429
1378 /* If we have a floor, we know the player, if any, will be above 1430 /* If we have a floor, we know the player, if any, will be above
1379 * it, so save a few ticks and start from there. 1431 * it, so save a few ticks and start from there.
1380 */ 1432 */
1381 if (!(flag & INS_MAP_LOAD)) 1433 if (!(flag & INS_MAP_LOAD))
1382 if (object *pl = op->ms ().player ()) 1434 if (object *pl = ms.player ())
1383 if (pl->contr->ns) 1435 if (pl->contr->ns)
1384 pl->contr->ns->floorbox_update (); 1436 pl->contr->ns->floorbox_update ();
1385 1437
1386 /* If this object glows, it may affect lighting conditions that are 1438 /* If this object glows, it may affect lighting conditions that are
1387 * visible to others on this map. But update_all_los is really 1439 * visible to others on this map. But update_all_los is really
1388 * an inefficient way to do this, as it means los for all players 1440 * an inefficient way to do this, as it means los for all players
1389 * on the map will get recalculated. The players could very well 1441 * on the map will get recalculated. The players could very well
1390 * be far away from this change and not affected in any way - 1442 * be far away from this change and not affected in any way -
1391 * this should get redone to only look for players within range, 1443 * this should get redone to only look for players within range,
1392 * or just updating the P_NEED_UPDATE for spaces within this area 1444 * or just updating the P_UPTODATE for spaces within this area
1393 * of effect may be sufficient. 1445 * of effect may be sufficient.
1394 */ 1446 */
1395 if (op->map->darkness && (op->glow_radius != 0)) 1447 if (op->map->darkness && (op->glow_radius != 0))
1396 update_all_los (op->map, op->x, op->y); 1448 update_all_los (op->map, op->x, op->y);
1397 1449
1408 * blocked() and wall() work properly), and these flags are updated by 1460 * blocked() and wall() work properly), and these flags are updated by
1409 * update_object(). 1461 * update_object().
1410 */ 1462 */
1411 1463
1412 /* if this is not the head or flag has been passed, don't check walk on status */ 1464 /* if this is not the head or flag has been passed, don't check walk on status */
1413 if (!(flag & INS_NO_WALK_ON) && !op->head) 1465 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1414 { 1466 {
1415 if (check_move_on (op, originator)) 1467 if (check_move_on (op, originator))
1416 return 0; 1468 return 0;
1417 1469
1418 /* If we are a multi part object, lets work our way through the check 1470 /* If we are a multi part object, lets work our way through the check
1419 * walk on's. 1471 * walk on's.
1420 */ 1472 */
1421 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1473 for (object *tmp = op->more; tmp; tmp = tmp->more)
1422 if (check_move_on (tmp, originator)) 1474 if (check_move_on (tmp, originator))
1423 return 0; 1475 return 0;
1424 } 1476 }
1425 1477
1426 return op; 1478 return op;
1435{ 1487{
1436 object *tmp, *tmp1; 1488 object *tmp, *tmp1;
1437 1489
1438 /* first search for itself and remove any old instances */ 1490 /* first search for itself and remove any old instances */
1439 1491
1440 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1492 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1441 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1493 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1442 tmp->destroy (); 1494 tmp->destroy ();
1443 1495
1444 tmp1 = arch_to_object (archetype::find (arch_string)); 1496 tmp1 = arch_to_object (archetype::find (arch_string));
1445 1497
1446 tmp1->x = op->x; 1498 tmp1->x = op->x;
1447 tmp1->y = op->y; 1499 tmp1->y = op->y;
1448 insert_ob_in_map (tmp1, op->map, op, 0); 1500 insert_ob_in_map (tmp1, op->map, op, 0);
1501}
1502
1503object *
1504object::insert_at (object *where, object *originator, int flags)
1505{
1506 return where->map->insert (this, where->x, where->y, originator, flags);
1449} 1507}
1450 1508
1451/* 1509/*
1452 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1510 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1453 * is returned contains nr objects, and the remaining parts contains 1511 * is returned contains nr objects, and the remaining parts contains
1454 * the rest (or is removed and freed if that number is 0). 1512 * the rest (or is removed and freed if that number is 0).
1455 * On failure, NULL is returned, and the reason put into the 1513 * On failure, NULL is returned, and the reason put into the
1456 * global static errmsg array. 1514 * global static errmsg array.
1457 */ 1515 */
1458
1459object * 1516object *
1460get_split_ob (object *orig_ob, uint32 nr) 1517get_split_ob (object *orig_ob, uint32 nr)
1461{ 1518{
1462 object *newob; 1519 object *newob;
1463 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1520 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1494 * the amount of an object. If the amount reaches 0, the object 1551 * the amount of an object. If the amount reaches 0, the object
1495 * is subsequently removed and freed. 1552 * is subsequently removed and freed.
1496 * 1553 *
1497 * Return value: 'op' if something is left, NULL if the amount reached 0 1554 * Return value: 'op' if something is left, NULL if the amount reached 0
1498 */ 1555 */
1499
1500object * 1556object *
1501decrease_ob_nr (object *op, uint32 i) 1557decrease_ob_nr (object *op, uint32 i)
1502{ 1558{
1503 object *tmp; 1559 object *tmp;
1504 1560
1579 1635
1580/* 1636/*
1581 * add_weight(object, weight) adds the specified weight to an object, 1637 * add_weight(object, weight) adds the specified weight to an object,
1582 * and also updates how much the environment(s) is/are carrying. 1638 * and also updates how much the environment(s) is/are carrying.
1583 */ 1639 */
1584
1585void 1640void
1586add_weight (object *op, signed long weight) 1641add_weight (object *op, signed long weight)
1587{ 1642{
1588 while (op != NULL) 1643 while (op != NULL)
1589 { 1644 {
1604 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1659 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1605 free (dump); 1660 free (dump);
1606 return op; 1661 return op;
1607 } 1662 }
1608 1663
1609 if (where->head) 1664 if (where->head_ () != where)
1610 { 1665 {
1611 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1666 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1612 where = where->head; 1667 where = where->head;
1613 } 1668 }
1614 1669
1615 return where->insert (op); 1670 return where->insert (op);
1616} 1671}
1621 * inside the object environment. 1676 * inside the object environment.
1622 * 1677 *
1623 * The function returns now pointer to inserted item, and return value can 1678 * The function returns now pointer to inserted item, and return value can
1624 * be != op, if items are merged. -Tero 1679 * be != op, if items are merged. -Tero
1625 */ 1680 */
1626
1627object * 1681object *
1628object::insert (object *op) 1682object::insert (object *op)
1629{ 1683{
1630 object *tmp, *otmp; 1684 object *tmp, *otmp;
1631 1685
1727 * 1781 *
1728 * MSW 2001-07-08: Check all objects on space, not just those below 1782 * MSW 2001-07-08: Check all objects on space, not just those below
1729 * object being inserted. insert_ob_in_map may not put new objects 1783 * object being inserted. insert_ob_in_map may not put new objects
1730 * on top. 1784 * on top.
1731 */ 1785 */
1732
1733int 1786int
1734check_move_on (object *op, object *originator) 1787check_move_on (object *op, object *originator)
1735{ 1788{
1736 object *tmp; 1789 object *tmp;
1737 maptile *m = op->map; 1790 maptile *m = op->map;
1764 1817
1765 /* The objects have to be checked from top to bottom. 1818 /* The objects have to be checked from top to bottom.
1766 * Hence, we first go to the top: 1819 * Hence, we first go to the top:
1767 */ 1820 */
1768 1821
1769 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1822 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1770 { 1823 {
1771 /* Trim the search when we find the first other spell effect 1824 /* Trim the search when we find the first other spell effect
1772 * this helps performance so that if a space has 50 spell objects, 1825 * this helps performance so that if a space has 50 spell objects,
1773 * we don't need to check all of them. 1826 * we don't need to check all of them.
1774 */ 1827 */
1792 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1845 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1793 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1846 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1794 { 1847 {
1795 1848
1796 float 1849 float
1797 diff = tmp->move_slow_penalty * FABS (op->speed); 1850 diff = tmp->move_slow_penalty * fabs (op->speed);
1798 1851
1799 if (op->type == PLAYER) 1852 if (op->type == PLAYER)
1800 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1853 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1801 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1854 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1802 diff /= 4.0; 1855 diff /= 4.0;
1832 * The first matching object is returned, or NULL if none. 1885 * The first matching object is returned, or NULL if none.
1833 */ 1886 */
1834object * 1887object *
1835present_arch (const archetype *at, maptile *m, int x, int y) 1888present_arch (const archetype *at, maptile *m, int x, int y)
1836{ 1889{
1837 if (m == NULL || out_of_map (m, x, y)) 1890 if (!m || out_of_map (m, x, y))
1838 { 1891 {
1839 LOG (llevError, "Present_arch called outside map.\n"); 1892 LOG (llevError, "Present_arch called outside map.\n");
1840 return NULL; 1893 return NULL;
1841 } 1894 }
1842 1895
1843 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1896 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1844 if (tmp->arch == at) 1897 if (tmp->arch == at)
1845 return tmp; 1898 return tmp;
1846 1899
1847 return NULL; 1900 return NULL;
1848} 1901}
1859 { 1912 {
1860 LOG (llevError, "Present called outside map.\n"); 1913 LOG (llevError, "Present called outside map.\n");
1861 return NULL; 1914 return NULL;
1862 } 1915 }
1863 1916
1864 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1917 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1865 if (tmp->type == type) 1918 if (tmp->type == type)
1866 return tmp; 1919 return tmp;
1867 1920
1868 return NULL; 1921 return NULL;
1869} 1922}
1946 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1999 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1947 { 2000 {
1948 CLEAR_FLAG (tmp, flag); 2001 CLEAR_FLAG (tmp, flag);
1949 unflag_inv (tmp, flag); 2002 unflag_inv (tmp, flag);
1950 } 2003 }
1951}
1952
1953/*
1954 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1955 * all it's inventory (recursively).
1956 * If checksums are used, a player will get set_cheat called for
1957 * him/her-self and all object carried by a call to this function.
1958 */
1959void
1960set_cheat (object *op)
1961{
1962 SET_FLAG (op, FLAG_WAS_WIZ);
1963 flag_inv (op, FLAG_WAS_WIZ);
1964} 2004}
1965 2005
1966/* 2006/*
1967 * find_free_spot(object, map, x, y, start, stop) will search for 2007 * find_free_spot(object, map, x, y, start, stop) will search for
1968 * a spot at the given map and coordinates which will be able to contain 2008 * a spot at the given map and coordinates which will be able to contain
2009 } 2049 }
2010 2050
2011 if (!index) 2051 if (!index)
2012 return -1; 2052 return -1;
2013 2053
2014 return altern[RANDOM () % index]; 2054 return altern [rndm (index)];
2015} 2055}
2016 2056
2017/* 2057/*
2018 * find_first_free_spot(archetype, maptile, x, y) works like 2058 * find_first_free_spot(archetype, maptile, x, y) works like
2019 * find_free_spot(), but it will search max number of squares. 2059 * find_free_spot(), but it will search max number of squares.
2040{ 2080{
2041 arr += begin; 2081 arr += begin;
2042 end -= begin; 2082 end -= begin;
2043 2083
2044 while (--end) 2084 while (--end)
2045 swap (arr [end], arr [RANDOM () % (end + 1)]); 2085 swap (arr [end], arr [rndm (end + 1)]);
2046} 2086}
2047 2087
2048/* new function to make monster searching more efficient, and effective! 2088/* new function to make monster searching more efficient, and effective!
2049 * This basically returns a randomized array (in the passed pointer) of 2089 * This basically returns a randomized array (in the passed pointer) of
2050 * the spaces to find monsters. In this way, it won't always look for 2090 * the spaces to find monsters. In this way, it won't always look for
2086 object *tmp; 2126 object *tmp;
2087 maptile *mp; 2127 maptile *mp;
2088 2128
2089 MoveType blocked, move_type; 2129 MoveType blocked, move_type;
2090 2130
2091 if (exclude && exclude->head) 2131 if (exclude && exclude->head_ () != exclude)
2092 { 2132 {
2093 exclude = exclude->head; 2133 exclude = exclude->head;
2094 move_type = exclude->move_type; 2134 move_type = exclude->move_type;
2095 } 2135 }
2096 else 2136 else
2119 max = maxfree[i]; 2159 max = maxfree[i];
2120 else if (mflags & P_IS_ALIVE) 2160 else if (mflags & P_IS_ALIVE)
2121 { 2161 {
2122 for (tmp = ms.bot; tmp; tmp = tmp->above) 2162 for (tmp = ms.bot; tmp; tmp = tmp->above)
2123 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2163 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2124 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2164 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2125 break; 2165 break;
2126 2166
2127 if (tmp) 2167 if (tmp)
2128 return freedir[i]; 2168 return freedir[i];
2129 } 2169 }
2184 2224
2185 return 3; 2225 return 3;
2186} 2226}
2187 2227
2188/* 2228/*
2189 * absdir(int): Returns a number between 1 and 8, which represent
2190 * the "absolute" direction of a number (it actually takes care of
2191 * "overflow" in previous calculations of a direction).
2192 */
2193
2194int
2195absdir (int d)
2196{
2197 while (d < 1)
2198 d += 8;
2199
2200 while (d > 8)
2201 d -= 8;
2202
2203 return d;
2204}
2205
2206/*
2207 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2229 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2208 * between two directions (which are expected to be absolute (see absdir()) 2230 * between two directions (which are expected to be absolute (see absdir())
2209 */ 2231 */
2210
2211int 2232int
2212dirdiff (int dir1, int dir2) 2233dirdiff (int dir1, int dir2)
2213{ 2234{
2214 int d; 2235 int d;
2215 2236
2343 * create clone from object to another 2364 * create clone from object to another
2344 */ 2365 */
2345object * 2366object *
2346object_create_clone (object *asrc) 2367object_create_clone (object *asrc)
2347{ 2368{
2348 object *dst = 0, *tmp, *src, *part, *prev, *item; 2369 object *dst = 0, *tmp, *src, *prev, *item;
2349 2370
2350 if (!asrc) 2371 if (!asrc)
2351 return 0; 2372 return 0;
2352 2373
2353 src = asrc;
2354 if (src->head)
2355 src = src->head; 2374 src = asrc->head_ ();
2356 2375
2357 prev = 0; 2376 prev = 0;
2358 for (part = src; part; part = part->more) 2377 for (object *part = src; part; part = part->more)
2359 { 2378 {
2360 tmp = part->clone (); 2379 tmp = part->clone ();
2361 tmp->x -= src->x; 2380 tmp->x -= src->x;
2362 tmp->y -= src->y; 2381 tmp->y -= src->y;
2363 2382
2381 insert_ob_in_ob (object_create_clone (item), dst); 2400 insert_ob_in_ob (object_create_clone (item), dst);
2382 2401
2383 return dst; 2402 return dst;
2384} 2403}
2385 2404
2386/* GROS - Creates an object using a string representing its content. */
2387/* Basically, we save the content of the string to a temp file, then call */
2388/* load_object on it. I admit it is a highly inefficient way to make things, */
2389/* but it was simple to make and allows reusing the load_object function. */
2390/* Remember not to use load_object_str in a time-critical situation. */
2391/* Also remember that multiparts objects are not supported for now. */
2392object *
2393load_object_str (const char *obstr)
2394{
2395 object *op;
2396 char filename[MAX_BUF];
2397
2398 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2399
2400 FILE *tempfile = fopen (filename, "w");
2401
2402 if (tempfile == NULL)
2403 {
2404 LOG (llevError, "Error - Unable to access load object temp file\n");
2405 return NULL;
2406 }
2407
2408 fprintf (tempfile, obstr);
2409 fclose (tempfile);
2410
2411 op = object::create ();
2412
2413 object_thawer thawer (filename);
2414
2415 if (thawer)
2416 load_object (thawer, op, 0);
2417
2418 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2419 CLEAR_FLAG (op, FLAG_REMOVED);
2420
2421 return op;
2422}
2423
2424/* This returns the first object in who's inventory that 2405/* This returns the first object in who's inventory that
2425 * has the same type and subtype match. 2406 * has the same type and subtype match.
2426 * returns NULL if no match. 2407 * returns NULL if no match.
2427 */ 2408 */
2428object * 2409object *
2481 if (link->key == canonical_key) 2462 if (link->key == canonical_key)
2482 return link->value; 2463 return link->value;
2483 2464
2484 return 0; 2465 return 0;
2485} 2466}
2486
2487 2467
2488/* 2468/*
2489 * Updates the canonical_key in op to value. 2469 * Updates the canonical_key in op to value.
2490 * 2470 *
2491 * canonical_key is a shared string (value doesn't have to be). 2471 * canonical_key is a shared string (value doesn't have to be).
2515 /* Basically, if the archetype has this key set, 2495 /* Basically, if the archetype has this key set,
2516 * we need to store the null value so when we save 2496 * we need to store the null value so when we save
2517 * it, we save the empty value so that when we load, 2497 * it, we save the empty value so that when we load,
2518 * we get this value back again. 2498 * we get this value back again.
2519 */ 2499 */
2520 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2500 if (get_ob_key_link (op->arch, canonical_key))
2521 field->value = 0; 2501 field->value = 0;
2522 else 2502 else
2523 { 2503 {
2524 if (last) 2504 if (last)
2525 last->next = field->next; 2505 last->next = field->next;
2594 } 2574 }
2595 else 2575 else
2596 item = item->env; 2576 item = item->env;
2597} 2577}
2598 2578
2579const char *
2580object::flag_desc (char *desc, int len) const
2581{
2582 char *p = desc;
2583 bool first = true;
2584
2585 *p = 0;
2586
2587 for (int i = 0; i < NUM_FLAGS; i++)
2588 {
2589 if (len <= 10) // magic constant!
2590 {
2591 snprintf (p, len, ",...");
2592 break;
2593 }
2594
2595 if (flag [i])
2596 {
2597 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2598 len -= cnt;
2599 p += cnt;
2600 first = false;
2601 }
2602 }
2603
2604 return desc;
2605}
2606
2599// return a suitable string describing an objetc in enough detail to find it 2607// return a suitable string describing an object in enough detail to find it
2600const char * 2608const char *
2601object::debug_desc (char *info) const 2609object::debug_desc (char *info) const
2602{ 2610{
2611 char flagdesc[512];
2603 char info2[256 * 3]; 2612 char info2[256 * 4];
2604 char *p = info; 2613 char *p = info;
2605 2614
2606 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2615 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2607 count, 2616 count, uuid.seq,
2608 &name, 2617 &name,
2609 title ? " " : "", 2618 title ? "\",title:\"" : "",
2610 title ? (const char *)title : ""); 2619 title ? (const char *)title : "",
2620 flag_desc (flagdesc, 512), type);
2611 2621
2612 if (env) 2622 if (env)
2613 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2623 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2614 2624
2615 if (map) 2625 if (map)
2616 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2626 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2617 2627
2618 return info; 2628 return info;
2619} 2629}
2620 2630
2621const char * 2631const char *
2622object::debug_desc () const 2632object::debug_desc () const
2623{ 2633{
2624 static char info[256 * 3]; 2634 static char info[3][256 * 4];
2635 static int info_idx;
2636
2625 return debug_desc (info); 2637 return debug_desc (info [++info_idx % 3]);
2626} 2638}
2627 2639
2640struct region *
2641object::region () const
2642{
2643 return map ? map->region (x, y)
2644 : region::default_region ();
2645}
2646
2647const materialtype_t *
2648object::dominant_material () const
2649{
2650 if (materialtype_t *mt = name_to_material (materialname))
2651 return mt;
2652
2653 return name_to_material (shstr_unknown);
2654}
2655
2656void
2657object::open_container (object *new_container)
2658{
2659 if (container == new_container)
2660 return;
2661
2662 if (object *old_container = container)
2663 {
2664 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2665 return;
2666
2667#if 0
2668 // remove the "Close old_container" object.
2669 if (object *closer = old_container->inv)
2670 if (closer->type == CLOSE_CON)
2671 closer->destroy ();
2672#endif
2673
2674 old_container->flag [FLAG_APPLIED] = 0;
2675 container = 0;
2676
2677 esrv_update_item (UPD_FLAGS, this, old_container);
2678 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2679 }
2680
2681 if (new_container)
2682 {
2683 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2684 return;
2685
2686 // TODO: this does not seem to serve any purpose anymore?
2687#if 0
2688 // insert the "Close Container" object.
2689 if (archetype *closer = new_container->other_arch)
2690 {
2691 object *closer = arch_to_object (new_container->other_arch);
2692 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2693 new_container->insert (closer);
2694 }
2695#endif
2696
2697 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2698
2699 new_container->flag [FLAG_APPLIED] = 1;
2700 container = new_container;
2701
2702 esrv_update_item (UPD_FLAGS, this, new_container);
2703 esrv_send_inventory (this, new_container);
2704 }
2705}
2706
2707object *
2708object::force_find (const shstr name)
2709{
2710 /* cycle through his inventory to look for the MARK we want to
2711 * place
2712 */
2713 for (object *tmp = inv; tmp; tmp = tmp->below)
2714 if (tmp->type == FORCE && tmp->slaying == name)
2715 return splay (tmp);
2716
2717 return 0;
2718}
2719
2720void
2721object::force_add (const shstr name, int duration)
2722{
2723 if (object *force = force_find (name))
2724 force->destroy ();
2725
2726 object *force = get_archetype (FORCE_NAME);
2727
2728 force->slaying = name;
2729 force->stats.food = 1;
2730 force->speed_left = -1.f;
2731
2732 force->set_speed (duration ? 1.f / duration : 0.f);
2733 force->flag [FLAG_IS_USED_UP] = true;
2734 force->flag [FLAG_APPLIED] = true;
2735
2736 insert (force);
2737}
2738

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines