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.68 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.122 by root, Wed Jan 24 22:42:48 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
… …
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 47};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
… …
141 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
143 */ 145 */
144 146
145 /* For each field in wants, */ 147 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 149 {
148 key_value *has_field; 150 key_value *has_field;
149 151
150 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
… …
190 * Check nrof variable *before* calling can_merge() 192 * Check nrof variable *before* calling can_merge()
191 * 193 *
192 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
193 * check weight 195 * check weight
194 */ 196 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
197{ 198{
198 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
199 if (ob1 == ob2 200 if (ob1 == ob2
200 || ob1->type != ob2->type 201 || ob1->type != ob2->type
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 222 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 223
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 225 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 226
226
227 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
228 || ob1->arch != ob2->arch 228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 229 || ob1->name != ob2->name
230 || ob1->title != ob2->title 230 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 231 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 232 || ob1->weight != ob2->weight
… …
278 278
279 /* 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
280 * 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
281 * check? 281 * check?
282 */ 282 */
283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
284 return 0; 284 return 0;
285 285
286 switch (ob1->type) 286 switch (ob1->type)
287 { 287 {
288 case SCROLL: 288 case SCROLL:
… …
353 op = op->env; 353 op = op->env;
354 return op; 354 return op;
355} 355}
356 356
357/* 357/*
358 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
359 * a better check. We basically keeping traversing up until we can't
360 * or find a player.
361 */
362
363object *
364is_player_inv (object *op)
365{
366 for (; op != NULL && op->type != PLAYER; op = op->env)
367 if (op->env == op)
368 op->env = NULL;
369 return op;
370}
371
372/*
373 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
374 * Some error messages. 359 * Some error messages.
375 * The result of the dump is stored in the static global errmsg array. 360 * The result of the dump is stored in the static global errmsg array.
376 */ 361 */
377 362
… …
380{ 365{
381 if (!op) 366 if (!op)
382 return strdup ("[NULLOBJ]"); 367 return strdup ("[NULLOBJ]");
383 368
384 object_freezer freezer; 369 object_freezer freezer;
385 save_object (freezer, op, 3); 370 save_object (freezer, op, 1);
386 return freezer.as_string (); 371 return freezer.as_string ();
387} 372}
388 373
389/* 374/*
390 * 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
… …
407} 392}
408 393
409/* 394/*
410 * 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.
411 */ 396 */
412
413object * 397object *
414find_object (tag_t i) 398find_object (tag_t i)
415{ 399{
416 for (object *op = object::first; op; op = op->next) 400 for_all_objects (op)
417 if (op->count == i) 401 if (op->count == i)
418 return op; 402 return op;
419 403
420 return 0; 404 return 0;
421} 405}
422 406
423/* 407/*
424 * 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.
425 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
426 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
427 */ 411 */
428
429object * 412object *
430find_object_name (const char *str) 413find_object_name (const char *str)
431{ 414{
432 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
433 object *op; 416 object *op;
434 417
435 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
436 if (op->name == str_) 419 if (op->name == str_)
437 break; 420 break;
438 421
439 return op; 422 return op;
440} 423}
… …
483 } 466 }
484 467
485 op->key_values = 0; 468 op->key_values = 0;
486} 469}
487 470
488void object::clear ()
489{
490 attachable_base::clear ();
491
492 free_key_values (this);
493
494 owner = 0;
495 name = 0;
496 name_pl = 0;
497 title = 0;
498 race = 0;
499 slaying = 0;
500 skill = 0;
501 msg = 0;
502 lore = 0;
503 custom_name = 0;
504 materialname = 0;
505 contr = 0;
506 below = 0;
507 above = 0;
508 inv = 0;
509 container = 0;
510 env = 0;
511 more = 0;
512 head = 0;
513 map = 0;
514 active_next = 0;
515 active_prev = 0;
516
517 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
518
519 SET_FLAG (this, FLAG_REMOVED);
520
521 /* What is not cleared is next, prev, and count */
522
523 expmul = 1.0;
524 face = blank_face;
525
526 if (settings.casting_time)
527 casting_time = -1;
528}
529
530/* 471/*
531 * copy_to first frees everything allocated by the dst object, 472 * copy_to first frees everything allocated by the dst object,
532 * and then copies the contents of itself into the second 473 * and then copies the contents of itself into the second
533 * object, allocating what needs to be allocated. Basically, any 474 * object, allocating what needs to be allocated. Basically, any
534 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
… …
540{ 481{
541 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
542 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
543 484
544 *(object_copy *)dst = *this; 485 *(object_copy *)dst = *this;
545 *(object_pod *)dst = *this;
546
547 if (self || cb)
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
549 486
550 if (is_freed) 487 if (is_freed)
551 SET_FLAG (dst, FLAG_FREED); 488 SET_FLAG (dst, FLAG_FREED);
552 489
553 if (is_removed) 490 if (is_removed)
554 SET_FLAG (dst, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
555 492
556 if (speed < 0) 493 if (speed < 0)
557 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - rndm ();
558 495
559 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
560 if (key_values) 497 if (key_values)
561 { 498 {
562 key_value *tail = 0; 499 key_value *tail = 0;
… …
584 tail = new_link; 521 tail = new_link;
585 } 522 }
586 } 523 }
587 } 524 }
588 525
589 update_ob_speed (dst); 526 dst->set_speed (dst->speed);
590} 527}
591 528
592object * 529object *
593object::clone () 530object::clone ()
594{ 531{
… …
600/* 537/*
601 * If an object with the IS_TURNABLE() flag needs to be turned due 538 * If an object with the IS_TURNABLE() flag needs to be turned due
602 * to the closest player being on the other side, this function can 539 * to the closest player being on the other side, this function can
603 * be called to update the face variable, _and_ how it looks on the map. 540 * be called to update the face variable, _and_ how it looks on the map.
604 */ 541 */
605
606void 542void
607update_turn_face (object *op) 543update_turn_face (object *op)
608{ 544{
609 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 545 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
610 return; 546 return;
547
611 SET_ANIMATION (op, op->direction); 548 SET_ANIMATION (op, op->direction);
612 update_object (op, UP_OBJ_FACE); 549 update_object (op, UP_OBJ_FACE);
613} 550}
614 551
615/* 552/*
616 * Updates the speed of an object. If the speed changes from 0 to another 553 * Updates the speed of an object. If the speed changes from 0 to another
617 * value, or vice versa, then add/remove the object from the active list. 554 * value, or vice versa, then add/remove the object from the active list.
618 * This function needs to be called whenever the speed of an object changes. 555 * This function needs to be called whenever the speed of an object changes.
619 */ 556 */
620void 557void
621update_ob_speed (object *op) 558object::set_speed (float speed)
622{ 559{
623 extern int arch_init; 560 if (flag [FLAG_FREED] && speed)
624
625 /* No reason putting the archetypes objects on the speed list,
626 * since they never really need to be updated.
627 */
628
629 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
630 { 561 {
631 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 562 LOG (llevError, "Object %s is freed but has speed.\n", &name);
632#ifdef MANY_CORES
633 abort ();
634#else
635 op->speed = 0; 563 speed = 0;
636#endif
637 }
638
639 if (arch_init)
640 return;
641
642 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
643 { 564 }
644 /* If already on active list, don't do anything */
645 if (op->active_next || op->active_prev || op == active_objects)
646 return;
647 565
648 /* process_events() expects us to insert the object at the beginning 566 this->speed = speed;
649 * of the list. */
650 op->active_next = active_objects;
651 567
652 if (op->active_next != NULL) 568 if (has_active_speed ())
653 op->active_next->active_prev = op; 569 activate ();
654
655 active_objects = op;
656 }
657 else 570 else
658 { 571 deactivate ();
659 /* If not on the active list, nothing needs to be done */
660 if (!op->active_next && !op->active_prev && op != active_objects)
661 return;
662
663 if (op->active_prev == NULL)
664 {
665 active_objects = op->active_next;
666
667 if (op->active_next != NULL)
668 op->active_next->active_prev = NULL;
669 }
670 else
671 {
672 op->active_prev->active_next = op->active_next;
673
674 if (op->active_next)
675 op->active_next->active_prev = op->active_prev;
676 }
677
678 op->active_next = NULL;
679 op->active_prev = NULL;
680 }
681} 572}
682 573
683/* This function removes object 'op' from the list of active
684 * objects.
685 * This should only be used for style maps or other such
686 * reference maps where you don't want an object that isn't
687 * in play chewing up cpu time getting processed.
688 * The reverse of this is to call update_ob_speed, which
689 * will do the right thing based on the speed of the object.
690 */
691void
692remove_from_active_list (object *op)
693{
694 /* If not on the active list, nothing needs to be done */
695 if (!op->active_next && !op->active_prev && op != active_objects)
696 return;
697
698 if (op->active_prev == NULL)
699 {
700 active_objects = op->active_next;
701 if (op->active_next != NULL)
702 op->active_next->active_prev = NULL;
703 }
704 else
705 {
706 op->active_prev->active_next = op->active_next;
707 if (op->active_next)
708 op->active_next->active_prev = op->active_prev;
709 }
710 op->active_next = NULL;
711 op->active_prev = NULL;
712}
713
714/* 574/*
715 * update_object() updates the array which represents the map. 575 * update_object() updates the the map.
716 * It takes into account invisible objects (and represent squares covered 576 * It takes into account invisible objects (and represent squares covered
717 * by invisible objects by whatever is below them (unless it's another 577 * by invisible objects by whatever is below them (unless it's another
718 * invisible object, etc...) 578 * invisible object, etc...)
719 * If the object being updated is beneath a player, the look-window 579 * If the object being updated is beneath a player, the look-window
720 * of that player is updated (this might be a suboptimal way of 580 * of that player is updated (this might be a suboptimal way of
721 * updating that window, though, since update_object() is called _often_) 581 * updating that window, though, since update_object() is called _often_)
722 * 582 *
723 * action is a hint of what the caller believes need to be done. 583 * action is a hint of what the caller believes need to be done.
724 * For example, if the only thing that has changed is the face (due to
725 * an animation), we don't need to call update_position until that actually
726 * comes into view of a player. OTOH, many other things, like addition/removal
727 * of walls or living creatures may need us to update the flags now.
728 * current action are: 584 * current action are:
729 * UP_OBJ_INSERT: op was inserted 585 * UP_OBJ_INSERT: op was inserted
730 * UP_OBJ_REMOVE: op was removed 586 * UP_OBJ_REMOVE: op was removed
731 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 587 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
732 * as that is easier than trying to look at what may have changed. 588 * as that is easier than trying to look at what may have changed.
733 * UP_OBJ_FACE: only the objects face has changed. 589 * UP_OBJ_FACE: only the objects face has changed.
734 */ 590 */
735
736void 591void
737update_object (object *op, int action) 592update_object (object *op, int action)
738{ 593{
739 int update_now = 0, flags;
740 MoveType move_on, move_off, move_block, move_slow; 594 MoveType move_on, move_off, move_block, move_slow;
741 595
742 if (op == NULL) 596 if (op == NULL)
743 { 597 {
744 /* this should never happen */ 598 /* this should never happen */
745 LOG (llevDebug, "update_object() called for NULL object.\n"); 599 LOG (llevDebug, "update_object() called for NULL object.\n");
746 return; 600 return;
747 } 601 }
748 602
749 if (op->env != NULL) 603 if (op->env)
750 { 604 {
751 /* Animation is currently handled by client, so nothing 605 /* Animation is currently handled by client, so nothing
752 * to do in this case. 606 * to do in this case.
753 */ 607 */
754 return; 608 return;
… …
759 */ 613 */
760 if (!op->map || op->map->in_memory == MAP_SAVING) 614 if (!op->map || op->map->in_memory == MAP_SAVING)
761 return; 615 return;
762 616
763 /* make sure the object is within map boundaries */ 617 /* make sure the object is within map boundaries */
764 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 618 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
765 { 619 {
766 LOG (llevError, "update_object() called for object out of map!\n"); 620 LOG (llevError, "update_object() called for object out of map!\n");
767#ifdef MANY_CORES 621#ifdef MANY_CORES
768 abort (); 622 abort ();
769#endif 623#endif
770 return; 624 return;
771 } 625 }
772 626
773 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 627 mapspace &m = op->ms ();
774 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
775 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
776 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
777 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
778 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
779 628
629 if (!(m.flags_ & P_UPTODATE))
630 /* nop */;
780 if (action == UP_OBJ_INSERT) 631 else if (action == UP_OBJ_INSERT)
781 { 632 {
633 // this is likely overkill, TODO: revisit (schmorp)
782 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
783 update_now = 1;
784
785 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 635 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
786 update_now = 1; 636 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
787 637 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
638 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
788 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 639 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
789 update_now = 1;
790
791 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
792 update_now = 1;
793
794 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
795 update_now = 1;
796
797 if ((move_on | op->move_on) != move_on) 640 || (m.move_on | op->move_on ) != m.move_on
798 update_now = 1;
799
800 if ((move_off | op->move_off) != move_off) 641 || (m.move_off | op->move_off ) != m.move_off
801 update_now = 1; 642 || (m.move_slow | op->move_slow) != m.move_slow
802
803 /* This isn't perfect, but I don't expect a lot of objects to 643 /* This isn't perfect, but I don't expect a lot of objects to
804 * to have move_allow right now. 644 * to have move_allow right now.
805 */ 645 */
806 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
807 update_now = 1; 647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
808 648 m.flags_ = 0;
809 if ((move_slow | op->move_slow) != move_slow)
810 update_now = 1;
811 } 649 }
812
813 /* if the object is being removed, we can't make intelligent 650 /* if the object is being removed, we can't make intelligent
814 * decisions, because remove_ob can't really pass the object 651 * decisions, because remove_ob can't really pass the object
815 * that is being removed. 652 * that is being removed.
816 */ 653 */
817 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
818 update_now = 1; 655 m.flags_ = 0;
819 else if (action == UP_OBJ_FACE) 656 else if (action == UP_OBJ_FACE)
820 /* Nothing to do for that case */ ; 657 /* Nothing to do for that case */ ;
821 else 658 else
822 LOG (llevError, "update_object called with invalid action: %d\n", action); 659 LOG (llevError, "update_object called with invalid action: %d\n", action);
823 660
824 if (update_now)
825 {
826 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
827 update_position (op->map, op->x, op->y);
828 }
829
830 if (op->more != NULL) 661 if (op->more)
831 update_object (op->more, action); 662 update_object (op->more, action);
832}
833
834object::vector object::mortals;
835object::vector object::objects; // not yet used
836object *object::first;
837
838void object::free_mortals ()
839{
840 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
841 if ((*i)->refcnt)
842 ++i; // further delay freeing
843 else
844 {
845 delete *i;
846 mortals.erase (i);
847 }
848} 663}
849 664
850object::object () 665object::object ()
851{ 666{
852 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
… …
855 face = blank_face; 670 face = blank_face;
856} 671}
857 672
858object::~object () 673object::~object ()
859{ 674{
675 unlink ();
676
860 free_key_values (this); 677 free_key_values (this);
861} 678}
862 679
680static int object_count;
681
863void object::link () 682void object::link ()
864{ 683{
865 count = ++ob_count; 684 assert (!index);//D
866 uuid = gen_uuid (); 685 uuid = gen_uuid ();
686 count = ++object_count;
867 687
868 prev = 0; 688 refcnt_inc ();
869 next = object::first; 689 objects.insert (this);
870
871 if (object::first)
872 object::first->prev = this;
873
874 object::first = this;
875} 690}
876 691
877void object::unlink () 692void object::unlink ()
878{ 693{
879 if (this == object::first) 694 if (!index)
880 object::first = next; 695 return;
881 696
882 /* Remove this object from the list of used objects */ 697 objects.erase (this);
883 if (prev) prev->next = next; 698 refcnt_dec ();
884 if (next) next->prev = prev; 699}
885 700
886 prev = 0; 701void
887 next = 0; 702object::activate ()
703{
704 /* If already on active list, don't do anything */
705 if (active)
706 return;
707
708 if (has_active_speed ())
709 actives.insert (this);
710}
711
712void
713object::activate_recursive ()
714{
715 activate ();
716
717 for (object *op = inv; op; op = op->below)
718 op->activate_recursive ();
719}
720
721/* This function removes object 'op' from the list of active
722 * objects.
723 * This should only be used for style maps or other such
724 * reference maps where you don't want an object that isn't
725 * in play chewing up cpu time getting processed.
726 * The reverse of this is to call update_ob_speed, which
727 * will do the right thing based on the speed of the object.
728 */
729void
730object::deactivate ()
731{
732 /* If not on the active list, nothing needs to be done */
733 if (!active)
734 return;
735
736 actives.erase (this);
737}
738
739void
740object::deactivate_recursive ()
741{
742 for (object *op = inv; op; op = op->below)
743 op->deactivate_recursive ();
744
745 deactivate ();
746}
747
748void
749object::set_flag_inv (int flag, int value)
750{
751 for (object *op = inv; op; op = op->below)
752 {
753 op->flag [flag] = value;
754 op->set_flag_inv (flag, value);
755 }
756}
757
758/*
759 * Remove and free all objects in the inventory of the given object.
760 * object.c ?
761 */
762void
763object::destroy_inv (bool drop_to_ground)
764{
765 // need to check first, because the checks below might segfault
766 // as we might be on an invalid mapspace and crossfire code
767 // is too buggy to ensure that the inventory is empty.
768 // corollary: if you create arrows etc. with stuff in tis inventory,
769 // cf will crash below with off-map x and y
770 if (!inv)
771 return;
772
773 /* Only if the space blocks everything do we not process -
774 * if some form of movement is allowed, let objects
775 * drop on that space.
776 */
777 if (!drop_to_ground
778 || !map
779 || map->in_memory != MAP_IN_MEMORY
780 || map->nodrop
781 || ms ().move_block == MOVE_ALL)
782 {
783 while (inv)
784 {
785 inv->destroy_inv (drop_to_ground);
786 inv->destroy ();
787 }
788 }
789 else
790 { /* Put objects in inventory onto this space */
791 while (inv)
792 {
793 object *op = inv;
794
795 if (op->flag [FLAG_STARTEQUIP]
796 || op->flag [FLAG_NO_DROP]
797 || op->type == RUNE
798 || op->type == TRAP
799 || op->flag [FLAG_IS_A_TEMPLATE]
800 || op->flag [FLAG_DESTROY_ON_DEATH])
801 op->destroy ();
802 else
803 map->insert (op, x, y);
804 }
805 }
888} 806}
889 807
890object *object::create () 808object *object::create ()
891{ 809{
892 object *op = new object; 810 object *op = new object;
893 op->link (); 811 op->link ();
894 return op; 812 return op;
895} 813}
896 814
897/* 815void
898 * free_object() frees everything allocated by an object, removes 816object::do_destroy ()
899 * it from the list of used objects, and puts it on the list of
900 * free objects. The IS_FREED() flag is set in the object.
901 * The object must have been removed by remove_ob() first for
902 * this function to succeed.
903 *
904 * If destroy_inventory is set, free inventory as well. Else drop items in
905 * inventory to the ground.
906 */
907void object::destroy (bool destroy_inventory)
908{ 817{
909 if (QUERY_FLAG (this, FLAG_FREED)) 818 attachable::do_destroy ();
910 return;
911 819
912 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 820 if (flag [FLAG_IS_LINKED])
821 remove_button_link (this);
822
823 if (flag [FLAG_FRIENDLY])
913 remove_friendly_object (this); 824 remove_friendly_object (this);
914 825
915 if (!QUERY_FLAG (this, FLAG_REMOVED)) 826 if (!flag [FLAG_REMOVED])
916 remove (); 827 remove ();
917 828
918 SET_FLAG (this, FLAG_FREED); 829 destroy_inv (true);
919 830
920 if (more) 831 deactivate ();
921 { 832 unlink ();
922 more->destroy (destroy_inventory);
923 more = 0;
924 }
925 833
926 if (inv) 834 flag [FLAG_FREED] = 1;
927 {
928 /* Only if the space blocks everything do we not process -
929 * if some form of movement is allowed, let objects
930 * drop on that space.
931 */
932 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
933 {
934 object *op = inv;
935
936 while (op)
937 {
938 object *tmp = op->below;
939 op->destroy (destroy_inventory);
940 op = tmp;
941 }
942 }
943 else
944 { /* Put objects in inventory onto this space */
945 object *op = inv;
946
947 while (op)
948 {
949 object *tmp = op->below;
950
951 op->remove ();
952
953 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
954 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
955 op->destroy ();
956 else
957 {
958 op->x = x;
959 op->y = y;
960 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
961 }
962
963 op = tmp;
964 }
965 }
966 }
967 835
968 // hack to ensure that freed objects still have a valid map 836 // hack to ensure that freed objects still have a valid map
969 { 837 {
970 static maptile *freed_map; // freed objects are moved here to avoid crashes 838 static maptile *freed_map; // freed objects are moved here to avoid crashes
971 839
… …
975 843
976 freed_map->name = "/internal/freed_objects_map"; 844 freed_map->name = "/internal/freed_objects_map";
977 freed_map->width = 3; 845 freed_map->width = 3;
978 freed_map->height = 3; 846 freed_map->height = 3;
979 847
980 freed_map->allocate (); 848 freed_map->alloc ();
849 freed_map->in_memory = MAP_IN_MEMORY;
981 } 850 }
982 851
983 map = freed_map; 852 map = freed_map;
984 x = 1; 853 x = 1;
985 y = 1; 854 y = 1;
986 } 855 }
987 856
857 head = 0;
858
859 if (more)
860 {
861 more->destroy ();
862 more = 0;
863 }
864
988 // clear those pointers that likely might have circular references to us 865 // clear those pointers that likely might have circular references to us
989 owner = 0; 866 owner = 0;
990 enemy = 0; 867 enemy = 0;
991 attacked_by = 0; 868 attacked_by = 0;
869}
992 870
993 // only relevant for players(?), but make sure of it anyways 871void
994 contr = 0; 872object::destroy (bool destroy_inventory)
873{
874 if (destroyed ())
875 return;
995 876
996 /* Remove object from the active list */ 877 if (destroy_inventory)
997 speed = 0; 878 destroy_inv (false);
998 update_ob_speed (this);
999 879
1000 unlink (); 880 attachable::destroy ();
1001
1002 mortals.push_back (this);
1003} 881}
1004 882
1005/* 883/*
1006 * sub_weight() recursively (outwards) subtracts a number from the 884 * sub_weight() recursively (outwards) subtracts a number from the
1007 * weight of an object (and what is carried by it's environment(s)). 885 * weight of an object (and what is carried by it's environment(s)).
… …
1026 * environment, the x and y coordinates will be updated to 904 * environment, the x and y coordinates will be updated to
1027 * the previous environment. 905 * the previous environment.
1028 * Beware: This function is called from the editor as well! 906 * Beware: This function is called from the editor as well!
1029 */ 907 */
1030void 908void
1031object::remove () 909object::remove_slow ()
1032{ 910{
1033 object *tmp, *last = 0; 911 object *tmp, *last = 0;
1034 object *otmp; 912 object *otmp;
1035 913
1036 int check_walk_off;
1037
1038 if (QUERY_FLAG (this, FLAG_REMOVED)) 914 if (QUERY_FLAG (this, FLAG_REMOVED))
1039 return; 915 return;
1040 916
1041 SET_FLAG (this, FLAG_REMOVED); 917 SET_FLAG (this, FLAG_REMOVED);
918 INVOKE_OBJECT (REMOVE, this);
1042 919
1043 if (more) 920 if (more)
1044 more->remove (); 921 more->remove ();
1045 922
1046 /* 923 /*
… …
1056 933
1057 /* NO_FIX_PLAYER is set when a great many changes are being 934 /* NO_FIX_PLAYER is set when a great many changes are being
1058 * made to players inventory. If set, avoiding the call 935 * made to players inventory. If set, avoiding the call
1059 * to save cpu time. 936 * to save cpu time.
1060 */ 937 */
1061 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 938 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1062 fix_player (otmp); 939 otmp->update_stats ();
1063 940
1064 if (above != NULL) 941 if (above)
1065 above->below = below; 942 above->below = below;
1066 else 943 else
1067 env->inv = below; 944 env->inv = below;
1068 945
1069 if (below != NULL) 946 if (below)
1070 below->above = above; 947 below->above = above;
1071 948
1072 /* we set up values so that it could be inserted into 949 /* we set up values so that it could be inserted into
1073 * the map, but we don't actually do that - it is up 950 * the map, but we don't actually do that - it is up
1074 * to the caller to decide what we want to do. 951 * to the caller to decide what we want to do.
… …
1078 above = 0, below = 0; 955 above = 0, below = 0;
1079 env = 0; 956 env = 0;
1080 } 957 }
1081 else if (map) 958 else if (map)
1082 { 959 {
1083 /* Re did the following section of code - it looks like it had 960 if (type == PLAYER)
1084 * lots of logic for things we no longer care about
1085 */ 961 {
962 --map->players;
963 map->touch ();
964 }
965
966 map->dirty = true;
967 mapspace &ms = this->ms ();
1086 968
1087 /* link the object above us */ 969 /* link the object above us */
1088 if (above) 970 if (above)
1089 above->below = below; 971 above->below = below;
1090 else 972 else
1091 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ 973 ms.top = below; /* we were top, set new top */
1092 974
1093 /* Relink the object below us, if there is one */ 975 /* Relink the object below us, if there is one */
1094 if (below) 976 if (below)
1095 below->above = above; 977 below->above = above;
1096 else 978 else
… …
1098 /* Nothing below, which means we need to relink map object for this space 980 /* Nothing below, which means we need to relink map object for this space
1099 * use translated coordinates in case some oddness with map tiling is 981 * use translated coordinates in case some oddness with map tiling is
1100 * evident 982 * evident
1101 */ 983 */
1102 if (GET_MAP_OB (map, x, y) != this) 984 if (GET_MAP_OB (map, x, y) != this)
1103 {
1104 char *dump = dump_object (this);
1105 LOG (llevError,
1106 "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); 985 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 ());
1107 free (dump);
1108 dump = dump_object (GET_MAP_OB (map, x, y));
1109 LOG (llevError, "%s\n", dump);
1110 free (dump);
1111 }
1112 986
1113 SET_MAP_OB (map, x, y, above); /* goes on above it. */ 987 ms.bot = above; /* goes on above it. */
1114 } 988 }
1115 989
1116 above = 0; 990 above = 0;
1117 below = 0; 991 below = 0;
1118 992
1119 if (map->in_memory == MAP_SAVING) 993 if (map->in_memory == MAP_SAVING)
1120 return; 994 return;
1121 995
1122 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 996 int check_walk_off = !flag [FLAG_NO_APPLY];
1123 997
1124 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 998 for (tmp = ms.bot; tmp; tmp = tmp->above)
1125 { 999 {
1126 /* No point updating the players look faces if he is the object 1000 /* No point updating the players look faces if he is the object
1127 * being removed. 1001 * being removed.
1128 */ 1002 */
1129 1003
… …
1133 * removed (most likely destroyed), update the player view 1007 * removed (most likely destroyed), update the player view
1134 * appropriately. 1008 * appropriately.
1135 */ 1009 */
1136 if (tmp->container == this) 1010 if (tmp->container == this)
1137 { 1011 {
1138 CLEAR_FLAG (this, FLAG_APPLIED); 1012 flag [FLAG_APPLIED] = 0;
1139 tmp->container = 0; 1013 tmp->container = 0;
1140 } 1014 }
1141 1015
1142 tmp->contr->socket->update_look = 1; 1016 if (tmp->contr->ns)
1017 tmp->contr->ns->floorbox_update ();
1143 } 1018 }
1144 1019
1145 /* See if player moving off should effect something */ 1020 /* See if object moving off should effect something */
1146 if (check_walk_off 1021 if (check_walk_off
1147 && ((move_type & tmp->move_off) 1022 && ((move_type & tmp->move_off)
1148 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1023 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1149 { 1024 {
1150 move_apply (tmp, this, 0); 1025 move_apply (tmp, this, 0);
… …
1152 if (destroyed ()) 1027 if (destroyed ())
1153 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1028 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1154 } 1029 }
1155 1030
1156 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1031 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1157 1032 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1158 if (tmp->above == tmp) 1033 if (tmp->above == tmp)
1159 tmp->above = 0; 1034 tmp->above = 0;
1160 1035
1161 last = tmp; 1036 last = tmp;
1162 } 1037 }
1163 1038
1164 /* last == NULL of there are no objects on this space */ 1039 /* last == NULL if there are no objects on this space */
1040 //TODO: this makes little sense, why only update the topmost object?
1165 if (!last) 1041 if (!last)
1166 { 1042 map->at (x, y).flags_ = 0;
1167 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1168 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1169 * those out anyways, and if there are any flags set right now, they won't
1170 * be correct anyways.
1171 */
1172 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1173 update_position (map, x, y);
1174 }
1175 else 1043 else
1176 update_object (last, UP_OBJ_REMOVE); 1044 update_object (last, UP_OBJ_REMOVE);
1177 1045
1178 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1046 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1179 update_all_los (map, x, y); 1047 update_all_los (map, x, y);
1180 } 1048 }
1181} 1049}
1182 1050
1183/* 1051/*
… …
1192merge_ob (object *op, object *top) 1060merge_ob (object *op, object *top)
1193{ 1061{
1194 if (!op->nrof) 1062 if (!op->nrof)
1195 return 0; 1063 return 0;
1196 1064
1197 if (top == NULL) 1065 if (top)
1198 for (top = op; top != NULL && top->above != NULL; top = top->above); 1066 for (top = op; top && top->above; top = top->above)
1067 ;
1199 1068
1200 for (; top != NULL; top = top->below) 1069 for (; top; top = top->below)
1201 { 1070 {
1202 if (top == op) 1071 if (top == op)
1203 continue; 1072 continue;
1204 1073
1205 if (object::can_merge (op, top)) 1074 if (object::can_merge (op, top))
… …
1215 1084
1216 return 0; 1085 return 0;
1217} 1086}
1218 1087
1219/* 1088/*
1220 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1089 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1221 * job preparing multi-part monsters 1090 * job preparing multi-part monsters.
1222 */ 1091 */
1223object * 1092object *
1224insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1225{ 1094{
1226 object *tmp;
1227
1228 if (op->head)
1229 op = op->head;
1230
1231 for (tmp = op; tmp; tmp = tmp->more) 1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1232 { 1096 {
1233 tmp->x = x + tmp->arch->clone.x; 1097 tmp->x = x + tmp->arch->clone.x;
1234 tmp->y = y + tmp->arch->clone.y; 1098 tmp->y = y + tmp->arch->clone.y;
1235 } 1099 }
1236 1100
… …
1255 * Return value: 1119 * Return value:
1256 * new object if 'op' was merged with other object 1120 * new object if 'op' was merged with other object
1257 * NULL if 'op' was destroyed 1121 * NULL if 'op' was destroyed
1258 * just 'op' otherwise 1122 * just 'op' otherwise
1259 */ 1123 */
1260
1261object * 1124object *
1262insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1263{ 1126{
1264 object *tmp, *top, *floor = NULL; 1127 object *tmp, *top, *floor = NULL;
1265 sint16 x, y;
1266 1128
1267 if (QUERY_FLAG (op, FLAG_FREED)) 1129 if (QUERY_FLAG (op, FLAG_FREED))
1268 { 1130 {
1269 LOG (llevError, "Trying to insert freed object!\n"); 1131 LOG (llevError, "Trying to insert freed object!\n");
1270 return NULL; 1132 return NULL;
1271 } 1133 }
1272 1134
1273 if (m == NULL) 1135 if (!QUERY_FLAG (op, FLAG_REMOVED))
1136 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1137
1138 op->remove ();
1139
1140 if (!m)
1274 { 1141 {
1275 char *dump = dump_object (op); 1142 char *dump = dump_object (op);
1276 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1277 free (dump); 1144 free (dump);
1278 return op; 1145 return op;
… …
1291#endif 1158#endif
1292 free (dump); 1159 free (dump);
1293 return op; 1160 return op;
1294 } 1161 }
1295 1162
1296 if (!QUERY_FLAG (op, FLAG_REMOVED))
1297 {
1298 char *dump = dump_object (op);
1299 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300 free (dump);
1301 return op;
1302 }
1303
1304 if (op->more != NULL)
1305 {
1306 /* The part may be on a different map. */
1307
1308 object *more = op->more; 1163 if (object *more = op->more)
1309 1164 {
1310 /* We really need the caller to normalize coordinates - if
1311 * we set the map, that doesn't work if the location is within
1312 * a map and this is straddling an edge. So only if coordinate
1313 * is clear wrong do we normalize it.
1314 */
1315 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1316 more->map = get_map_from_coord (m, &more->x, &more->y);
1317 else if (!more->map)
1318 {
1319 /* For backwards compatibility - when not dealing with tiled maps,
1320 * more->map should always point to the parent.
1321 */
1322 more->map = m;
1323 }
1324
1325 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1165 if (!insert_ob_in_map (more, m, originator, flag))
1326 { 1166 {
1327 if (!op->head) 1167 if (!op->head)
1328 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1168 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1329 1169
1330 return NULL; 1170 return 0;
1331 } 1171 }
1332 } 1172 }
1333 1173
1334 CLEAR_FLAG (op, FLAG_REMOVED); 1174 CLEAR_FLAG (op, FLAG_REMOVED);
1335 1175
1336 /* Ideally, the caller figures this out. However, it complicates a lot 1176 /* Ideally, the caller figures this out. However, it complicates a lot
1337 * of areas of callers (eg, anything that uses find_free_spot would now 1177 * of areas of callers (eg, anything that uses find_free_spot would now
1338 * need extra work 1178 * need extra work
1339 */ 1179 */
1340 op->map = get_map_from_coord (m, &op->x, &op->y); 1180 if (!xy_normalise (m, op->x, op->y))
1341 x = op->x; 1181 return 0;
1342 y = op->y; 1182
1183 op->map = m;
1184 mapspace &ms = op->ms ();
1343 1185
1344 /* this has to be done after we translate the coordinates. 1186 /* this has to be done after we translate the coordinates.
1345 */ 1187 */
1346 if (op->nrof && !(flag & INS_NO_MERGE)) 1188 if (op->nrof && !(flag & INS_NO_MERGE))
1347 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1189 for (tmp = ms.bot; tmp; tmp = tmp->above)
1348 if (object::can_merge (op, tmp)) 1190 if (object::can_merge (op, tmp))
1349 { 1191 {
1350 op->nrof += tmp->nrof; 1192 op->nrof += tmp->nrof;
1351 tmp->destroy (); 1193 tmp->destroy ();
1352 } 1194 }
… …
1369 op->below = originator->below; 1211 op->below = originator->below;
1370 1212
1371 if (op->below) 1213 if (op->below)
1372 op->below->above = op; 1214 op->below->above = op;
1373 else 1215 else
1374 SET_MAP_OB (op->map, op->x, op->y, op); 1216 ms.bot = op;
1375 1217
1376 /* since *below* originator, no need to update top */ 1218 /* since *below* originator, no need to update top */
1377 originator->below = op; 1219 originator->below = op;
1378 } 1220 }
1379 else 1221 else
1380 { 1222 {
1223 top = ms.bot;
1224
1381 /* If there are other objects, then */ 1225 /* If there are other objects, then */
1382 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1226 if ((!(flag & INS_MAP_LOAD)) && top)
1383 { 1227 {
1384 object *last = NULL; 1228 object *last = 0;
1385 1229
1386 /* 1230 /*
1387 * If there are multiple objects on this space, we do some trickier handling. 1231 * If there are multiple objects on this space, we do some trickier handling.
1388 * We've already dealt with merging if appropriate. 1232 * We've already dealt with merging if appropriate.
1389 * Generally, we want to put the new object on top. But if 1233 * Generally, we want to put the new object on top. But if
… …
1393 * once we get to them. This reduces the need to traverse over all of 1237 * once we get to them. This reduces the need to traverse over all of
1394 * them when adding another one - this saves quite a bit of cpu time 1238 * them when adding another one - this saves quite a bit of cpu time
1395 * when lots of spells are cast in one area. Currently, it is presumed 1239 * when lots of spells are cast in one area. Currently, it is presumed
1396 * that flying non pickable objects are spell objects. 1240 * that flying non pickable objects are spell objects.
1397 */ 1241 */
1398 1242 for (top = ms.bot; top; top = top->above)
1399 while (top != NULL)
1400 { 1243 {
1401 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1244 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1402 floor = top; 1245 floor = top;
1403 1246
1404 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1247 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1407 top = top->below; 1250 top = top->below;
1408 break; 1251 break;
1409 } 1252 }
1410 1253
1411 last = top; 1254 last = top;
1412 top = top->above;
1413 } 1255 }
1414 1256
1415 /* Don't want top to be NULL, so set it to the last valid object */ 1257 /* Don't want top to be NULL, so set it to the last valid object */
1416 top = last; 1258 top = last;
1417 1259
… …
1424 * Unless those objects are exits, type 66 1266 * Unless those objects are exits, type 66
1425 * If INS_ON_TOP is used, don't do this processing 1267 * If INS_ON_TOP is used, don't do this processing
1426 * Need to find the object that in fact blocks view, otherwise 1268 * Need to find the object that in fact blocks view, otherwise
1427 * stacking is a bit odd. 1269 * stacking is a bit odd.
1428 */ 1270 */
1429 if (!(flag & INS_ON_TOP) && 1271 if (!(flag & INS_ON_TOP)
1430 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1272 && ms.flags () & P_BLOCKSVIEW
1273 && (op->face && !op->face->visibility))
1431 { 1274 {
1432 for (last = top; last != floor; last = last->below) 1275 for (last = top; last != floor; last = last->below)
1433 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1276 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1434 break; 1277 break;
1278
1435 /* Check to see if we found the object that blocks view, 1279 /* Check to see if we found the object that blocks view,
1436 * and make sure we have a below pointer for it so that 1280 * and make sure we have a below pointer for it so that
1437 * we can get inserted below this one, which requires we 1281 * we can get inserted below this one, which requires we
1438 * set top to the object below us. 1282 * set top to the object below us.
1439 */ 1283 */
… …
1441 top = last->below; 1285 top = last->below;
1442 } 1286 }
1443 } /* If objects on this space */ 1287 } /* If objects on this space */
1444 1288
1445 if (flag & INS_MAP_LOAD) 1289 if (flag & INS_MAP_LOAD)
1446 top = GET_MAP_TOP (op->map, op->x, op->y); 1290 top = ms.top;
1447 1291
1448 if (flag & INS_ABOVE_FLOOR_ONLY) 1292 if (flag & INS_ABOVE_FLOOR_ONLY)
1449 top = floor; 1293 top = floor;
1450 1294
1451 /* Top is the object that our object (op) is going to get inserted above. 1295 /* Top is the object that our object (op) is going to get inserted above.
1452 */ 1296 */
1453 1297
1454 /* First object on this space */ 1298 /* First object on this space */
1455 if (!top) 1299 if (!top)
1456 { 1300 {
1457 op->above = GET_MAP_OB (op->map, op->x, op->y); 1301 op->above = ms.bot;
1458 1302
1459 if (op->above) 1303 if (op->above)
1460 op->above->below = op; 1304 op->above->below = op;
1461 1305
1462 op->below = NULL; 1306 op->below = 0;
1463 SET_MAP_OB (op->map, op->x, op->y, op); 1307 ms.bot = op;
1464 } 1308 }
1465 else 1309 else
1466 { /* get inserted into the stack above top */ 1310 { /* get inserted into the stack above top */
1467 op->above = top->above; 1311 op->above = top->above;
1468 1312
… …
1471 1315
1472 op->below = top; 1316 op->below = top;
1473 top->above = op; 1317 top->above = op;
1474 } 1318 }
1475 1319
1476 if (op->above == NULL) 1320 if (!op->above)
1477 SET_MAP_TOP (op->map, op->x, op->y, op); 1321 ms.top = op;
1478 } /* else not INS_BELOW_ORIGINATOR */ 1322 } /* else not INS_BELOW_ORIGINATOR */
1479 1323
1480 if (op->type == PLAYER) 1324 if (op->type == PLAYER)
1325 {
1481 op->contr->do_los = 1; 1326 op->contr->do_los = 1;
1327 ++op->map->players;
1328 op->map->touch ();
1329 }
1330
1331 op->map->dirty = true;
1482 1332
1483 /* If we have a floor, we know the player, if any, will be above 1333 /* If we have a floor, we know the player, if any, will be above
1484 * it, so save a few ticks and start from there. 1334 * it, so save a few ticks and start from there.
1485 */ 1335 */
1486 if (!(flag & INS_MAP_LOAD)) 1336 if (!(flag & INS_MAP_LOAD))
1487 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1337 if (object *pl = ms.player ())
1488 if (tmp->type == PLAYER) 1338 if (pl->contr->ns)
1489 tmp->contr->socket->update_look = 1; 1339 pl->contr->ns->floorbox_update ();
1490 1340
1491 /* If this object glows, it may affect lighting conditions that are 1341 /* If this object glows, it may affect lighting conditions that are
1492 * visible to others on this map. But update_all_los is really 1342 * visible to others on this map. But update_all_los is really
1493 * an inefficient way to do this, as it means los for all players 1343 * an inefficient way to do this, as it means los for all players
1494 * on the map will get recalculated. The players could very well 1344 * on the map will get recalculated. The players could very well
1495 * be far away from this change and not affected in any way - 1345 * be far away from this change and not affected in any way -
1496 * this should get redone to only look for players within range, 1346 * this should get redone to only look for players within range,
1497 * or just updating the P_NEED_UPDATE for spaces within this area 1347 * or just updating the P_UPTODATE for spaces within this area
1498 * of effect may be sufficient. 1348 * of effect may be sufficient.
1499 */ 1349 */
1500 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1350 if (op->map->darkness && (op->glow_radius != 0))
1501 update_all_los (op->map, op->x, op->y); 1351 update_all_los (op->map, op->x, op->y);
1502 1352
1503 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1353 /* updates flags (blocked, alive, no magic, etc) for this map space */
1504 update_object (op, UP_OBJ_INSERT); 1354 update_object (op, UP_OBJ_INSERT);
1505 1355
1356 INVOKE_OBJECT (INSERT, op);
1357
1506 /* Don't know if moving this to the end will break anything. However, 1358 /* Don't know if moving this to the end will break anything. However,
1507 * we want to have update_look set above before calling this. 1359 * we want to have floorbox_update called before calling this.
1508 * 1360 *
1509 * check_move_on() must be after this because code called from 1361 * check_move_on() must be after this because code called from
1510 * check_move_on() depends on correct map flags (so functions like 1362 * check_move_on() depends on correct map flags (so functions like
1511 * blocked() and wall() work properly), and these flags are updated by 1363 * blocked() and wall() work properly), and these flags are updated by
1512 * update_object(). 1364 * update_object().
… …
1514 1366
1515 /* if this is not the head or flag has been passed, don't check walk on status */ 1367 /* if this is not the head or flag has been passed, don't check walk on status */
1516 if (!(flag & INS_NO_WALK_ON) && !op->head) 1368 if (!(flag & INS_NO_WALK_ON) && !op->head)
1517 { 1369 {
1518 if (check_move_on (op, originator)) 1370 if (check_move_on (op, originator))
1519 return NULL; 1371 return 0;
1520 1372
1521 /* If we are a multi part object, lets work our way through the check 1373 /* If we are a multi part object, lets work our way through the check
1522 * walk on's. 1374 * walk on's.
1523 */ 1375 */
1524 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1376 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1525 if (check_move_on (tmp, originator)) 1377 if (check_move_on (tmp, originator))
1526 return NULL; 1378 return 0;
1527 } 1379 }
1528 1380
1529 return op; 1381 return op;
1530} 1382}
1531 1383
1532/* this function inserts an object in the map, but if it 1384/* this function inserts an object in the map, but if it
1533 * finds an object of its own type, it'll remove that one first. 1385 * finds an object of its own type, it'll remove that one first.
1534 * op is the object to insert it under: supplies x and the map. 1386 * op is the object to insert it under: supplies x and the map.
1535 */ 1387 */
1536void 1388void
1537replace_insert_ob_in_map (const char *arch_string, object *op) 1389replace_insert_ob_in_map (const char *arch_string, object *op)
1538{ 1390{
1539 object * 1391 object *tmp, *tmp1;
1540 tmp;
1541 object *
1542 tmp1;
1543 1392
1544 /* first search for itself and remove any old instances */ 1393 /* first search for itself and remove any old instances */
1545 1394
1546 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1395 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1396 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548 tmp->destroy (); 1397 tmp->destroy ();
1549 1398
1550 tmp1 = arch_to_object (archetype::find (arch_string)); 1399 tmp1 = arch_to_object (archetype::find (arch_string));
1551 1400
1552 tmp1->x = op->x; 1401 tmp1->x = op->x;
1553 tmp1->y = op->y; 1402 tmp1->y = op->y;
1554 insert_ob_in_map (tmp1, op->map, op, 0); 1403 insert_ob_in_map (tmp1, op->map, op, 0);
1404}
1405
1406object *
1407object::insert_at (object *where, object *originator, int flags)
1408{
1409 where->map->insert (this, where->x, where->y, originator, flags);
1555} 1410}
1556 1411
1557/* 1412/*
1558 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1413 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1559 * is returned contains nr objects, and the remaining parts contains 1414 * is returned contains nr objects, and the remaining parts contains
1560 * the rest (or is removed and freed if that number is 0). 1415 * the rest (or is removed and freed if that number is 0).
1561 * On failure, NULL is returned, and the reason put into the 1416 * On failure, NULL is returned, and the reason put into the
1562 * global static errmsg array. 1417 * global static errmsg array.
1563 */ 1418 */
1564
1565object * 1419object *
1566get_split_ob (object *orig_ob, uint32 nr) 1420get_split_ob (object *orig_ob, uint32 nr)
1567{ 1421{
1568 object *newob; 1422 object *newob;
1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1423 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1605 1459
1606object * 1460object *
1607decrease_ob_nr (object *op, uint32 i) 1461decrease_ob_nr (object *op, uint32 i)
1608{ 1462{
1609 object *tmp; 1463 object *tmp;
1610 player *pl;
1611 1464
1612 if (i == 0) /* objects with op->nrof require this check */ 1465 if (i == 0) /* objects with op->nrof require this check */
1613 return op; 1466 return op;
1614 1467
1615 if (i > op->nrof) 1468 if (i > op->nrof)
1616 i = op->nrof; 1469 i = op->nrof;
1617 1470
1618 if (QUERY_FLAG (op, FLAG_REMOVED)) 1471 if (QUERY_FLAG (op, FLAG_REMOVED))
1619 op->nrof -= i; 1472 op->nrof -= i;
1620 else if (op->env != NULL) 1473 else if (op->env)
1621 { 1474 {
1622 /* is this object in the players inventory, or sub container 1475 /* is this object in the players inventory, or sub container
1623 * therein? 1476 * therein?
1624 */ 1477 */
1625 tmp = is_player_inv (op->env); 1478 tmp = op->in_player ();
1626 /* nope. Is this a container the player has opened? 1479 /* nope. Is this a container the player has opened?
1627 * If so, set tmp to that player. 1480 * If so, set tmp to that player.
1628 * IMO, searching through all the players will mostly 1481 * IMO, searching through all the players will mostly
1629 * likely be quicker than following op->env to the map, 1482 * likely be quicker than following op->env to the map,
1630 * and then searching the map for a player. 1483 * and then searching the map for a player.
1631 */ 1484 */
1632 if (!tmp) 1485 if (!tmp)
1633 { 1486 for_all_players (pl)
1634 for (pl = first_player; pl; pl = pl->next)
1635 if (pl->ob->container == op->env) 1487 if (pl->ob->container == op->env)
1488 {
1489 tmp = pl->ob;
1636 break; 1490 break;
1637 if (pl)
1638 tmp = pl->ob;
1639 else
1640 tmp = NULL;
1641 } 1491 }
1642 1492
1643 if (i < op->nrof) 1493 if (i < op->nrof)
1644 { 1494 {
1645 sub_weight (op->env, op->weight * i); 1495 sub_weight (op->env, op->weight * i);
1646 op->nrof -= i; 1496 op->nrof -= i;
1647 if (tmp) 1497 if (tmp)
1648 {
1649 esrv_send_item (tmp, op); 1498 esrv_send_item (tmp, op);
1650 }
1651 } 1499 }
1652 else 1500 else
1653 { 1501 {
1654 op->remove (); 1502 op->remove ();
1655 op->nrof = 0; 1503 op->nrof = 0;
1656 if (tmp) 1504 if (tmp)
1657 {
1658 esrv_del_item (tmp->contr, op->count); 1505 esrv_del_item (tmp->contr, op->count);
1659 }
1660 } 1506 }
1661 } 1507 }
1662 else 1508 else
1663 { 1509 {
1664 object *above = op->above; 1510 object *above = op->above;
… …
1670 op->remove (); 1516 op->remove ();
1671 op->nrof = 0; 1517 op->nrof = 0;
1672 } 1518 }
1673 1519
1674 /* Since we just removed op, op->above is null */ 1520 /* Since we just removed op, op->above is null */
1675 for (tmp = above; tmp != NULL; tmp = tmp->above) 1521 for (tmp = above; tmp; tmp = tmp->above)
1676 if (tmp->type == PLAYER) 1522 if (tmp->type == PLAYER)
1677 { 1523 {
1678 if (op->nrof) 1524 if (op->nrof)
1679 esrv_send_item (tmp, op); 1525 esrv_send_item (tmp, op);
1680 else 1526 else
… …
1685 if (op->nrof) 1531 if (op->nrof)
1686 return op; 1532 return op;
1687 else 1533 else
1688 { 1534 {
1689 op->destroy (); 1535 op->destroy ();
1690 return NULL; 1536 return 0;
1691 } 1537 }
1692} 1538}
1693 1539
1694/* 1540/*
1695 * add_weight(object, weight) adds the specified weight to an object, 1541 * add_weight(object, weight) adds the specified weight to an object,
… …
1783 add_weight (this, op->weight * op->nrof); 1629 add_weight (this, op->weight * op->nrof);
1784 } 1630 }
1785 else 1631 else
1786 add_weight (this, (op->weight + op->carrying)); 1632 add_weight (this, (op->weight + op->carrying));
1787 1633
1788 otmp = is_player_inv (this); 1634 otmp = this->in_player ();
1789 if (otmp && otmp->contr) 1635 if (otmp && otmp->contr)
1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1636 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1791 fix_player (otmp); 1637 otmp->update_stats ();
1792 1638
1793 op->map = NULL; 1639 op->map = 0;
1794 op->env = this; 1640 op->env = this;
1795 op->above = NULL; 1641 op->above = 0;
1796 op->below = NULL; 1642 op->below = 0;
1797 op->x = 0, op->y = 0; 1643 op->x = 0, op->y = 0;
1798 1644
1799 /* reset the light list and los of the players on the map */ 1645 /* reset the light list and los of the players on the map */
1800 if ((op->glow_radius != 0) && map) 1646 if ((op->glow_radius != 0) && map)
1801 { 1647 {
1802#ifdef DEBUG_LIGHTS 1648#ifdef DEBUG_LIGHTS
1803 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1649 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1804#endif /* DEBUG_LIGHTS */ 1650#endif /* DEBUG_LIGHTS */
1805 if (MAP_DARKNESS (map)) 1651 if (map->darkness)
1806 update_all_los (map, x, y); 1652 update_all_los (map, x, y);
1807 } 1653 }
1808 1654
1809 /* Client has no idea of ordering so lets not bother ordering it here. 1655 /* Client has no idea of ordering so lets not bother ordering it here.
1810 * It sure simplifies this function... 1656 * It sure simplifies this function...
… …
1815 { 1661 {
1816 op->below = inv; 1662 op->below = inv;
1817 op->below->above = op; 1663 op->below->above = op;
1818 inv = op; 1664 inv = op;
1819 } 1665 }
1666
1667 INVOKE_OBJECT (INSERT, this);
1820 1668
1821 return op; 1669 return op;
1822} 1670}
1823 1671
1824/* 1672/*
… …
1839 * 1687 *
1840 * MSW 2001-07-08: Check all objects on space, not just those below 1688 * MSW 2001-07-08: Check all objects on space, not just those below
1841 * object being inserted. insert_ob_in_map may not put new objects 1689 * object being inserted. insert_ob_in_map may not put new objects
1842 * on top. 1690 * on top.
1843 */ 1691 */
1844
1845int 1692int
1846check_move_on (object *op, object *originator) 1693check_move_on (object *op, object *originator)
1847{ 1694{
1848 object *tmp; 1695 object *tmp;
1849 maptile *m = op->map; 1696 maptile *m = op->map;
… …
1876 1723
1877 /* The objects have to be checked from top to bottom. 1724 /* The objects have to be checked from top to bottom.
1878 * Hence, we first go to the top: 1725 * Hence, we first go to the top:
1879 */ 1726 */
1880 1727
1881 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1728 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1882 { 1729 {
1883 /* Trim the search when we find the first other spell effect 1730 /* Trim the search when we find the first other spell effect
1884 * this helps performance so that if a space has 50 spell objects, 1731 * this helps performance so that if a space has 50 spell objects,
1885 * we don't need to check all of them. 1732 * we don't need to check all of them.
1886 */ 1733 */
… …
1904 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1751 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1905 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1752 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1906 { 1753 {
1907 1754
1908 float 1755 float
1909 diff = tmp->move_slow_penalty * FABS (op->speed); 1756 diff = tmp->move_slow_penalty * fabs (op->speed);
1910 1757
1911 if (op->type == PLAYER) 1758 if (op->type == PLAYER)
1912 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1759 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1913 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1760 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1914 diff /= 4.0; 1761 diff /= 4.0;
… …
1941/* 1788/*
1942 * present_arch(arch, map, x, y) searches for any objects with 1789 * present_arch(arch, map, x, y) searches for any objects with
1943 * a matching archetype at the given map and coordinates. 1790 * a matching archetype at the given map and coordinates.
1944 * The first matching object is returned, or NULL if none. 1791 * The first matching object is returned, or NULL if none.
1945 */ 1792 */
1946
1947object * 1793object *
1948present_arch (const archetype *at, maptile *m, int x, int y) 1794present_arch (const archetype *at, maptile *m, int x, int y)
1949{ 1795{
1950 object *
1951 tmp;
1952
1953 if (m == NULL || out_of_map (m, x, y)) 1796 if (!m || out_of_map (m, x, y))
1954 { 1797 {
1955 LOG (llevError, "Present_arch called outside map.\n"); 1798 LOG (llevError, "Present_arch called outside map.\n");
1956 return NULL; 1799 return NULL;
1957 } 1800 }
1958 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1801
1802 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1959 if (tmp->arch == at) 1803 if (tmp->arch == at)
1960 return tmp; 1804 return tmp;
1805
1961 return NULL; 1806 return NULL;
1962} 1807}
1963 1808
1964/* 1809/*
1965 * present(type, map, x, y) searches for any objects with 1810 * present(type, map, x, y) searches for any objects with
1966 * a matching type variable at the given map and coordinates. 1811 * a matching type variable at the given map and coordinates.
1967 * The first matching object is returned, or NULL if none. 1812 * The first matching object is returned, or NULL if none.
1968 */ 1813 */
1969
1970object * 1814object *
1971present (unsigned char type, maptile *m, int x, int y) 1815present (unsigned char type, maptile *m, int x, int y)
1972{ 1816{
1973 object *
1974 tmp;
1975
1976 if (out_of_map (m, x, y)) 1817 if (out_of_map (m, x, y))
1977 { 1818 {
1978 LOG (llevError, "Present called outside map.\n"); 1819 LOG (llevError, "Present called outside map.\n");
1979 return NULL; 1820 return NULL;
1980 } 1821 }
1981 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1822
1823 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1982 if (tmp->type == type) 1824 if (tmp->type == type)
1983 return tmp; 1825 return tmp;
1826
1984 return NULL; 1827 return NULL;
1985} 1828}
1986 1829
1987/* 1830/*
1988 * present_in_ob(type, object) searches for any objects with 1831 * present_in_ob(type, object) searches for any objects with
1989 * a matching type variable in the inventory of the given object. 1832 * a matching type variable in the inventory of the given object.
1990 * The first matching object is returned, or NULL if none. 1833 * The first matching object is returned, or NULL if none.
1991 */ 1834 */
1992
1993object * 1835object *
1994present_in_ob (unsigned char type, const object *op) 1836present_in_ob (unsigned char type, const object *op)
1995{ 1837{
1996 object *
1997 tmp;
1998
1999 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1838 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2000 if (tmp->type == type) 1839 if (tmp->type == type)
2001 return tmp; 1840 return tmp;
1841
2002 return NULL; 1842 return NULL;
2003} 1843}
2004 1844
2005/* 1845/*
2006 * present_in_ob (type, str, object) searches for any objects with 1846 * present_in_ob (type, str, object) searches for any objects with
… …
2014 * str is the string to match against. Note that we match against 1854 * str is the string to match against. Note that we match against
2015 * the object name, not the archetype name. this is so that the 1855 * the object name, not the archetype name. this is so that the
2016 * spell code can use one object type (force), but change it's name 1856 * spell code can use one object type (force), but change it's name
2017 * to be unique. 1857 * to be unique.
2018 */ 1858 */
2019
2020object * 1859object *
2021present_in_ob_by_name (int type, const char *str, const object *op) 1860present_in_ob_by_name (int type, const char *str, const object *op)
2022{ 1861{
2023 object *
2024 tmp;
2025
2026 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1862 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2027 {
2028 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1863 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2029 return tmp; 1864 return tmp;
2030 } 1865
2031 return NULL; 1866 return 0;
2032} 1867}
2033 1868
2034/* 1869/*
2035 * present_arch_in_ob(archetype, object) searches for any objects with 1870 * present_arch_in_ob(archetype, object) searches for any objects with
2036 * a matching archetype in the inventory of the given object. 1871 * a matching archetype in the inventory of the given object.
2037 * The first matching object is returned, or NULL if none. 1872 * The first matching object is returned, or NULL if none.
2038 */ 1873 */
2039
2040object * 1874object *
2041present_arch_in_ob (const archetype *at, const object *op) 1875present_arch_in_ob (const archetype *at, const object *op)
2042{ 1876{
2043 object *
2044 tmp;
2045
2046 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1877 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047 if (tmp->arch == at) 1878 if (tmp->arch == at)
2048 return tmp; 1879 return tmp;
1880
2049 return NULL; 1881 return NULL;
2050} 1882}
2051 1883
2052/* 1884/*
2053 * activate recursively a flag on an object inventory 1885 * activate recursively a flag on an object inventory
2054 */ 1886 */
2055void 1887void
2056flag_inv (object *op, int flag) 1888flag_inv (object *op, int flag)
2057{ 1889{
2058 object *
2059 tmp;
2060
2061 if (op->inv) 1890 if (op->inv)
2062 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1891 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063 { 1892 {
2064 SET_FLAG (tmp, flag); 1893 SET_FLAG (tmp, flag);
2065 flag_inv (tmp, flag); 1894 flag_inv (tmp, flag);
2066 } 1895 }
2067} /* 1896}
1897
1898/*
2068 * desactivate recursively a flag on an object inventory 1899 * deactivate recursively a flag on an object inventory
2069 */ 1900 */
2070void 1901void
2071unflag_inv (object *op, int flag) 1902unflag_inv (object *op, int flag)
2072{ 1903{
2073 object *
2074 tmp;
2075
2076 if (op->inv) 1904 if (op->inv)
2077 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1905 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2078 { 1906 {
2079 CLEAR_FLAG (tmp, flag); 1907 CLEAR_FLAG (tmp, flag);
2080 unflag_inv (tmp, flag); 1908 unflag_inv (tmp, flag);
2081 } 1909 }
2082} 1910}
… …
2085 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1913 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2086 * all it's inventory (recursively). 1914 * all it's inventory (recursively).
2087 * If checksums are used, a player will get set_cheat called for 1915 * If checksums are used, a player will get set_cheat called for
2088 * him/her-self and all object carried by a call to this function. 1916 * him/her-self and all object carried by a call to this function.
2089 */ 1917 */
2090
2091void 1918void
2092set_cheat (object *op) 1919set_cheat (object *op)
2093{ 1920{
2094 SET_FLAG (op, FLAG_WAS_WIZ); 1921 SET_FLAG (op, FLAG_WAS_WIZ);
2095 flag_inv (op, FLAG_WAS_WIZ); 1922 flag_inv (op, FLAG_WAS_WIZ);
… …
2114 * because arch_blocked (now ob_blocked) needs to know the movement type 1941 * because arch_blocked (now ob_blocked) needs to know the movement type
2115 * to know if the space in question will block the object. We can't use 1942 * to know if the space in question will block the object. We can't use
2116 * the archetype because that isn't correct if the monster has been 1943 * the archetype because that isn't correct if the monster has been
2117 * customized, changed states, etc. 1944 * customized, changed states, etc.
2118 */ 1945 */
2119
2120int 1946int
2121find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1947find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2122{ 1948{
2123 int
2124 i,
2125 index = 0, flag; 1949 int index = 0, flag;
2126 static int
2127 altern[SIZEOFFREE]; 1950 int altern[SIZEOFFREE];
2128 1951
2129 for (i = start; i < stop; i++) 1952 for (int i = start; i < stop; i++)
2130 { 1953 {
2131 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1954 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2132 if (!flag) 1955 if (!flag)
2133 altern[index++] = i; 1956 altern [index++] = i;
2134 1957
2135 /* Basically, if we find a wall on a space, we cut down the search size. 1958 /* Basically, if we find a wall on a space, we cut down the search size.
2136 * In this way, we won't return spaces that are on another side of a wall. 1959 * In this way, we won't return spaces that are on another side of a wall.
2137 * This mostly work, but it cuts down the search size in all directions - 1960 * This mostly work, but it cuts down the search size in all directions -
2138 * if the space being examined only has a wall to the north and empty 1961 * if the space being examined only has a wall to the north and empty
2139 * spaces in all the other directions, this will reduce the search space 1962 * spaces in all the other directions, this will reduce the search space
2140 * to only the spaces immediately surrounding the target area, and 1963 * to only the spaces immediately surrounding the target area, and
2141 * won't look 2 spaces south of the target space. 1964 * won't look 2 spaces south of the target space.
2142 */ 1965 */
2143 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 1966 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2144 stop = maxfree[i]; 1967 stop = maxfree[i];
2145 } 1968 }
1969
2146 if (!index) 1970 if (!index)
2147 return -1; 1971 return -1;
1972
2148 return altern[RANDOM () % index]; 1973 return altern[RANDOM () % index];
2149} 1974}
2150 1975
2151/* 1976/*
2152 * find_first_free_spot(archetype, maptile, x, y) works like 1977 * find_first_free_spot(archetype, maptile, x, y) works like
2153 * find_free_spot(), but it will search max number of squares. 1978 * find_free_spot(), but it will search max number of squares.
2154 * But it will return the first available spot, not a random choice. 1979 * But it will return the first available spot, not a random choice.
2155 * Changed 0.93.2: Have it return -1 if there is no free spot available. 1980 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2156 */ 1981 */
2157
2158int 1982int
2159find_first_free_spot (const object *ob, maptile *m, int x, int y) 1983find_first_free_spot (const object *ob, maptile *m, int x, int y)
2160{ 1984{
2161 int
2162 i;
2163
2164 for (i = 0; i < SIZEOFFREE; i++) 1985 for (int i = 0; i < SIZEOFFREE; i++)
2165 {
2166 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1986 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2167 return i; 1987 return i;
2168 } 1988
2169 return -1; 1989 return -1;
2170} 1990}
2171 1991
2172/* 1992/*
2173 * The function permute(arr, begin, end) randomly reorders the array 1993 * The function permute(arr, begin, end) randomly reorders the array
2174 * arr[begin..end-1]. 1994 * arr[begin..end-1].
1995 * now uses a fisher-yates shuffle, old permute was broken
2175 */ 1996 */
2176static void 1997static void
2177permute (int *arr, int begin, int end) 1998permute (int *arr, int begin, int end)
2178{ 1999{
2179 int 2000 arr += begin;
2180 i,
2181 j,
2182 tmp,
2183 len;
2184
2185 len = end - begin; 2001 end -= begin;
2186 for (i = begin; i < end; i++)
2187 {
2188 j = begin + RANDOM () % len;
2189 2002
2190 tmp = arr[i]; 2003 while (--end)
2191 arr[i] = arr[j]; 2004 swap (arr [end], arr [RANDOM () % (end + 1)]);
2192 arr[j] = tmp;
2193 }
2194} 2005}
2195 2006
2196/* new function to make monster searching more efficient, and effective! 2007/* new function to make monster searching more efficient, and effective!
2197 * This basically returns a randomized array (in the passed pointer) of 2008 * This basically returns a randomized array (in the passed pointer) of
2198 * the spaces to find monsters. In this way, it won't always look for 2009 * the spaces to find monsters. In this way, it won't always look for
… …
2201 * the 3x3 area will be searched, just not in a predictable order. 2012 * the 3x3 area will be searched, just not in a predictable order.
2202 */ 2013 */
2203void 2014void
2204get_search_arr (int *search_arr) 2015get_search_arr (int *search_arr)
2205{ 2016{
2206 int 2017 int i;
2207 i;
2208 2018
2209 for (i = 0; i < SIZEOFFREE; i++) 2019 for (i = 0; i < SIZEOFFREE; i++)
2210 {
2211 search_arr[i] = i; 2020 search_arr[i] = i;
2212 }
2213 2021
2214 permute (search_arr, 1, SIZEOFFREE1 + 1); 2022 permute (search_arr, 1, SIZEOFFREE1 + 1);
2215 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2023 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2216 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2024 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2217} 2025}
… …
2226 * Perhaps incorrectly, but I'm making the assumption that exclude 2034 * Perhaps incorrectly, but I'm making the assumption that exclude
2227 * is actually want is going to try and move there. We need this info 2035 * is actually want is going to try and move there. We need this info
2228 * because we have to know what movement the thing looking to move 2036 * because we have to know what movement the thing looking to move
2229 * there is capable of. 2037 * there is capable of.
2230 */ 2038 */
2231
2232int 2039int
2233find_dir (maptile *m, int x, int y, object *exclude) 2040find_dir (maptile *m, int x, int y, object *exclude)
2234{ 2041{
2235 int
2236 i,
2237 max = SIZEOFFREE, mflags; 2042 int i, max = SIZEOFFREE, mflags;
2238 2043
2239 sint16 nx, ny; 2044 sint16 nx, ny;
2240 object * 2045 object *tmp;
2241 tmp;
2242 maptile * 2046 maptile *mp;
2243 mp;
2244 2047
2245 MoveType blocked, move_type; 2048 MoveType blocked, move_type;
2246 2049
2247 if (exclude && exclude->head) 2050 if (exclude && exclude->head)
2248 { 2051 {
… …
2260 mp = m; 2063 mp = m;
2261 nx = x + freearr_x[i]; 2064 nx = x + freearr_x[i];
2262 ny = y + freearr_y[i]; 2065 ny = y + freearr_y[i];
2263 2066
2264 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2067 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2068
2265 if (mflags & P_OUT_OF_MAP) 2069 if (mflags & P_OUT_OF_MAP)
2266 {
2267 max = maxfree[i]; 2070 max = maxfree[i];
2268 }
2269 else 2071 else
2270 { 2072 {
2271 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2073 mapspace &ms = mp->at (nx, ny);
2074
2075 blocked = ms.move_block;
2272 2076
2273 if ((move_type & blocked) == move_type) 2077 if ((move_type & blocked) == move_type)
2274 {
2275 max = maxfree[i]; 2078 max = maxfree[i];
2276 }
2277 else if (mflags & P_IS_ALIVE) 2079 else if (mflags & P_IS_ALIVE)
2278 { 2080 {
2279 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2081 for (tmp = ms.bot; tmp; tmp = tmp->above)
2280 { 2082 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2281 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2083 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2282 {
2283 break; 2084 break;
2284 } 2085
2285 }
2286 if (tmp) 2086 if (tmp)
2287 {
2288 return freedir[i]; 2087 return freedir[i];
2289 }
2290 } 2088 }
2291 } 2089 }
2292 } 2090 }
2091
2293 return 0; 2092 return 0;
2294} 2093}
2295 2094
2296/* 2095/*
2297 * distance(object 1, object 2) will return the square of the 2096 * distance(object 1, object 2) will return the square of the
2298 * distance between the two given objects. 2097 * distance between the two given objects.
2299 */ 2098 */
2300
2301int 2099int
2302distance (const object *ob1, const object *ob2) 2100distance (const object *ob1, const object *ob2)
2303{ 2101{
2304 int
2305 i;
2306
2307 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2102 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2308 return i;
2309} 2103}
2310 2104
2311/* 2105/*
2312 * find_dir_2(delta-x,delta-y) will return a direction in which 2106 * find_dir_2(delta-x,delta-y) will return a direction in which
2313 * an object which has subtracted the x and y coordinates of another 2107 * an object which has subtracted the x and y coordinates of another
2314 * object, needs to travel toward it. 2108 * object, needs to travel toward it.
2315 */ 2109 */
2316
2317int 2110int
2318find_dir_2 (int x, int y) 2111find_dir_2 (int x, int y)
2319{ 2112{
2320 int 2113 int q;
2321 q;
2322 2114
2323 if (y) 2115 if (y)
2324 q = x * 100 / y; 2116 q = x * 100 / y;
2325 else if (x) 2117 else if (x)
2326 q = -300 * x; 2118 q = -300 * x;
… …
2351 2143
2352 return 3; 2144 return 3;
2353} 2145}
2354 2146
2355/* 2147/*
2356 * absdir(int): Returns a number between 1 and 8, which represent
2357 * the "absolute" direction of a number (it actually takes care of
2358 * "overflow" in previous calculations of a direction).
2359 */
2360
2361int
2362absdir (int d)
2363{
2364 while (d < 1)
2365 d += 8;
2366 while (d > 8)
2367 d -= 8;
2368 return d;
2369}
2370
2371/*
2372 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2148 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2373 * between two directions (which are expected to be absolute (see absdir()) 2149 * between two directions (which are expected to be absolute (see absdir())
2374 */ 2150 */
2375
2376int 2151int
2377dirdiff (int dir1, int dir2) 2152dirdiff (int dir1, int dir2)
2378{ 2153{
2379 int 2154 int d;
2380 d;
2381 2155
2382 d = abs (dir1 - dir2); 2156 d = abs (dir1 - dir2);
2383 if (d > 4) 2157 if (d > 4)
2384 d = 8 - d; 2158 d = 8 - d;
2159
2385 return d; 2160 return d;
2386} 2161}
2387 2162
2388/* peterm: 2163/* peterm:
2389 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2164 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2392 * This basically means that if direction is 15, then it could either go 2167 * This basically means that if direction is 15, then it could either go
2393 * direction 4, 14, or 16 to get back to where we are. 2168 * direction 4, 14, or 16 to get back to where we are.
2394 * Moved from spell_util.c to object.c with the other related direction 2169 * Moved from spell_util.c to object.c with the other related direction
2395 * functions. 2170 * functions.
2396 */ 2171 */
2397
2398int
2399 reduction_dir[SIZEOFFREE][3] = { 2172int reduction_dir[SIZEOFFREE][3] = {
2400 {0, 0, 0}, /* 0 */ 2173 {0, 0, 0}, /* 0 */
2401 {0, 0, 0}, /* 1 */ 2174 {0, 0, 0}, /* 1 */
2402 {0, 0, 0}, /* 2 */ 2175 {0, 0, 0}, /* 2 */
2403 {0, 0, 0}, /* 3 */ 2176 {0, 0, 0}, /* 3 */
2404 {0, 0, 0}, /* 4 */ 2177 {0, 0, 0}, /* 4 */
… …
2452 * find a path to that monster that we found. If not, 2225 * find a path to that monster that we found. If not,
2453 * we don't bother going toward it. Returns 1 if we 2226 * we don't bother going toward it. Returns 1 if we
2454 * can see a direct way to get it 2227 * can see a direct way to get it
2455 * Modified to be map tile aware -.MSW 2228 * Modified to be map tile aware -.MSW
2456 */ 2229 */
2457
2458
2459int 2230int
2460can_see_monsterP (maptile *m, int x, int y, int dir) 2231can_see_monsterP (maptile *m, int x, int y, int dir)
2461{ 2232{
2462 sint16 dx, dy; 2233 sint16 dx, dy;
2463 int
2464 mflags; 2234 int mflags;
2465 2235
2466 if (dir < 0) 2236 if (dir < 0)
2467 return 0; /* exit condition: invalid direction */ 2237 return 0; /* exit condition: invalid direction */
2468 2238
2469 dx = x + freearr_x[dir]; 2239 dx = x + freearr_x[dir];
… …
2482 return 0; 2252 return 0;
2483 2253
2484 /* yes, can see. */ 2254 /* yes, can see. */
2485 if (dir < 9) 2255 if (dir < 9)
2486 return 1; 2256 return 1;
2257
2487 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2258 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2488 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2259 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2260 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2489} 2261}
2490
2491
2492 2262
2493/* 2263/*
2494 * can_pick(picker, item): finds out if an object is possible to be 2264 * can_pick(picker, item): finds out if an object is possible to be
2495 * picked up by the picker. Returnes 1 if it can be 2265 * picked up by the picker. Returnes 1 if it can be
2496 * picked up, otherwise 0. 2266 * picked up, otherwise 0.
… …
2507 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2277 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2508 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2278 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2509 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2279 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2510} 2280}
2511 2281
2512
2513/* 2282/*
2514 * create clone from object to another 2283 * create clone from object to another
2515 */ 2284 */
2516object * 2285object *
2517object_create_clone (object *asrc) 2286object_create_clone (object *asrc)
… …
2536 { 2305 {
2537 dst = tmp; 2306 dst = tmp;
2538 tmp->head = 0; 2307 tmp->head = 0;
2539 } 2308 }
2540 else 2309 else
2541 {
2542 tmp->head = dst; 2310 tmp->head = dst;
2543 }
2544 2311
2545 tmp->more = 0; 2312 tmp->more = 0;
2546 2313
2547 if (prev) 2314 if (prev)
2548 prev->more = tmp; 2315 prev->more = tmp;
… …
2560/* Basically, we save the content of the string to a temp file, then call */ 2327/* Basically, we save the content of the string to a temp file, then call */
2561/* load_object on it. I admit it is a highly inefficient way to make things, */ 2328/* load_object on it. I admit it is a highly inefficient way to make things, */
2562/* but it was simple to make and allows reusing the load_object function. */ 2329/* but it was simple to make and allows reusing the load_object function. */
2563/* Remember not to use load_object_str in a time-critical situation. */ 2330/* Remember not to use load_object_str in a time-critical situation. */
2564/* Also remember that multiparts objects are not supported for now. */ 2331/* Also remember that multiparts objects are not supported for now. */
2565
2566object * 2332object *
2567load_object_str (const char *obstr) 2333load_object_str (const char *obstr)
2568{ 2334{
2569 object *op; 2335 object *op;
2570 char filename[MAX_BUF]; 2336 char filename[MAX_BUF];
… …
2600 * returns NULL if no match. 2366 * returns NULL if no match.
2601 */ 2367 */
2602object * 2368object *
2603find_obj_by_type_subtype (const object *who, int type, int subtype) 2369find_obj_by_type_subtype (const object *who, int type, int subtype)
2604{ 2370{
2605 object *tmp;
2606
2607 for (tmp = who->inv; tmp; tmp = tmp->below) 2371 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2608 if (tmp->type == type && tmp->subtype == subtype) 2372 if (tmp->type == type && tmp->subtype == subtype)
2609 return tmp; 2373 return tmp;
2610 2374
2611 return NULL; 2375 return 0;
2612} 2376}
2613 2377
2614/* If ob has a field named key, return the link from the list, 2378/* If ob has a field named key, return the link from the list,
2615 * otherwise return NULL. 2379 * otherwise return NULL.
2616 * 2380 *
… …
2618 * do the desired thing. 2382 * do the desired thing.
2619 */ 2383 */
2620key_value * 2384key_value *
2621get_ob_key_link (const object *ob, const char *key) 2385get_ob_key_link (const object *ob, const char *key)
2622{ 2386{
2623 key_value *link;
2624
2625 for (link = ob->key_values; link != NULL; link = link->next) 2387 for (key_value *link = ob->key_values; link; link = link->next)
2626 if (link->key == key) 2388 if (link->key == key)
2627 return link; 2389 return link;
2628 2390
2629 return NULL; 2391 return 0;
2630} 2392}
2631 2393
2632/* 2394/*
2633 * Returns the value of op has an extra_field for key, or NULL. 2395 * Returns the value of op has an extra_field for key, or NULL.
2634 * 2396 *
… …
2674 * Returns TRUE on success. 2436 * Returns TRUE on success.
2675 */ 2437 */
2676int 2438int
2677set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2439set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2678{ 2440{
2679 key_value *
2680 field = NULL, *last = NULL; 2441 key_value *field = NULL, *last = NULL;
2681 2442
2682 for (field = op->key_values; field != NULL; field = field->next) 2443 for (field = op->key_values; field != NULL; field = field->next)
2683 { 2444 {
2684 if (field->key != canonical_key) 2445 if (field->key != canonical_key)
2685 { 2446 {
… …
2713 /* IF we get here, key doesn't exist */ 2474 /* IF we get here, key doesn't exist */
2714 2475
2715 /* No field, we'll have to add it. */ 2476 /* No field, we'll have to add it. */
2716 2477
2717 if (!add_key) 2478 if (!add_key)
2718 {
2719 return FALSE; 2479 return FALSE;
2720 } 2480
2721 /* There isn't any good reason to store a null 2481 /* There isn't any good reason to store a null
2722 * value in the key/value list. If the archetype has 2482 * value in the key/value list. If the archetype has
2723 * this key, then we should also have it, so shouldn't 2483 * this key, then we should also have it, so shouldn't
2724 * be here. If user wants to store empty strings, 2484 * be here. If user wants to store empty strings,
2725 * should pass in "" 2485 * should pass in ""
… …
2774 } 2534 }
2775 else 2535 else
2776 item = item->env; 2536 item = item->env;
2777} 2537}
2778 2538
2539
2540const char *
2541object::flag_desc (char *desc, int len) const
2542{
2543 char *p = desc;
2544 bool first = true;
2545
2546 *p = 0;
2547
2548 for (int i = 0; i < NUM_FLAGS; i++)
2549 {
2550 if (len <= 10) // magic constant!
2551 {
2552 snprintf (p, len, ",...");
2553 break;
2554 }
2555
2556 if (flag [i])
2557 {
2558 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2559 len -= cnt;
2560 p += cnt;
2561 first = false;
2562 }
2563 }
2564
2565 return desc;
2566}
2567
2779// return a suitable string describing an objetc in enough detail to find it 2568// return a suitable string describing an object in enough detail to find it
2780const char * 2569const char *
2781object::debug_desc (char *info) const 2570object::debug_desc (char *info) const
2782{ 2571{
2572 char flagdesc[512];
2783 char info2[256 * 3]; 2573 char info2[256 * 4];
2784 char *p = info; 2574 char *p = info;
2785 2575
2786 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2576 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2787 count, 2577 count, uuid.seq,
2788 &name, 2578 &name,
2789 title ? " " : "", 2579 title ? "\",title:\"" : "",
2790 title ? (const char *)title : ""); 2580 title ? (const char *)title : "",
2581 flag_desc (flagdesc, 512), type);
2791 2582
2792 if (env) 2583 if (env)
2793 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2584 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2794 2585
2795 if (map) 2586 if (map)
2796 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2587 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2797 2588
2798 return info; 2589 return info;
2799} 2590}
2800 2591
2801const char * 2592const char *
2802object::debug_desc () const 2593object::debug_desc () const
2803{ 2594{
2804 static char info[256 * 3]; 2595 static char info[256 * 4];
2805 return debug_desc (info); 2596 return debug_desc (info);
2806} 2597}
2807 2598
2599const char *
2600object::debug_desc2 () const
2601{
2602 static char info[256 * 4];
2603 return debug_desc (info);
2604}
2605

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines