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

Diff Legend

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