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.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC vs.
Revision 1.95 by root, Wed Dec 27 05:42:08 2006 UTC

… …
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <loader.h> 33#include <loader.h>
34
35#include <bitset>
34 36
35int nrofallocobjects = 0; 37int nrofallocobjects = 0;
36static UUID uuid; 38static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
38 40
… …
104 _exit (1); 106 _exit (1);
105 } 107 }
106 108
107 uuid.seq = uid; 109 uuid.seq = uid;
108 write_uuid (); 110 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 112 fclose (fp);
111} 113}
112 114
113UUID 115UUID
114gen_uuid () 116gen_uuid ()
… …
139 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
140 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
141 */ 143 */
142 144
143 /* For each field in wants, */ 145 /* For each field in wants, */
144 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145 { 147 {
146 key_value *has_field; 148 key_value *has_field;
147 149
148 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
149 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
183 * 185 *
184 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
187 * 189 *
188 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
189 * 191 *
190 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
191 * check weight 193 * check weight
192 */ 194 */
193 195
194bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
195{ 197{
196 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
198 return 0; 204 return 0;
199 205
200 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 209 * used to store nrof).
206 */ 210 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 222
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 225
222 226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 251 return 0;
254 252
255 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 254 * check all objects in the inventory.
257 */ 255 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 260 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 264 return 0;
267 265
268 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 267 * if it is valid.
270 */ 268 */
… …
354 op = op->env; 352 op = op->env;
355 return op; 353 return op;
356} 354}
357 355
358/* 356/*
359 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
360 * a better check. We basically keeping traversing up until we can't
361 * or find a player.
362 */
363
364object *
365is_player_inv (object *op)
366{
367 for (; op != NULL && op->type != PLAYER; op = op->env)
368 if (op->env == op)
369 op->env = NULL;
370 return op;
371}
372
373/*
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 358 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array. 359 * The result of the dump is stored in the static global errmsg array.
377 */ 360 */
378 361
… …
381{ 364{
382 if (!op) 365 if (!op)
383 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
384 367
385 object_freezer freezer; 368 object_freezer freezer;
386 save_object (freezer, op, 3); 369 save_object (freezer, op, 1);
387 return freezer.as_string (); 370 return freezer.as_string ();
388} 371}
389 372
390/* 373/*
391 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
… …
484 } 467 }
485 468
486 op->key_values = 0; 469 op->key_values = 0;
487} 470}
488 471
489void object::clear ()
490{
491 attachable_base::clear ();
492
493 free_key_values (this);
494
495 owner = 0;
496 name = 0;
497 name_pl = 0;
498 title = 0;
499 race = 0;
500 slaying = 0;
501 skill = 0;
502 msg = 0;
503 lore = 0;
504 custom_name = 0;
505 materialname = 0;
506 contr = 0;
507 below = 0;
508 above = 0;
509 inv = 0;
510 container = 0;
511 env = 0;
512 more = 0;
513 head = 0;
514 map = 0;
515 active_next = 0;
516 active_prev = 0;
517
518 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520 SET_FLAG (this, FLAG_REMOVED);
521
522 /* What is not cleared is next, prev, and count */
523
524 expmul = 1.0;
525 face = blank_face;
526
527 if (settings.casting_time)
528 casting_time = -1;
529}
530
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 472/*
541 * copy object first frees everything allocated by the second object, 473 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 474 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 477 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 478 * will point at garbage.
547 */ 479 */
548void 480void
549copy_object (object *op2, object *op) 481object::copy_to (object *dst)
550{ 482{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 485
554 op2->clone (op); 486 *(object_copy *)dst = *this;
555 487
556 if (is_freed) 488 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
490
558 if (is_removed) 491 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 492 SET_FLAG (dst, FLAG_REMOVED);
560 493
561 if (op2->speed < 0) 494 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 496
564 /* Copy over key_values, if any. */ 497 /* Copy over key_values, if any. */
565 if (op2->key_values) 498 if (key_values)
566 { 499 {
567 key_value *tail = 0; 500 key_value *tail = 0;
568 key_value *i; 501 key_value *i;
569 502
570 op->key_values = 0; 503 dst->key_values = 0;
571 504
572 for (i = op2->key_values; i; i = i->next) 505 for (i = key_values; i; i = i->next)
573 { 506 {
574 key_value *new_link = new key_value; 507 key_value *new_link = new key_value;
575 508
576 new_link->next = 0; 509 new_link->next = 0;
577 new_link->key = i->key; 510 new_link->key = i->key;
578 new_link->value = i->value; 511 new_link->value = i->value;
579 512
580 /* Try and be clever here, too. */ 513 /* Try and be clever here, too. */
581 if (!op->key_values) 514 if (!dst->key_values)
582 { 515 {
583 op->key_values = new_link; 516 dst->key_values = new_link;
584 tail = new_link; 517 tail = new_link;
585 } 518 }
586 else 519 else
587 { 520 {
588 tail->next = new_link; 521 tail->next = new_link;
589 tail = new_link; 522 tail = new_link;
590 } 523 }
591 } 524 }
592 } 525 }
593 526
594 update_ob_speed (op); 527 dst->set_speed (dst->speed);
528}
529
530object *
531object::clone ()
532{
533 object *neu = create ();
534 copy_to (neu);
535 return neu;
595} 536}
596 537
597/* 538/*
598 * If an object with the IS_TURNABLE() flag needs to be turned due 539 * If an object with the IS_TURNABLE() flag needs to be turned due
599 * to the closest player being on the other side, this function can 540 * to the closest player being on the other side, this function can
… …
613 * Updates the speed of an object. If the speed changes from 0 to another 554 * Updates the speed of an object. If the speed changes from 0 to another
614 * value, or vice versa, then add/remove the object from the active list. 555 * value, or vice versa, then add/remove the object from the active list.
615 * This function needs to be called whenever the speed of an object changes. 556 * This function needs to be called whenever the speed of an object changes.
616 */ 557 */
617void 558void
618update_ob_speed (object *op) 559object::set_speed (float speed)
619{ 560{
620 extern int arch_init; 561 extern int arch_init;
621 562
622 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
623 * since they never really need to be updated. 564 * since they never really need to be updated.
624 */ 565 */
625 566 if (flag [FLAG_FREED] && speed)
626 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
627 { 567 {
628 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &name);
629#ifdef MANY_CORES
630 abort ();
631#else
632 op->speed = 0; 569 speed = 0;
633#endif
634 } 570 }
571
572 this->speed = speed;
635 573
636 if (arch_init) 574 if (arch_init)
637 return; 575 return;
638 576
639 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 577 if (FABS (speed) > MIN_ACTIVE_SPEED)
640 { 578 {
641 /* If already on active list, don't do anything */ 579 /* If already on active list, don't do anything */
642 if (op->active_next || op->active_prev || op == active_objects) 580 if (active_next || active_prev || this == active_objects)
643 return; 581 return;
644 582
645 /* process_events() expects us to insert the object at the beginning 583 /* process_events() expects us to insert the object at the beginning
646 * of the list. */ 584 * of the list. */
647 op->active_next = active_objects; 585 active_next = active_objects;
648 586
649 if (op->active_next != NULL) 587 if (active_next)
650 op->active_next->active_prev = op; 588 active_next->active_prev = this;
651 589
652 active_objects = op; 590 active_objects = this;
653 } 591 }
654 else 592 else
655 { 593 {
656 /* If not on the active list, nothing needs to be done */ 594 /* If not on the active list, nothing needs to be done */
657 if (!op->active_next && !op->active_prev && op != active_objects) 595 if (!active_next && !active_prev && this != active_objects)
658 return; 596 return;
659 597
660 if (op->active_prev == NULL) 598 if (!active_prev)
661 { 599 {
662 active_objects = op->active_next; 600 active_objects = active_next;
663 601
664 if (op->active_next != NULL) 602 if (active_next)
665 op->active_next->active_prev = NULL; 603 active_next->active_prev = 0;
666 } 604 }
667 else 605 else
668 { 606 {
669 op->active_prev->active_next = op->active_next; 607 active_prev->active_next = active_next;
670 608
671 if (op->active_next) 609 if (active_next)
672 op->active_next->active_prev = op->active_prev; 610 active_next->active_prev = active_prev;
673 } 611 }
674 612
675 op->active_next = NULL; 613 active_next = 0;
676 op->active_prev = NULL; 614 active_prev = 0;
677 } 615 }
678} 616}
679 617
680/* This function removes object 'op' from the list of active 618/* This function removes object 'op' from the list of active
681 * objects. 619 * objects.
… …
707 op->active_next = NULL; 645 op->active_next = NULL;
708 op->active_prev = NULL; 646 op->active_prev = NULL;
709} 647}
710 648
711/* 649/*
712 * update_object() updates the array which represents the map. 650 * update_object() updates the the map.
713 * It takes into account invisible objects (and represent squares covered 651 * It takes into account invisible objects (and represent squares covered
714 * by invisible objects by whatever is below them (unless it's another 652 * by invisible objects by whatever is below them (unless it's another
715 * invisible object, etc...) 653 * invisible object, etc...)
716 * If the object being updated is beneath a player, the look-window 654 * If the object being updated is beneath a player, the look-window
717 * of that player is updated (this might be a suboptimal way of 655 * of that player is updated (this might be a suboptimal way of
718 * updating that window, though, since update_object() is called _often_) 656 * updating that window, though, since update_object() is called _often_)
719 * 657 *
720 * action is a hint of what the caller believes need to be done. 658 * action is a hint of what the caller believes need to be done.
721 * For example, if the only thing that has changed is the face (due to
722 * an animation), we don't need to call update_position until that actually
723 * comes into view of a player. OTOH, many other things, like addition/removal
724 * of walls or living creatures may need us to update the flags now.
725 * current action are: 659 * current action are:
726 * UP_OBJ_INSERT: op was inserted 660 * UP_OBJ_INSERT: op was inserted
727 * UP_OBJ_REMOVE: op was removed 661 * UP_OBJ_REMOVE: op was removed
728 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 662 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
729 * as that is easier than trying to look at what may have changed. 663 * as that is easier than trying to look at what may have changed.
730 * UP_OBJ_FACE: only the objects face has changed. 664 * UP_OBJ_FACE: only the objects face has changed.
731 */ 665 */
732
733void 666void
734update_object (object *op, int action) 667update_object (object *op, int action)
735{ 668{
736 int update_now = 0, flags;
737 MoveType move_on, move_off, move_block, move_slow; 669 MoveType move_on, move_off, move_block, move_slow;
738 670
739 if (op == NULL) 671 if (op == NULL)
740 { 672 {
741 /* this should never happen */ 673 /* this should never happen */
742 LOG (llevDebug, "update_object() called for NULL object.\n"); 674 LOG (llevDebug, "update_object() called for NULL object.\n");
743 return; 675 return;
744 } 676 }
745 677
746 if (op->env != NULL) 678 if (op->env)
747 { 679 {
748 /* Animation is currently handled by client, so nothing 680 /* Animation is currently handled by client, so nothing
749 * to do in this case. 681 * to do in this case.
750 */ 682 */
751 return; 683 return;
… …
756 */ 688 */
757 if (!op->map || op->map->in_memory == MAP_SAVING) 689 if (!op->map || op->map->in_memory == MAP_SAVING)
758 return; 690 return;
759 691
760 /* make sure the object is within map boundaries */ 692 /* make sure the object is within map boundaries */
761 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 693 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
762 { 694 {
763 LOG (llevError, "update_object() called for object out of map!\n"); 695 LOG (llevError, "update_object() called for object out of map!\n");
764#ifdef MANY_CORES 696#ifdef MANY_CORES
765 abort (); 697 abort ();
766#endif 698#endif
767 return; 699 return;
768 } 700 }
769 701
770 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 702 mapspace &m = op->ms ();
771 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
772 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
773 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
774 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
775 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
776 703
704 if (m.flags_ & P_NEED_UPDATE)
705 /* nop */;
777 if (action == UP_OBJ_INSERT) 706 else if (action == UP_OBJ_INSERT)
778 { 707 {
708 // this is likely overkill, TODO: revisit (schmorp)
779 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
780 update_now = 1;
781
782 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 710 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783 update_now = 1; 711 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784 712 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
713 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 714 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
786 update_now = 1;
787
788 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
789 update_now = 1;
790
791 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
792 update_now = 1;
793
794 if ((move_on | op->move_on) != move_on) 715 || (m.move_on | op->move_on ) != m.move_on
795 update_now = 1;
796
797 if ((move_off | op->move_off) != move_off) 716 || (m.move_off | op->move_off ) != m.move_off
798 update_now = 1; 717 || (m.move_slow | op->move_slow) != m.move_slow
799
800 /* This isn't perfect, but I don't expect a lot of objects to 718 /* This isn't perfect, but I don't expect a lot of objects to
801 * to have move_allow right now. 719 * to have move_allow right now.
802 */ 720 */
803 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804 update_now = 1; 722 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805 723 m.flags_ = P_NEED_UPDATE;
806 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1;
808 } 724 }
809 /* if the object is being removed, we can't make intelligent 725 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 726 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 727 * that is being removed.
812 */ 728 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814 update_now = 1; 730 m.flags_ = P_NEED_UPDATE;
815 else if (action == UP_OBJ_FACE) 731 else if (action == UP_OBJ_FACE)
816 /* Nothing to do for that case */ ; 732 /* Nothing to do for that case */ ;
817 else 733 else
818 LOG (llevError, "update_object called with invalid action: %d\n", action); 734 LOG (llevError, "update_object called with invalid action: %d\n", action);
819 735
820 if (update_now)
821 {
822 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
823 update_position (op->map, op->x, op->y);
824 }
825
826 if (op->more != NULL) 736 if (op->more)
827 update_object (op->more, action); 737 update_object (op->more, action);
828} 738}
829 739
830object::vector object::mortals;
831object::vector object::objects; // not yet used 740object::vector object::objects; // not yet used
832object *object::first; 741object *object::first;
833
834void object::free_mortals ()
835{
836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
837 if ((*i)->refcnt)
838 ++i; // further delay freeing
839 else
840 {
841 delete *i;
842 mortals.erase (i);
843 }
844}
845 742
846object::object () 743object::object ()
847{ 744{
848 SET_FLAG (this, FLAG_REMOVED); 745 SET_FLAG (this, FLAG_REMOVED);
849 746
… …
881 778
882 prev = 0; 779 prev = 0;
883 next = 0; 780 next = 0;
884} 781}
885 782
783/*
784 * Remove and free all objects in the inventory of the given object.
785 * object.c ?
786 */
787void
788object::destroy_inv (bool drop_to_ground)
789{
790 // need to check first, because the checks below might segfault
791 // as we might be on an invalid mapspace and crossfire code
792 // is too buggy to ensure that the inventory is empty.
793 // corollary: if you create arrows etc. with stuff in tis inventory,
794 // cf will crash below with off-map x and y
795 if (!inv)
796 return;
797
798 /* Only if the space blocks everything do we not process -
799 * if some form of movement is allowed, let objects
800 * drop on that space.
801 */
802 if (!drop_to_ground
803 || !map
804 || map->in_memory != MAP_IN_MEMORY
805 || ms ().move_block == MOVE_ALL)
806 {
807 while (inv)
808 {
809 inv->destroy_inv (drop_to_ground);
810 inv->destroy ();
811 }
812 }
813 else
814 { /* Put objects in inventory onto this space */
815 while (inv)
816 {
817 object *op = inv;
818
819 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE
822 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE])
824 op->destroy ();
825 else
826 map->insert (op, x, y);
827 }
828 }
829}
830
886object *object::create () 831object *object::create ()
887{ 832{
888 object *op = new object; 833 object *op = new object;
889 op->link (); 834 op->link ();
890 return op; 835 return op;
891} 836}
892 837
893/* 838void
894 * free_object() frees everything allocated by an object, removes 839object::do_destroy ()
895 * it from the list of used objects, and puts it on the list of
896 * free objects. The IS_FREED() flag is set in the object.
897 * The object must have been removed by remove_ob() first for
898 * this function to succeed.
899 *
900 * If destroy_inventory is set, free inventory as well. Else drop items in
901 * inventory to the ground.
902 */
903void object::destroy (bool destroy_inventory)
904{ 840{
905 if (QUERY_FLAG (this, FLAG_FREED)) 841 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this);
843
844 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this);
846
847 if (!flag [FLAG_REMOVED])
848 remove ();
849
850 if (flag [FLAG_FREED])
906 return; 851 return;
907 852
908 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 853 set_speed (0);
909 remove_friendly_object (this);
910 854
911 if (!QUERY_FLAG (this, FLAG_REMOVED)) 855 flag [FLAG_FREED] = 1;
912 remove_ob (this);
913 856
914 SET_FLAG (this, FLAG_FREED); 857 attachable::do_destroy ();
915 858
916 if (more) 859 destroy_inv (true);
917 { 860 unlink ();
918 more->destroy (destroy_inventory);
919 more = 0;
920 }
921
922 if (inv)
923 {
924 /* Only if the space blocks everything do we not process -
925 * if some form of movement is allowed, let objects
926 * drop on that space.
927 */
928 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
929 {
930 object *op = inv;
931
932 while (op)
933 {
934 object *tmp = op->below;
935 op->destroy (destroy_inventory);
936 op = tmp;
937 }
938 }
939 else
940 { /* Put objects in inventory onto this space */
941 object *op = inv;
942
943 while (op)
944 {
945 object *tmp = op->below;
946
947 remove_ob (op);
948
949 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
950 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
951 free_object (op);
952 else
953 {
954 op->x = x;
955 op->y = y;
956 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
957 }
958
959 op = tmp;
960 }
961 }
962 }
963 861
964 // hack to ensure that freed objects still have a valid map 862 // hack to ensure that freed objects still have a valid map
965 { 863 {
966 static maptile *freed_map; // freed objects are moved here to avoid crashes 864 static maptile *freed_map; // freed objects are moved here to avoid crashes
967 865
… …
979 map = freed_map; 877 map = freed_map;
980 x = 1; 878 x = 1;
981 y = 1; 879 y = 1;
982 } 880 }
983 881
882 head = 0;
883
884 if (more)
885 {
886 more->destroy ();
887 more = 0;
888 }
889
984 // clear those pointers that likely might have circular references to us 890 // clear those pointers that likely might have circular references to us
985 owner = 0; 891 owner = 0;
986 enemy = 0; 892 enemy = 0;
987 attacked_by = 0; 893 attacked_by = 0;
988 894
989 // only relevant for players(?), but make sure of it anyways 895 // only relevant for players(?), but make sure of it anyways
990 contr = 0; 896 contr = 0;
897}
991 898
992 /* Remove object from the active list */ 899void
993 speed = 0; 900object::destroy (bool destroy_inventory)
994 update_ob_speed (this); 901{
902 if (destroyed ())
903 return;
995 904
996 unlink (); 905 if (destroy_inventory)
906 destroy_inv (false);
997 907
998 mortals.push_back (this); 908 attachable::destroy ();
999} 909}
1000 910
1001/* 911/*
1002 * sub_weight() recursively (outwards) subtracts a number from the 912 * sub_weight() recursively (outwards) subtracts a number from the
1003 * weight of an object (and what is carried by it's environment(s)). 913 * weight of an object (and what is carried by it's environment(s)).
1004 */ 914 */
1005
1006void 915void
1007sub_weight (object *op, signed long weight) 916sub_weight (object *op, signed long weight)
1008{ 917{
1009 while (op != NULL) 918 while (op != NULL)
1010 { 919 {
… …
1014 op->carrying -= weight; 923 op->carrying -= weight;
1015 op = op->env; 924 op = op->env;
1016 } 925 }
1017} 926}
1018 927
1019/* remove_ob(op): 928/* op->remove ():
1020 * This function removes the object op from the linked list of objects 929 * This function removes the object op from the linked list of objects
1021 * which it is currently tied to. When this function is done, the 930 * which it is currently tied to. When this function is done, the
1022 * object will have no environment. If the object previously had an 931 * object will have no environment. If the object previously had an
1023 * environment, the x and y coordinates will be updated to 932 * environment, the x and y coordinates will be updated to
1024 * the previous environment. 933 * the previous environment.
1025 * Beware: This function is called from the editor as well! 934 * Beware: This function is called from the editor as well!
1026 */ 935 */
1027
1028void 936void
1029remove_ob (object *op) 937object::remove ()
1030{ 938{
1031 object *tmp, *last = 0; 939 object *tmp, *last = 0;
1032 object *otmp; 940 object *otmp;
1033 941
1034 int check_walk_off;
1035 maptile *m;
1036
1037 sint16 x, y;
1038
1039 if (QUERY_FLAG (op, FLAG_REMOVED)) 942 if (QUERY_FLAG (this, FLAG_REMOVED))
1040 return; 943 return;
1041 944
1042 SET_FLAG (op, FLAG_REMOVED); 945 SET_FLAG (this, FLAG_REMOVED);
946 INVOKE_OBJECT (REMOVE, this);
1043 947
1044 if (op->more != NULL) 948 if (more)
1045 remove_ob (op->more); 949 more->remove ();
1046 950
1047 /* 951 /*
1048 * In this case, the object to be removed is in someones 952 * In this case, the object to be removed is in someones
1049 * inventory. 953 * inventory.
1050 */ 954 */
1051 if (op->env != NULL) 955 if (env)
1052 { 956 {
1053 if (op->nrof) 957 if (nrof)
1054 sub_weight (op->env, op->weight * op->nrof); 958 sub_weight (env, weight * nrof);
1055 else 959 else
1056 sub_weight (op->env, op->weight + op->carrying); 960 sub_weight (env, weight + carrying);
1057 961
1058 /* NO_FIX_PLAYER is set when a great many changes are being 962 /* NO_FIX_PLAYER is set when a great many changes are being
1059 * made to players inventory. If set, avoiding the call 963 * made to players inventory. If set, avoiding the call
1060 * to save cpu time. 964 * to save cpu time.
1061 */ 965 */
1062 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063 fix_player (otmp); 967 otmp->update_stats ();
1064 968
1065 if (op->above != NULL) 969 if (above != NULL)
1066 op->above->below = op->below; 970 above->below = below;
1067 else 971 else
1068 op->env->inv = op->below; 972 env->inv = below;
1069 973
1070 if (op->below != NULL) 974 if (below != NULL)
1071 op->below->above = op->above; 975 below->above = above;
1072 976
1073 /* we set up values so that it could be inserted into 977 /* we set up values so that it could be inserted into
1074 * the map, but we don't actually do that - it is up 978 * the map, but we don't actually do that - it is up
1075 * to the caller to decide what we want to do. 979 * to the caller to decide what we want to do.
1076 */ 980 */
1077 op->x = op->env->x, op->y = op->env->y; 981 x = env->x, y = env->y;
1078 op->map = op->env->map; 982 map = env->map;
1079 op->above = NULL, op->below = NULL; 983 above = 0, below = 0;
1080 op->env = NULL; 984 env = 0;
1081 } 985 }
1082 else if (op->map) 986 else if (map)
1083 { 987 {
1084 x = op->x;
1085 y = op->y;
1086 m = get_map_from_coord (op->map, &x, &y);
1087
1088 if (!m)
1089 {
1090 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1091 op->map->path, op->x, op->y);
1092 /* in old days, we used to set x and y to 0 and continue.
1093 * it seems if we get into this case, something is probablye
1094 * screwed up and should be fixed.
1095 */
1096 abort ();
1097 }
1098
1099 if (op->map != m)
1100 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1101 op->map->path, m->path, op->x, op->y, x, y);
1102
1103 /* Re did the following section of code - it looks like it had 988 /* Re did the following section of code - it looks like it had
1104 * lots of logic for things we no longer care about 989 * lots of logic for things we no longer care about
1105 */ 990 */
1106 991
1107 /* link the object above us */ 992 /* link the object above us */
1108 if (op->above) 993 if (above)
1109 op->above->below = op->below; 994 above->below = below;
1110 else 995 else
1111 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 996 map->at (x, y).top = below; /* we were top, set new top */
1112 997
1113 /* Relink the object below us, if there is one */ 998 /* Relink the object below us, if there is one */
1114 if (op->below) 999 if (below)
1115 op->below->above = op->above; 1000 below->above = above;
1116 else 1001 else
1117 { 1002 {
1118 /* Nothing below, which means we need to relink map object for this space 1003 /* Nothing below, which means we need to relink map object for this space
1119 * use translated coordinates in case some oddness with map tiling is 1004 * use translated coordinates in case some oddness with map tiling is
1120 * evident 1005 * evident
1121 */ 1006 */
1122 if (GET_MAP_OB (m, x, y) != op) 1007 if (GET_MAP_OB (map, x, y) != this)
1123 { 1008 {
1124 char *dump = dump_object (op); 1009 char *dump = dump_object (this);
1125 LOG (llevError, 1010 LOG (llevError,
1126 "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); 1011 "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);
1127 free (dump); 1012 free (dump);
1128 dump = dump_object (GET_MAP_OB (m, x, y)); 1013 dump = dump_object (GET_MAP_OB (map, x, y));
1129 LOG (llevError, "%s\n", dump); 1014 LOG (llevError, "%s\n", dump);
1130 free (dump); 1015 free (dump);
1131 } 1016 }
1132 1017
1133 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1018 map->at (x, y).bot = above; /* goes on above it. */
1134 } 1019 }
1135 1020
1136 op->above = 0; 1021 above = 0;
1137 op->below = 0; 1022 below = 0;
1138 1023
1139 if (op->map->in_memory == MAP_SAVING) 1024 if (map->in_memory == MAP_SAVING)
1140 return; 1025 return;
1141 1026
1142 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1027 int check_walk_off = !flag [FLAG_NO_APPLY];
1143 1028
1144 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1029 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1145 { 1030 {
1146 /* No point updating the players look faces if he is the object 1031 /* No point updating the players look faces if he is the object
1147 * being removed. 1032 * being removed.
1148 */ 1033 */
1149 1034
1150 if (tmp->type == PLAYER && tmp != op) 1035 if (tmp->type == PLAYER && tmp != this)
1151 { 1036 {
1152 /* If a container that the player is currently using somehow gets 1037 /* If a container that the player is currently using somehow gets
1153 * removed (most likely destroyed), update the player view 1038 * removed (most likely destroyed), update the player view
1154 * appropriately. 1039 * appropriately.
1155 */ 1040 */
1156 if (tmp->container == op) 1041 if (tmp->container == this)
1157 { 1042 {
1158 CLEAR_FLAG (op, FLAG_APPLIED); 1043 flag [FLAG_APPLIED] = 0;
1159 tmp->container = NULL; 1044 tmp->container = 0;
1160 } 1045 }
1161 1046
1162 tmp->contr->socket.update_look = 1; 1047 if (tmp->contr->ns)
1048 tmp->contr->ns->floorbox_update ();
1163 } 1049 }
1164 1050
1165 /* See if player moving off should effect something */ 1051 /* See if player moving off should effect something */
1166 if (check_walk_off 1052 if (check_walk_off
1167 && ((op->move_type & tmp->move_off) 1053 && ((move_type & tmp->move_off)
1168 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1054 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1169 { 1055 {
1170 move_apply (tmp, op, NULL); 1056 move_apply (tmp, this, 0);
1171 1057
1172 if (op->destroyed ()) 1058 if (destroyed ())
1173 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1059 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1174 } 1060 }
1175 1061
1176 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1062 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1177 1063
1178 if (tmp->above == tmp) 1064 if (tmp->above == tmp)
1179 tmp->above = NULL; 1065 tmp->above = 0;
1180 1066
1181 last = tmp; 1067 last = tmp;
1182 } 1068 }
1183 1069
1184 /* last == NULL of there are no objects on this space */ 1070 /* last == NULL of there are no objects on this space */
1185 if (last == NULL) 1071 if (!last)
1186 { 1072 map->at (x, y).flags_ = P_NEED_UPDATE;
1187 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1188 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1189 * those out anyways, and if there are any flags set right now, they won't
1190 * be correct anyways.
1191 */
1192 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1193 update_position (op->map, op->x, op->y);
1194 }
1195 else 1073 else
1196 update_object (last, UP_OBJ_REMOVE); 1074 update_object (last, UP_OBJ_REMOVE);
1197 1075
1198 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1199 update_all_los (op->map, op->x, op->y); 1077 update_all_los (map, x, y);
1200 } 1078 }
1201} 1079}
1202 1080
1203/* 1081/*
1204 * merge_ob(op,top): 1082 * merge_ob(op,top):
… …
1212merge_ob (object *op, object *top) 1090merge_ob (object *op, object *top)
1213{ 1091{
1214 if (!op->nrof) 1092 if (!op->nrof)
1215 return 0; 1093 return 0;
1216 1094
1217 if (top == NULL) 1095 if (top)
1218 for (top = op; top != NULL && top->above != NULL; top = top->above); 1096 for (top = op; top && top->above; top = top->above)
1097 ;
1219 1098
1220 for (; top != NULL; top = top->below) 1099 for (; top; top = top->below)
1221 { 1100 {
1222 if (top == op) 1101 if (top == op)
1223 continue; 1102 continue;
1224 if (CAN_MERGE (op, top)) 1103
1104 if (object::can_merge (op, top))
1225 { 1105 {
1226 top->nrof += op->nrof; 1106 top->nrof += op->nrof;
1227 1107
1228/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1108/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1229 op->weight = 0; /* Don't want any adjustements now */ 1109 op->weight = 0; /* Don't want any adjustements now */
1230 remove_ob (op); 1110 op->destroy ();
1231 free_object (op);
1232 return top; 1111 return top;
1233 } 1112 }
1234 } 1113 }
1235 1114
1236 return 0; 1115 return 0;
… …
1241 * job preparing multi-part monsters 1120 * job preparing multi-part monsters
1242 */ 1121 */
1243object * 1122object *
1244insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1123insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1245{ 1124{
1246 object *tmp;
1247
1248 if (op->head)
1249 op = op->head;
1250
1251 for (tmp = op; tmp; tmp = tmp->more) 1125 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1252 { 1126 {
1253 tmp->x = x + tmp->arch->clone.x; 1127 tmp->x = x + tmp->arch->clone.x;
1254 tmp->y = y + tmp->arch->clone.y; 1128 tmp->y = y + tmp->arch->clone.y;
1255 } 1129 }
1256 1130
… …
1275 * Return value: 1149 * Return value:
1276 * new object if 'op' was merged with other object 1150 * new object if 'op' was merged with other object
1277 * NULL if 'op' was destroyed 1151 * NULL if 'op' was destroyed
1278 * just 'op' otherwise 1152 * just 'op' otherwise
1279 */ 1153 */
1280
1281object * 1154object *
1282insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1155insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1283{ 1156{
1284 object *tmp, *top, *floor = NULL; 1157 object *tmp, *top, *floor = NULL;
1285 sint16 x, y; 1158 sint16 x, y;
… …
1319 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1192 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1320 free (dump); 1193 free (dump);
1321 return op; 1194 return op;
1322 } 1195 }
1323 1196
1324 if (op->more != NULL) 1197 if (op->more)
1325 { 1198 {
1326 /* The part may be on a different map. */ 1199 /* The part may be on a different map. */
1327 1200
1328 object *more = op->more; 1201 object *more = op->more;
1329 1202
… …
1345 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1218 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1346 { 1219 {
1347 if (!op->head) 1220 if (!op->head)
1348 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1221 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1349 1222
1350 return NULL; 1223 return 0;
1351 } 1224 }
1352 } 1225 }
1353 1226
1354 CLEAR_FLAG (op, FLAG_REMOVED); 1227 CLEAR_FLAG (op, FLAG_REMOVED);
1355 1228
… …
1363 1236
1364 /* this has to be done after we translate the coordinates. 1237 /* this has to be done after we translate the coordinates.
1365 */ 1238 */
1366 if (op->nrof && !(flag & INS_NO_MERGE)) 1239 if (op->nrof && !(flag & INS_NO_MERGE))
1367 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1240 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1368 if (CAN_MERGE (op, tmp)) 1241 if (object::can_merge (op, tmp))
1369 { 1242 {
1370 op->nrof += tmp->nrof; 1243 op->nrof += tmp->nrof;
1371 remove_ob (tmp); 1244 tmp->destroy ();
1372 free_object (tmp);
1373 } 1245 }
1374 1246
1375 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1247 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1376 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1248 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1377 1249
… …
1390 op->below = originator->below; 1262 op->below = originator->below;
1391 1263
1392 if (op->below) 1264 if (op->below)
1393 op->below->above = op; 1265 op->below->above = op;
1394 else 1266 else
1395 SET_MAP_OB (op->map, op->x, op->y, op); 1267 op->ms ().bot = op;
1396 1268
1397 /* since *below* originator, no need to update top */ 1269 /* since *below* originator, no need to update top */
1398 originator->below = op; 1270 originator->below = op;
1399 } 1271 }
1400 else 1272 else
… …
1446 * If INS_ON_TOP is used, don't do this processing 1318 * If INS_ON_TOP is used, don't do this processing
1447 * Need to find the object that in fact blocks view, otherwise 1319 * Need to find the object that in fact blocks view, otherwise
1448 * stacking is a bit odd. 1320 * stacking is a bit odd.
1449 */ 1321 */
1450 if (!(flag & INS_ON_TOP) && 1322 if (!(flag & INS_ON_TOP) &&
1451 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1323 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1452 { 1324 {
1453 for (last = top; last != floor; last = last->below) 1325 for (last = top; last != floor; last = last->below)
1454 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1326 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1455 break; 1327 break;
1456 /* Check to see if we found the object that blocks view, 1328 /* Check to see if we found the object that blocks view,
… …
1479 1351
1480 if (op->above) 1352 if (op->above)
1481 op->above->below = op; 1353 op->above->below = op;
1482 1354
1483 op->below = NULL; 1355 op->below = NULL;
1484 SET_MAP_OB (op->map, op->x, op->y, op); 1356 op->ms ().bot = op;
1485 } 1357 }
1486 else 1358 else
1487 { /* get inserted into the stack above top */ 1359 { /* get inserted into the stack above top */
1488 op->above = top->above; 1360 op->above = top->above;
1489 1361
… …
1493 op->below = top; 1365 op->below = top;
1494 top->above = op; 1366 top->above = op;
1495 } 1367 }
1496 1368
1497 if (op->above == NULL) 1369 if (op->above == NULL)
1498 SET_MAP_TOP (op->map, op->x, op->y, op); 1370 op->ms ().top = op;
1499 } /* else not INS_BELOW_ORIGINATOR */ 1371 } /* else not INS_BELOW_ORIGINATOR */
1500 1372
1501 if (op->type == PLAYER) 1373 if (op->type == PLAYER)
1502 op->contr->do_los = 1; 1374 op->contr->do_los = 1;
1503 1375
1504 /* If we have a floor, we know the player, if any, will be above 1376 /* If we have a floor, we know the player, if any, will be above
1505 * it, so save a few ticks and start from there. 1377 * it, so save a few ticks and start from there.
1506 */ 1378 */
1507 if (!(flag & INS_MAP_LOAD)) 1379 if (!(flag & INS_MAP_LOAD))
1508 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1380 if (object *pl = op->ms ().player ())
1509 if (tmp->type == PLAYER) 1381 if (pl->contr->ns)
1510 tmp->contr->socket.update_look = 1; 1382 pl->contr->ns->floorbox_update ();
1511 1383
1512 /* If this object glows, it may affect lighting conditions that are 1384 /* If this object glows, it may affect lighting conditions that are
1513 * visible to others on this map. But update_all_los is really 1385 * visible to others on this map. But update_all_los is really
1514 * an inefficient way to do this, as it means los for all players 1386 * an inefficient way to do this, as it means los for all players
1515 * on the map will get recalculated. The players could very well 1387 * on the map will get recalculated. The players could very well
1516 * be far away from this change and not affected in any way - 1388 * be far away from this change and not affected in any way -
1517 * this should get redone to only look for players within range, 1389 * this should get redone to only look for players within range,
1518 * or just updating the P_NEED_UPDATE for spaces within this area 1390 * or just updating the P_NEED_UPDATE for spaces within this area
1519 * of effect may be sufficient. 1391 * of effect may be sufficient.
1520 */ 1392 */
1521 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1393 if (op->map->darkness && (op->glow_radius != 0))
1522 update_all_los (op->map, op->x, op->y); 1394 update_all_los (op->map, op->x, op->y);
1523 1395
1524 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1396 /* updates flags (blocked, alive, no magic, etc) for this map space */
1525 update_object (op, UP_OBJ_INSERT); 1397 update_object (op, UP_OBJ_INSERT);
1526 1398
1399 INVOKE_OBJECT (INSERT, op);
1400
1527 /* Don't know if moving this to the end will break anything. However, 1401 /* Don't know if moving this to the end will break anything. However,
1528 * we want to have update_look set above before calling this. 1402 * we want to have floorbox_update called before calling this.
1529 * 1403 *
1530 * check_move_on() must be after this because code called from 1404 * check_move_on() must be after this because code called from
1531 * check_move_on() depends on correct map flags (so functions like 1405 * check_move_on() depends on correct map flags (so functions like
1532 * blocked() and wall() work properly), and these flags are updated by 1406 * blocked() and wall() work properly), and these flags are updated by
1533 * update_object(). 1407 * update_object().
… …
1535 1409
1536 /* if this is not the head or flag has been passed, don't check walk on status */ 1410 /* if this is not the head or flag has been passed, don't check walk on status */
1537 if (!(flag & INS_NO_WALK_ON) && !op->head) 1411 if (!(flag & INS_NO_WALK_ON) && !op->head)
1538 { 1412 {
1539 if (check_move_on (op, originator)) 1413 if (check_move_on (op, originator))
1540 return NULL; 1414 return 0;
1541 1415
1542 /* If we are a multi part object, lets work our way through the check 1416 /* If we are a multi part object, lets work our way through the check
1543 * walk on's. 1417 * walk on's.
1544 */ 1418 */
1545 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1419 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1546 if (check_move_on (tmp, originator)) 1420 if (check_move_on (tmp, originator))
1547 return NULL; 1421 return 0;
1548 } 1422 }
1549 1423
1550 return op; 1424 return op;
1551} 1425}
1552 1426
1553/* this function inserts an object in the map, but if it 1427/* this function inserts an object in the map, but if it
1554 * finds an object of its own type, it'll remove that one first. 1428 * finds an object of its own type, it'll remove that one first.
1555 * op is the object to insert it under: supplies x and the map. 1429 * op is the object to insert it under: supplies x and the map.
1556 */ 1430 */
1557void 1431void
1558replace_insert_ob_in_map (const char *arch_string, object *op) 1432replace_insert_ob_in_map (const char *arch_string, object *op)
1559{ 1433{
1560 object * 1434 object *tmp, *tmp1;
1561 tmp;
1562 object *
1563 tmp1;
1564 1435
1565 /* first search for itself and remove any old instances */ 1436 /* first search for itself and remove any old instances */
1566 1437
1567 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1438 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1568 {
1569 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1439 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1570 { 1440 tmp->destroy ();
1571 remove_ob (tmp);
1572 free_object (tmp);
1573 }
1574 }
1575 1441
1576 tmp1 = arch_to_object (archetype::find (arch_string)); 1442 tmp1 = arch_to_object (archetype::find (arch_string));
1577 1443
1578 tmp1->x = op->x; 1444 tmp1->x = op->x;
1579 tmp1->y = op->y; 1445 tmp1->y = op->y;
1580 insert_ob_in_map (tmp1, op->map, op, 0); 1446 insert_ob_in_map (tmp1, op->map, op, 0);
1447}
1448
1449object *
1450object::insert_at (object *where, object *originator, int flags)
1451{
1452 where->map->insert (this, where->x, where->y, originator, flags);
1581} 1453}
1582 1454
1583/* 1455/*
1584 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1456 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1585 * is returned contains nr objects, and the remaining parts contains 1457 * is returned contains nr objects, and the remaining parts contains
1586 * the rest (or is removed and freed if that number is 0). 1458 * the rest (or is removed and freed if that number is 0).
1587 * On failure, NULL is returned, and the reason put into the 1459 * On failure, NULL is returned, and the reason put into the
1588 * global static errmsg array. 1460 * global static errmsg array.
1589 */ 1461 */
1590
1591object * 1462object *
1592get_split_ob (object *orig_ob, uint32 nr) 1463get_split_ob (object *orig_ob, uint32 nr)
1593{ 1464{
1594 object * 1465 object *newob;
1595 newob;
1596 int
1597 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1466 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1598 1467
1599 if (orig_ob->nrof < nr) 1468 if (orig_ob->nrof < nr)
1600 { 1469 {
1601 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1470 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1602 return NULL; 1471 return NULL;
1603 } 1472 }
1604 1473
1605 newob = object_create_clone (orig_ob); 1474 newob = object_create_clone (orig_ob);
1606 1475
1607 if ((orig_ob->nrof -= nr) < 1) 1476 if ((orig_ob->nrof -= nr) < 1)
1608 { 1477 orig_ob->destroy (1);
1609 if (!is_removed)
1610 remove_ob (orig_ob);
1611 free_object2 (orig_ob, 1);
1612 }
1613 else if (!is_removed) 1478 else if (!is_removed)
1614 { 1479 {
1615 if (orig_ob->env != NULL) 1480 if (orig_ob->env != NULL)
1616 sub_weight (orig_ob->env, orig_ob->weight * nr); 1481 sub_weight (orig_ob->env, orig_ob->weight * nr);
1617 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1482 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1637 1502
1638object * 1503object *
1639decrease_ob_nr (object *op, uint32 i) 1504decrease_ob_nr (object *op, uint32 i)
1640{ 1505{
1641 object *tmp; 1506 object *tmp;
1642 player *pl;
1643 1507
1644 if (i == 0) /* objects with op->nrof require this check */ 1508 if (i == 0) /* objects with op->nrof require this check */
1645 return op; 1509 return op;
1646 1510
1647 if (i > op->nrof) 1511 if (i > op->nrof)
1648 i = op->nrof; 1512 i = op->nrof;
1649 1513
1650 if (QUERY_FLAG (op, FLAG_REMOVED)) 1514 if (QUERY_FLAG (op, FLAG_REMOVED))
1651 op->nrof -= i; 1515 op->nrof -= i;
1652 else if (op->env != NULL) 1516 else if (op->env)
1653 { 1517 {
1654 /* is this object in the players inventory, or sub container 1518 /* is this object in the players inventory, or sub container
1655 * therein? 1519 * therein?
1656 */ 1520 */
1657 tmp = is_player_inv (op->env); 1521 tmp = op->in_player ();
1658 /* nope. Is this a container the player has opened? 1522 /* nope. Is this a container the player has opened?
1659 * If so, set tmp to that player. 1523 * If so, set tmp to that player.
1660 * IMO, searching through all the players will mostly 1524 * IMO, searching through all the players will mostly
1661 * likely be quicker than following op->env to the map, 1525 * likely be quicker than following op->env to the map,
1662 * and then searching the map for a player. 1526 * and then searching the map for a player.
1663 */ 1527 */
1664 if (!tmp) 1528 if (!tmp)
1665 { 1529 for_all_players (pl)
1666 for (pl = first_player; pl; pl = pl->next)
1667 if (pl->ob->container == op->env) 1530 if (pl->ob->container == op->env)
1531 {
1532 tmp = pl->ob;
1668 break; 1533 break;
1669 if (pl)
1670 tmp = pl->ob;
1671 else
1672 tmp = NULL;
1673 } 1534 }
1674 1535
1675 if (i < op->nrof) 1536 if (i < op->nrof)
1676 { 1537 {
1677 sub_weight (op->env, op->weight * i); 1538 sub_weight (op->env, op->weight * i);
1678 op->nrof -= i; 1539 op->nrof -= i;
1679 if (tmp) 1540 if (tmp)
1680 {
1681 esrv_send_item (tmp, op); 1541 esrv_send_item (tmp, op);
1682 }
1683 } 1542 }
1684 else 1543 else
1685 { 1544 {
1686 remove_ob (op); 1545 op->remove ();
1687 op->nrof = 0; 1546 op->nrof = 0;
1688 if (tmp) 1547 if (tmp)
1689 {
1690 esrv_del_item (tmp->contr, op->count); 1548 esrv_del_item (tmp->contr, op->count);
1691 }
1692 } 1549 }
1693 } 1550 }
1694 else 1551 else
1695 { 1552 {
1696 object *above = op->above; 1553 object *above = op->above;
1697 1554
1698 if (i < op->nrof) 1555 if (i < op->nrof)
1699 op->nrof -= i; 1556 op->nrof -= i;
1700 else 1557 else
1701 { 1558 {
1702 remove_ob (op); 1559 op->remove ();
1703 op->nrof = 0; 1560 op->nrof = 0;
1704 } 1561 }
1705 1562
1706 /* Since we just removed op, op->above is null */ 1563 /* Since we just removed op, op->above is null */
1707 for (tmp = above; tmp != NULL; tmp = tmp->above) 1564 for (tmp = above; tmp; tmp = tmp->above)
1708 if (tmp->type == PLAYER) 1565 if (tmp->type == PLAYER)
1709 { 1566 {
1710 if (op->nrof) 1567 if (op->nrof)
1711 esrv_send_item (tmp, op); 1568 esrv_send_item (tmp, op);
1712 else 1569 else
… …
1716 1573
1717 if (op->nrof) 1574 if (op->nrof)
1718 return op; 1575 return op;
1719 else 1576 else
1720 { 1577 {
1721 free_object (op); 1578 op->destroy ();
1722 return NULL; 1579 return 0;
1723 } 1580 }
1724} 1581}
1725 1582
1726/* 1583/*
1727 * add_weight(object, weight) adds the specified weight to an object, 1584 * add_weight(object, weight) adds the specified weight to an object,
… …
1739 op->carrying += weight; 1596 op->carrying += weight;
1740 op = op->env; 1597 op = op->env;
1741 } 1598 }
1742} 1599}
1743 1600
1744/*
1745 * insert_ob_in_ob(op,environment):
1746 * This function inserts the object op in the linked list
1747 * inside the object environment.
1748 *
1749 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1750 * the inventory at the last position or next to other objects of the same
1751 * type.
1752 * Frank: Now sorted by type, archetype and magic!
1753 *
1754 * The function returns now pointer to inserted item, and return value can
1755 * be != op, if items are merged. -Tero
1756 */
1757
1758object * 1601object *
1759insert_ob_in_ob (object *op, object *where) 1602insert_ob_in_ob (object *op, object *where)
1760{ 1603{
1761 object * 1604 if (!where)
1762 tmp, *
1763 otmp;
1764
1765 if (!QUERY_FLAG (op, FLAG_REMOVED))
1766 {
1767 char *dump = dump_object (op);
1768 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1769 free (dump);
1770 return op;
1771 }
1772
1773 if (where == NULL)
1774 { 1605 {
1775 char *dump = dump_object (op); 1606 char *dump = dump_object (op);
1776 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1607 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1777 free (dump); 1608 free (dump);
1778 return op; 1609 return op;
1779 } 1610 }
1780 1611
1781 if (where->head) 1612 if (where->head)
1782 { 1613 {
1783 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1614 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1784 where = where->head; 1615 where = where->head;
1785 } 1616 }
1617
1618 return where->insert (op);
1619}
1620
1621/*
1622 * env->insert (op)
1623 * This function inserts the object op in the linked list
1624 * inside the object environment.
1625 *
1626 * The function returns now pointer to inserted item, and return value can
1627 * be != op, if items are merged. -Tero
1628 */
1629
1630object *
1631object::insert (object *op)
1632{
1633 object *tmp, *otmp;
1634
1635 if (!QUERY_FLAG (op, FLAG_REMOVED))
1636 op->remove ();
1786 1637
1787 if (op->more) 1638 if (op->more)
1788 { 1639 {
1789 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1640 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1790 return op; 1641 return op;
… …
1792 1643
1793 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1644 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1794 CLEAR_FLAG (op, FLAG_REMOVED); 1645 CLEAR_FLAG (op, FLAG_REMOVED);
1795 if (op->nrof) 1646 if (op->nrof)
1796 { 1647 {
1797 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1648 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1798 if (CAN_MERGE (tmp, op)) 1649 if (object::can_merge (tmp, op))
1799 { 1650 {
1800 /* return the original object and remove inserted object 1651 /* return the original object and remove inserted object
1801 (client needs the original object) */ 1652 (client needs the original object) */
1802 tmp->nrof += op->nrof; 1653 tmp->nrof += op->nrof;
1803 /* Weight handling gets pretty funky. Since we are adding to 1654 /* Weight handling gets pretty funky. Since we are adding to
1804 * tmp->nrof, we need to increase the weight. 1655 * tmp->nrof, we need to increase the weight.
1805 */ 1656 */
1806 add_weight (where, op->weight * op->nrof); 1657 add_weight (this, op->weight * op->nrof);
1807 SET_FLAG (op, FLAG_REMOVED); 1658 SET_FLAG (op, FLAG_REMOVED);
1808 free_object (op); /* free the inserted object */ 1659 op->destroy (); /* free the inserted object */
1809 op = tmp; 1660 op = tmp;
1810 remove_ob (op); /* and fix old object's links */ 1661 op->remove (); /* and fix old object's links */
1811 CLEAR_FLAG (op, FLAG_REMOVED); 1662 CLEAR_FLAG (op, FLAG_REMOVED);
1812 break; 1663 break;
1813 } 1664 }
1814 1665
1815 /* I assume combined objects have no inventory 1666 /* I assume combined objects have no inventory
1816 * We add the weight - this object could have just been removed 1667 * We add the weight - this object could have just been removed
1817 * (if it was possible to merge). calling remove_ob will subtract 1668 * (if it was possible to merge). calling remove_ob will subtract
1818 * the weight, so we need to add it in again, since we actually do 1669 * the weight, so we need to add it in again, since we actually do
1819 * the linking below 1670 * the linking below
1820 */ 1671 */
1821 add_weight (where, op->weight * op->nrof); 1672 add_weight (this, op->weight * op->nrof);
1822 } 1673 }
1823 else 1674 else
1824 add_weight (where, (op->weight + op->carrying)); 1675 add_weight (this, (op->weight + op->carrying));
1825 1676
1826 otmp = is_player_inv (where); 1677 otmp = this->in_player ();
1827 if (otmp && otmp->contr != NULL) 1678 if (otmp && otmp->contr)
1828 {
1829 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1679 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1830 fix_player (otmp); 1680 otmp->update_stats ();
1831 }
1832 1681
1833 op->map = NULL; 1682 op->map = 0;
1834 op->env = where; 1683 op->env = this;
1835 op->above = NULL; 1684 op->above = 0;
1836 op->below = NULL; 1685 op->below = 0;
1837 op->x = 0, op->y = 0; 1686 op->x = 0, op->y = 0;
1838 1687
1839 /* reset the light list and los of the players on the map */ 1688 /* reset the light list and los of the players on the map */
1840 if ((op->glow_radius != 0) && where->map) 1689 if ((op->glow_radius != 0) && map)
1841 { 1690 {
1842#ifdef DEBUG_LIGHTS 1691#ifdef DEBUG_LIGHTS
1843 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1692 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1844#endif /* DEBUG_LIGHTS */ 1693#endif /* DEBUG_LIGHTS */
1845 if (MAP_DARKNESS (where->map)) 1694 if (map->darkness)
1846 update_all_los (where->map, where->x, where->y); 1695 update_all_los (map, x, y);
1847 } 1696 }
1848 1697
1849 /* Client has no idea of ordering so lets not bother ordering it here. 1698 /* Client has no idea of ordering so lets not bother ordering it here.
1850 * It sure simplifies this function... 1699 * It sure simplifies this function...
1851 */ 1700 */
1852 if (where->inv == NULL) 1701 if (!inv)
1853 where->inv = op; 1702 inv = op;
1854 else 1703 else
1855 { 1704 {
1856 op->below = where->inv; 1705 op->below = inv;
1857 op->below->above = op; 1706 op->below->above = op;
1858 where->inv = op; 1707 inv = op;
1859 } 1708 }
1709
1710 INVOKE_OBJECT (INSERT, this);
1711
1860 return op; 1712 return op;
1861} 1713}
1862 1714
1863/* 1715/*
1864 * Checks if any objects has a move_type that matches objects 1716 * Checks if any objects has a move_type that matches objects
… …
1878 * 1730 *
1879 * MSW 2001-07-08: Check all objects on space, not just those below 1731 * MSW 2001-07-08: Check all objects on space, not just those below
1880 * object being inserted. insert_ob_in_map may not put new objects 1732 * object being inserted. insert_ob_in_map may not put new objects
1881 * on top. 1733 * on top.
1882 */ 1734 */
1883
1884int 1735int
1885check_move_on (object *op, object *originator) 1736check_move_on (object *op, object *originator)
1886{ 1737{
1887 object *tmp; 1738 object *tmp;
1888 maptile *m = op->map; 1739 maptile *m = op->map;
… …
1915 1766
1916 /* The objects have to be checked from top to bottom. 1767 /* The objects have to be checked from top to bottom.
1917 * Hence, we first go to the top: 1768 * Hence, we first go to the top:
1918 */ 1769 */
1919 1770
1920 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1771 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1921 { 1772 {
1922 /* Trim the search when we find the first other spell effect 1773 /* Trim the search when we find the first other spell effect
1923 * this helps performance so that if a space has 50 spell objects, 1774 * this helps performance so that if a space has 50 spell objects,
1924 * we don't need to check all of them. 1775 * we don't need to check all of them.
1925 */ 1776 */
… …
1980/* 1831/*
1981 * present_arch(arch, map, x, y) searches for any objects with 1832 * present_arch(arch, map, x, y) searches for any objects with
1982 * a matching archetype at the given map and coordinates. 1833 * a matching archetype at the given map and coordinates.
1983 * The first matching object is returned, or NULL if none. 1834 * The first matching object is returned, or NULL if none.
1984 */ 1835 */
1985
1986object * 1836object *
1987present_arch (const archetype *at, maptile *m, int x, int y) 1837present_arch (const archetype *at, maptile *m, int x, int y)
1988{ 1838{
1989 object *
1990 tmp;
1991
1992 if (m == NULL || out_of_map (m, x, y)) 1839 if (m == NULL || out_of_map (m, x, y))
1993 { 1840 {
1994 LOG (llevError, "Present_arch called outside map.\n"); 1841 LOG (llevError, "Present_arch called outside map.\n");
1995 return NULL; 1842 return NULL;
1996 } 1843 }
1844
1997 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1845 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1998 if (tmp->arch == at) 1846 if (tmp->arch == at)
1999 return tmp; 1847 return tmp;
1848
2000 return NULL; 1849 return NULL;
2001} 1850}
2002 1851
2003/* 1852/*
2004 * present(type, map, x, y) searches for any objects with 1853 * present(type, map, x, y) searches for any objects with
2005 * a matching type variable at the given map and coordinates. 1854 * a matching type variable at the given map and coordinates.
2006 * The first matching object is returned, or NULL if none. 1855 * The first matching object is returned, or NULL if none.
2007 */ 1856 */
2008
2009object * 1857object *
2010present (unsigned char type, maptile *m, int x, int y) 1858present (unsigned char type, maptile *m, int x, int y)
2011{ 1859{
2012 object *
2013 tmp;
2014
2015 if (out_of_map (m, x, y)) 1860 if (out_of_map (m, x, y))
2016 { 1861 {
2017 LOG (llevError, "Present called outside map.\n"); 1862 LOG (llevError, "Present called outside map.\n");
2018 return NULL; 1863 return NULL;
2019 } 1864 }
1865
2020 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1866 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2021 if (tmp->type == type) 1867 if (tmp->type == type)
2022 return tmp; 1868 return tmp;
1869
2023 return NULL; 1870 return NULL;
2024} 1871}
2025 1872
2026/* 1873/*
2027 * present_in_ob(type, object) searches for any objects with 1874 * present_in_ob(type, object) searches for any objects with
2028 * a matching type variable in the inventory of the given object. 1875 * a matching type variable in the inventory of the given object.
2029 * The first matching object is returned, or NULL if none. 1876 * The first matching object is returned, or NULL if none.
2030 */ 1877 */
2031
2032object * 1878object *
2033present_in_ob (unsigned char type, const object *op) 1879present_in_ob (unsigned char type, const object *op)
2034{ 1880{
2035 object *
2036 tmp;
2037
2038 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1881 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2039 if (tmp->type == type) 1882 if (tmp->type == type)
2040 return tmp; 1883 return tmp;
1884
2041 return NULL; 1885 return NULL;
2042} 1886}
2043 1887
2044/* 1888/*
2045 * present_in_ob (type, str, object) searches for any objects with 1889 * present_in_ob (type, str, object) searches for any objects with
… …
2053 * str is the string to match against. Note that we match against 1897 * str is the string to match against. Note that we match against
2054 * the object name, not the archetype name. this is so that the 1898 * the object name, not the archetype name. this is so that the
2055 * spell code can use one object type (force), but change it's name 1899 * spell code can use one object type (force), but change it's name
2056 * to be unique. 1900 * to be unique.
2057 */ 1901 */
2058
2059object * 1902object *
2060present_in_ob_by_name (int type, const char *str, const object *op) 1903present_in_ob_by_name (int type, const char *str, const object *op)
2061{ 1904{
2062 object *
2063 tmp;
2064
2065 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1905 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2066 {
2067 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1906 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2068 return tmp; 1907 return tmp;
2069 } 1908
2070 return NULL; 1909 return 0;
2071} 1910}
2072 1911
2073/* 1912/*
2074 * present_arch_in_ob(archetype, object) searches for any objects with 1913 * present_arch_in_ob(archetype, object) searches for any objects with
2075 * a matching archetype in the inventory of the given object. 1914 * a matching archetype in the inventory of the given object.
2076 * The first matching object is returned, or NULL if none. 1915 * The first matching object is returned, or NULL if none.
2077 */ 1916 */
2078
2079object * 1917object *
2080present_arch_in_ob (const archetype *at, const object *op) 1918present_arch_in_ob (const archetype *at, const object *op)
2081{ 1919{
2082 object *
2083 tmp;
2084
2085 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1920 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2086 if (tmp->arch == at) 1921 if (tmp->arch == at)
2087 return tmp; 1922 return tmp;
1923
2088 return NULL; 1924 return NULL;
2089} 1925}
2090 1926
2091/* 1927/*
2092 * activate recursively a flag on an object inventory 1928 * activate recursively a flag on an object inventory
2093 */ 1929 */
2094void 1930void
2095flag_inv (object *op, int flag) 1931flag_inv (object *op, int flag)
2096{ 1932{
2097 object *
2098 tmp;
2099
2100 if (op->inv) 1933 if (op->inv)
2101 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1934 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2102 { 1935 {
2103 SET_FLAG (tmp, flag); 1936 SET_FLAG (tmp, flag);
2104 flag_inv (tmp, flag); 1937 flag_inv (tmp, flag);
2105 } 1938 }
2106} /* 1939}
1940
1941/*
2107 * desactivate recursively a flag on an object inventory 1942 * deactivate recursively a flag on an object inventory
2108 */ 1943 */
2109void 1944void
2110unflag_inv (object *op, int flag) 1945unflag_inv (object *op, int flag)
2111{ 1946{
2112 object *
2113 tmp;
2114
2115 if (op->inv) 1947 if (op->inv)
2116 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1948 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2117 { 1949 {
2118 CLEAR_FLAG (tmp, flag); 1950 CLEAR_FLAG (tmp, flag);
2119 unflag_inv (tmp, flag); 1951 unflag_inv (tmp, flag);
2120 } 1952 }
2121} 1953}
… …
2124 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1956 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2125 * all it's inventory (recursively). 1957 * all it's inventory (recursively).
2126 * If checksums are used, a player will get set_cheat called for 1958 * If checksums are used, a player will get set_cheat called for
2127 * him/her-self and all object carried by a call to this function. 1959 * him/her-self and all object carried by a call to this function.
2128 */ 1960 */
2129
2130void 1961void
2131set_cheat (object *op) 1962set_cheat (object *op)
2132{ 1963{
2133 SET_FLAG (op, FLAG_WAS_WIZ); 1964 SET_FLAG (op, FLAG_WAS_WIZ);
2134 flag_inv (op, FLAG_WAS_WIZ); 1965 flag_inv (op, FLAG_WAS_WIZ);
… …
2153 * because arch_blocked (now ob_blocked) needs to know the movement type 1984 * because arch_blocked (now ob_blocked) needs to know the movement type
2154 * to know if the space in question will block the object. We can't use 1985 * to know if the space in question will block the object. We can't use
2155 * the archetype because that isn't correct if the monster has been 1986 * the archetype because that isn't correct if the monster has been
2156 * customized, changed states, etc. 1987 * customized, changed states, etc.
2157 */ 1988 */
2158
2159int 1989int
2160find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1990find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2161{ 1991{
2162 int
2163 i,
2164 index = 0, flag; 1992 int index = 0, flag;
2165 static int
2166 altern[SIZEOFFREE]; 1993 int altern[SIZEOFFREE];
2167 1994
2168 for (i = start; i < stop; i++) 1995 for (int i = start; i < stop; i++)
2169 { 1996 {
2170 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1997 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2171 if (!flag) 1998 if (!flag)
2172 altern[index++] = i; 1999 altern [index++] = i;
2173 2000
2174 /* Basically, if we find a wall on a space, we cut down the search size. 2001 /* Basically, if we find a wall on a space, we cut down the search size.
2175 * In this way, we won't return spaces that are on another side of a wall. 2002 * In this way, we won't return spaces that are on another side of a wall.
2176 * This mostly work, but it cuts down the search size in all directions - 2003 * This mostly work, but it cuts down the search size in all directions -
2177 * if the space being examined only has a wall to the north and empty 2004 * if the space being examined only has a wall to the north and empty
2178 * spaces in all the other directions, this will reduce the search space 2005 * spaces in all the other directions, this will reduce the search space
2179 * to only the spaces immediately surrounding the target area, and 2006 * to only the spaces immediately surrounding the target area, and
2180 * won't look 2 spaces south of the target space. 2007 * won't look 2 spaces south of the target space.
2181 */ 2008 */
2182 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2009 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2183 stop = maxfree[i]; 2010 stop = maxfree[i];
2184 } 2011 }
2012
2185 if (!index) 2013 if (!index)
2186 return -1; 2014 return -1;
2015
2187 return altern[RANDOM () % index]; 2016 return altern[RANDOM () % index];
2188} 2017}
2189 2018
2190/* 2019/*
2191 * find_first_free_spot(archetype, maptile, x, y) works like 2020 * find_first_free_spot(archetype, maptile, x, y) works like
2192 * find_free_spot(), but it will search max number of squares. 2021 * find_free_spot(), but it will search max number of squares.
2193 * But it will return the first available spot, not a random choice. 2022 * But it will return the first available spot, not a random choice.
2194 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2023 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2195 */ 2024 */
2196
2197int 2025int
2198find_first_free_spot (const object *ob, maptile *m, int x, int y) 2026find_first_free_spot (const object *ob, maptile *m, int x, int y)
2199{ 2027{
2200 int
2201 i;
2202
2203 for (i = 0; i < SIZEOFFREE; i++) 2028 for (int i = 0; i < SIZEOFFREE; i++)
2204 {
2205 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2029 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2206 return i; 2030 return i;
2207 } 2031
2208 return -1; 2032 return -1;
2209} 2033}
2210 2034
2211/* 2035/*
2212 * The function permute(arr, begin, end) randomly reorders the array 2036 * The function permute(arr, begin, end) randomly reorders the array
2213 * arr[begin..end-1]. 2037 * arr[begin..end-1].
2038 * now uses a fisher-yates shuffle, old permute was broken
2214 */ 2039 */
2215static void 2040static void
2216permute (int *arr, int begin, int end) 2041permute (int *arr, int begin, int end)
2217{ 2042{
2218 int 2043 arr += begin;
2219 i,
2220 j,
2221 tmp,
2222 len;
2223
2224 len = end - begin; 2044 end -= begin;
2225 for (i = begin; i < end; i++)
2226 {
2227 j = begin + RANDOM () % len;
2228 2045
2229 tmp = arr[i]; 2046 while (--end)
2230 arr[i] = arr[j]; 2047 swap (arr [end], arr [RANDOM () % (end + 1)]);
2231 arr[j] = tmp;
2232 }
2233} 2048}
2234 2049
2235/* new function to make monster searching more efficient, and effective! 2050/* new function to make monster searching more efficient, and effective!
2236 * This basically returns a randomized array (in the passed pointer) of 2051 * This basically returns a randomized array (in the passed pointer) of
2237 * the spaces to find monsters. In this way, it won't always look for 2052 * the spaces to find monsters. In this way, it won't always look for
… …
2240 * the 3x3 area will be searched, just not in a predictable order. 2055 * the 3x3 area will be searched, just not in a predictable order.
2241 */ 2056 */
2242void 2057void
2243get_search_arr (int *search_arr) 2058get_search_arr (int *search_arr)
2244{ 2059{
2245 int 2060 int i;
2246 i;
2247 2061
2248 for (i = 0; i < SIZEOFFREE; i++) 2062 for (i = 0; i < SIZEOFFREE; i++)
2249 {
2250 search_arr[i] = i; 2063 search_arr[i] = i;
2251 }
2252 2064
2253 permute (search_arr, 1, SIZEOFFREE1 + 1); 2065 permute (search_arr, 1, SIZEOFFREE1 + 1);
2254 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2066 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2255 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2067 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2256} 2068}
… …
2265 * Perhaps incorrectly, but I'm making the assumption that exclude 2077 * Perhaps incorrectly, but I'm making the assumption that exclude
2266 * is actually want is going to try and move there. We need this info 2078 * is actually want is going to try and move there. We need this info
2267 * because we have to know what movement the thing looking to move 2079 * because we have to know what movement the thing looking to move
2268 * there is capable of. 2080 * there is capable of.
2269 */ 2081 */
2270
2271int 2082int
2272find_dir (maptile *m, int x, int y, object *exclude) 2083find_dir (maptile *m, int x, int y, object *exclude)
2273{ 2084{
2274 int
2275 i,
2276 max = SIZEOFFREE, mflags; 2085 int i, max = SIZEOFFREE, mflags;
2277 2086
2278 sint16 nx, ny; 2087 sint16 nx, ny;
2279 object * 2088 object *tmp;
2280 tmp;
2281 maptile * 2089 maptile *mp;
2282 mp;
2283 2090
2284 MoveType blocked, move_type; 2091 MoveType blocked, move_type;
2285 2092
2286 if (exclude && exclude->head) 2093 if (exclude && exclude->head)
2287 { 2094 {
… …
2299 mp = m; 2106 mp = m;
2300 nx = x + freearr_x[i]; 2107 nx = x + freearr_x[i];
2301 ny = y + freearr_y[i]; 2108 ny = y + freearr_y[i];
2302 2109
2303 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2110 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2111
2304 if (mflags & P_OUT_OF_MAP) 2112 if (mflags & P_OUT_OF_MAP)
2305 {
2306 max = maxfree[i]; 2113 max = maxfree[i];
2307 }
2308 else 2114 else
2309 { 2115 {
2310 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2116 mapspace &ms = mp->at (nx, ny);
2117
2118 blocked = ms.move_block;
2311 2119
2312 if ((move_type & blocked) == move_type) 2120 if ((move_type & blocked) == move_type)
2313 {
2314 max = maxfree[i]; 2121 max = maxfree[i];
2315 }
2316 else if (mflags & P_IS_ALIVE) 2122 else if (mflags & P_IS_ALIVE)
2317 { 2123 {
2318 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2124 for (tmp = ms.bot; tmp; tmp = tmp->above)
2319 { 2125 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2320 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2126 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2321 {
2322 break; 2127 break;
2323 } 2128
2324 }
2325 if (tmp) 2129 if (tmp)
2326 {
2327 return freedir[i]; 2130 return freedir[i];
2328 }
2329 } 2131 }
2330 } 2132 }
2331 } 2133 }
2134
2332 return 0; 2135 return 0;
2333} 2136}
2334 2137
2335/* 2138/*
2336 * distance(object 1, object 2) will return the square of the 2139 * distance(object 1, object 2) will return the square of the
2337 * distance between the two given objects. 2140 * distance between the two given objects.
2338 */ 2141 */
2339
2340int 2142int
2341distance (const object *ob1, const object *ob2) 2143distance (const object *ob1, const object *ob2)
2342{ 2144{
2343 int
2344 i;
2345
2346 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2145 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2347 return i;
2348} 2146}
2349 2147
2350/* 2148/*
2351 * find_dir_2(delta-x,delta-y) will return a direction in which 2149 * find_dir_2(delta-x,delta-y) will return a direction in which
2352 * an object which has subtracted the x and y coordinates of another 2150 * an object which has subtracted the x and y coordinates of another
2353 * object, needs to travel toward it. 2151 * object, needs to travel toward it.
2354 */ 2152 */
2355
2356int 2153int
2357find_dir_2 (int x, int y) 2154find_dir_2 (int x, int y)
2358{ 2155{
2359 int 2156 int q;
2360 q;
2361 2157
2362 if (y) 2158 if (y)
2363 q = x * 100 / y; 2159 q = x * 100 / y;
2364 else if (x) 2160 else if (x)
2365 q = -300 * x; 2161 q = -300 * x;
… …
2400int 2196int
2401absdir (int d) 2197absdir (int d)
2402{ 2198{
2403 while (d < 1) 2199 while (d < 1)
2404 d += 8; 2200 d += 8;
2201
2405 while (d > 8) 2202 while (d > 8)
2406 d -= 8; 2203 d -= 8;
2204
2407 return d; 2205 return d;
2408} 2206}
2409 2207
2410/* 2208/*
2411 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2209 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2413 */ 2211 */
2414 2212
2415int 2213int
2416dirdiff (int dir1, int dir2) 2214dirdiff (int dir1, int dir2)
2417{ 2215{
2418 int 2216 int d;
2419 d;
2420 2217
2421 d = abs (dir1 - dir2); 2218 d = abs (dir1 - dir2);
2422 if (d > 4) 2219 if (d > 4)
2423 d = 8 - d; 2220 d = 8 - d;
2221
2424 return d; 2222 return d;
2425} 2223}
2426 2224
2427/* peterm: 2225/* peterm:
2428 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2226 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2431 * This basically means that if direction is 15, then it could either go 2229 * This basically means that if direction is 15, then it could either go
2432 * direction 4, 14, or 16 to get back to where we are. 2230 * direction 4, 14, or 16 to get back to where we are.
2433 * Moved from spell_util.c to object.c with the other related direction 2231 * Moved from spell_util.c to object.c with the other related direction
2434 * functions. 2232 * functions.
2435 */ 2233 */
2436
2437int
2438 reduction_dir[SIZEOFFREE][3] = { 2234int reduction_dir[SIZEOFFREE][3] = {
2439 {0, 0, 0}, /* 0 */ 2235 {0, 0, 0}, /* 0 */
2440 {0, 0, 0}, /* 1 */ 2236 {0, 0, 0}, /* 1 */
2441 {0, 0, 0}, /* 2 */ 2237 {0, 0, 0}, /* 2 */
2442 {0, 0, 0}, /* 3 */ 2238 {0, 0, 0}, /* 3 */
2443 {0, 0, 0}, /* 4 */ 2239 {0, 0, 0}, /* 4 */
… …
2491 * find a path to that monster that we found. If not, 2287 * find a path to that monster that we found. If not,
2492 * we don't bother going toward it. Returns 1 if we 2288 * we don't bother going toward it. Returns 1 if we
2493 * can see a direct way to get it 2289 * can see a direct way to get it
2494 * Modified to be map tile aware -.MSW 2290 * Modified to be map tile aware -.MSW
2495 */ 2291 */
2496
2497
2498int 2292int
2499can_see_monsterP (maptile *m, int x, int y, int dir) 2293can_see_monsterP (maptile *m, int x, int y, int dir)
2500{ 2294{
2501 sint16 dx, dy; 2295 sint16 dx, dy;
2502 int
2503 mflags; 2296 int mflags;
2504 2297
2505 if (dir < 0) 2298 if (dir < 0)
2506 return 0; /* exit condition: invalid direction */ 2299 return 0; /* exit condition: invalid direction */
2507 2300
2508 dx = x + freearr_x[dir]; 2301 dx = x + freearr_x[dir];
… …
2521 return 0; 2314 return 0;
2522 2315
2523 /* yes, can see. */ 2316 /* yes, can see. */
2524 if (dir < 9) 2317 if (dir < 9)
2525 return 1; 2318 return 1;
2319
2526 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2320 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2527 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2321 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2322 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2528} 2323}
2529
2530
2531 2324
2532/* 2325/*
2533 * can_pick(picker, item): finds out if an object is possible to be 2326 * can_pick(picker, item): finds out if an object is possible to be
2534 * picked up by the picker. Returnes 1 if it can be 2327 * picked up by the picker. Returnes 1 if it can be
2535 * picked up, otherwise 0. 2328 * picked up, otherwise 0.
… …
2546 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2339 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2547 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2340 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2548 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2341 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2549} 2342}
2550 2343
2551
2552/* 2344/*
2553 * create clone from object to another 2345 * create clone from object to another
2554 */ 2346 */
2555object * 2347object *
2556object_create_clone (object *asrc) 2348object_create_clone (object *asrc)
2557{ 2349{
2558 object *
2559 dst = NULL, *tmp, *src, *part, *prev, *item; 2350 object *dst = 0, *tmp, *src, *part, *prev, *item;
2560 2351
2561 if (!asrc) 2352 if (!asrc)
2562 return NULL; 2353 return 0;
2354
2563 src = asrc; 2355 src = asrc;
2564 if (src->head) 2356 if (src->head)
2565 src = src->head; 2357 src = src->head;
2566 2358
2567 prev = NULL; 2359 prev = 0;
2568 for (part = src; part; part = part->more) 2360 for (part = src; part; part = part->more)
2569 { 2361 {
2570 tmp = get_object (); 2362 tmp = part->clone ();
2571 copy_object (part, tmp);
2572 tmp->x -= src->x; 2363 tmp->x -= src->x;
2573 tmp->y -= src->y; 2364 tmp->y -= src->y;
2365
2574 if (!part->head) 2366 if (!part->head)
2575 { 2367 {
2576 dst = tmp; 2368 dst = tmp;
2577 tmp->head = NULL; 2369 tmp->head = 0;
2578 } 2370 }
2579 else 2371 else
2580 {
2581 tmp->head = dst; 2372 tmp->head = dst;
2582 } 2373
2583 tmp->more = NULL; 2374 tmp->more = 0;
2375
2584 if (prev) 2376 if (prev)
2585 prev->more = tmp; 2377 prev->more = tmp;
2378
2586 prev = tmp; 2379 prev = tmp;
2587 } 2380 }
2588 2381
2589 for (item = src->inv; item; item = item->below) 2382 for (item = src->inv; item; item = item->below)
2590 insert_ob_in_ob (object_create_clone (item), dst); 2383 insert_ob_in_ob (object_create_clone (item), dst);
… …
2596/* Basically, we save the content of the string to a temp file, then call */ 2389/* Basically, we save the content of the string to a temp file, then call */
2597/* load_object on it. I admit it is a highly inefficient way to make things, */ 2390/* load_object on it. I admit it is a highly inefficient way to make things, */
2598/* but it was simple to make and allows reusing the load_object function. */ 2391/* but it was simple to make and allows reusing the load_object function. */
2599/* Remember not to use load_object_str in a time-critical situation. */ 2392/* Remember not to use load_object_str in a time-critical situation. */
2600/* Also remember that multiparts objects are not supported for now. */ 2393/* Also remember that multiparts objects are not supported for now. */
2601
2602object * 2394object *
2603load_object_str (const char *obstr) 2395load_object_str (const char *obstr)
2604{ 2396{
2605 object *op; 2397 object *op;
2606 char filename[MAX_BUF]; 2398 char filename[MAX_BUF];
… …
2616 } 2408 }
2617 2409
2618 fprintf (tempfile, obstr); 2410 fprintf (tempfile, obstr);
2619 fclose (tempfile); 2411 fclose (tempfile);
2620 2412
2621 op = get_object (); 2413 op = object::create ();
2622 2414
2623 object_thawer thawer (filename); 2415 object_thawer thawer (filename);
2624 2416
2625 if (thawer) 2417 if (thawer)
2626 load_object (thawer, op, 0); 2418 load_object (thawer, op, 0);
… …
2636 * returns NULL if no match. 2428 * returns NULL if no match.
2637 */ 2429 */
2638object * 2430object *
2639find_obj_by_type_subtype (const object *who, int type, int subtype) 2431find_obj_by_type_subtype (const object *who, int type, int subtype)
2640{ 2432{
2641 object *tmp;
2642
2643 for (tmp = who->inv; tmp; tmp = tmp->below) 2433 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2644 if (tmp->type == type && tmp->subtype == subtype) 2434 if (tmp->type == type && tmp->subtype == subtype)
2645 return tmp; 2435 return tmp;
2646 2436
2647 return NULL; 2437 return 0;
2648} 2438}
2649 2439
2650/* If ob has a field named key, return the link from the list, 2440/* If ob has a field named key, return the link from the list,
2651 * otherwise return NULL. 2441 * otherwise return NULL.
2652 * 2442 *
… …
2654 * do the desired thing. 2444 * do the desired thing.
2655 */ 2445 */
2656key_value * 2446key_value *
2657get_ob_key_link (const object *ob, const char *key) 2447get_ob_key_link (const object *ob, const char *key)
2658{ 2448{
2659 key_value *link;
2660
2661 for (link = ob->key_values; link != NULL; link = link->next) 2449 for (key_value *link = ob->key_values; link; link = link->next)
2662 if (link->key == key) 2450 if (link->key == key)
2663 return link; 2451 return link;
2664 2452
2665 return NULL; 2453 return 0;
2666} 2454}
2667 2455
2668/* 2456/*
2669 * Returns the value of op has an extra_field for key, or NULL. 2457 * Returns the value of op has an extra_field for key, or NULL.
2670 * 2458 *
… …
2710 * Returns TRUE on success. 2498 * Returns TRUE on success.
2711 */ 2499 */
2712int 2500int
2713set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2501set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2714{ 2502{
2715 key_value *
2716 field = NULL, *last = NULL; 2503 key_value *field = NULL, *last = NULL;
2717 2504
2718 for (field = op->key_values; field != NULL; field = field->next) 2505 for (field = op->key_values; field != NULL; field = field->next)
2719 { 2506 {
2720 if (field->key != canonical_key) 2507 if (field->key != canonical_key)
2721 { 2508 {
… …
2749 /* IF we get here, key doesn't exist */ 2536 /* IF we get here, key doesn't exist */
2750 2537
2751 /* No field, we'll have to add it. */ 2538 /* No field, we'll have to add it. */
2752 2539
2753 if (!add_key) 2540 if (!add_key)
2754 {
2755 return FALSE; 2541 return FALSE;
2756 } 2542
2757 /* There isn't any good reason to store a null 2543 /* There isn't any good reason to store a null
2758 * value in the key/value list. If the archetype has 2544 * value in the key/value list. If the archetype has
2759 * this key, then we should also have it, so shouldn't 2545 * this key, then we should also have it, so shouldn't
2760 * be here. If user wants to store empty strings, 2546 * be here. If user wants to store empty strings,
2761 * should pass in "" 2547 * should pass in ""

Diff Legend

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