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.57 by root, Sun Dec 3 02:46:33 2006 UTC vs.
Revision 1.87 by root, Tue Dec 26 08:54:59 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 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
852}
853 742
854object::object () 743object::object ()
855{ 744{
856 SET_FLAG (this, FLAG_REMOVED); 745 SET_FLAG (this, FLAG_REMOVED);
857 746
… …
896 object *op = new object; 785 object *op = new object;
897 op->link (); 786 op->link ();
898 return op; 787 return op;
899} 788}
900 789
901/* 790void
902 * free_object() frees everything allocated by an object, removes 791object::do_destroy ()
903 * it from the list of used objects, and puts it on the list of
904 * free objects. The IS_FREED() flag is set in the object.
905 * The object must have been removed by remove_ob() first for
906 * this function to succeed.
907 *
908 * If destroy_inventory is set, free inventory as well. Else drop items in
909 * inventory to the ground.
910 */
911void object::destroy (bool destroy_inventory)
912{ 792{
913 if (QUERY_FLAG (this, FLAG_FREED)) 793 attachable::do_destroy ();
794
795 if (flag [FLAG_IS_LINKED])
796 remove_button_link (this);
797
798 if (flag [FLAG_FRIENDLY])
799 remove_friendly_object (this);
800
801 if (!flag [FLAG_REMOVED])
802 remove ();
803
804 if (flag [FLAG_FREED])
914 return; 805 return;
915 806
916 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 807 flag [FLAG_FREED] = 1;
917 remove_friendly_object (this);
918
919 if (!QUERY_FLAG (this, FLAG_REMOVED))
920 remove_ob (this);
921
922 SET_FLAG (this, FLAG_FREED);
923
924 if (more)
925 {
926 more->destroy (destroy_inventory);
927 more = 0;
928 }
929
930 if (inv)
931 {
932 /* Only if the space blocks everything do we not process -
933 * if some form of movement is allowed, let objects
934 * drop on that space.
935 */
936 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
937 {
938 object *op = inv;
939
940 while (op)
941 {
942 object *tmp = op->below;
943 op->destroy (destroy_inventory);
944 op = tmp;
945 }
946 }
947 else
948 { /* Put objects in inventory onto this space */
949 object *op = inv;
950
951 while (op)
952 {
953 object *tmp = op->below;
954
955 remove_ob (op);
956
957 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959 free_object (op);
960 else
961 {
962 op->x = x;
963 op->y = y;
964 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
965 }
966
967 op = tmp;
968 }
969 }
970 }
971 808
972 // hack to ensure that freed objects still have a valid map 809 // hack to ensure that freed objects still have a valid map
973 { 810 {
974 static maptile *freed_map; // freed objects are moved here to avoid crashes 811 static maptile *freed_map; // freed objects are moved here to avoid crashes
975 812
… …
987 map = freed_map; 824 map = freed_map;
988 x = 1; 825 x = 1;
989 y = 1; 826 y = 1;
990 } 827 }
991 828
829 more = 0;
830 head = 0;
831 inv = 0;
832
992 // clear those pointers that likely might have circular references to us 833 // clear those pointers that likely might have circular references to us
993 owner = 0; 834 owner = 0;
994 enemy = 0; 835 enemy = 0;
995 attacked_by = 0; 836 attacked_by = 0;
996 837
997 // only relevant for players(?), but make sure of it anyways 838 // only relevant for players(?), but make sure of it anyways
998 contr = 0; 839 contr = 0;
999 840
1000 /* Remove object from the active list */ 841 /* Remove object from the active list */
1001 speed = 0; 842 set_speed (0);
1002 update_ob_speed (this);
1003 843
1004 unlink (); 844 unlink ();
845}
1005 846
1006 mortals.push_back (this); 847/*
848 * Remove and free all objects in the inventory of the given object.
849 * object.c ?
850 */
851void
852object::destroy_inv (bool drop_to_ground)
853{
854 if (!inv)
855 return;
856
857 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects
859 * drop on that space.
860 */
861 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
862 {
863 while (inv)
864 {
865 inv->destroy_inv (drop_to_ground);
866 inv->destroy ();
867 }
868 }
869 else
870 { /* Put objects in inventory onto this space */
871 while (inv)
872 {
873 object *op = inv;
874
875 if (op->flag [FLAG_STARTEQUIP]
876 || op->flag [FLAG_NO_DROP]
877 || op->type == RUNE
878 || op->type == TRAP
879 || op->flag [FLAG_IS_A_TEMPLATE])
880 op->destroy ();
881 else
882 {
883 op->remove ();
884 op->x = x;
885 op->y = y;
886 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
887 }
888 }
889 }
890}
891
892void
893object::destroy (bool destroy_inventory)
894{
895 if (destroyed ())
896 return;
897
898 if (more)
899 {
900 //TODO: non-head objects must not have inventory
901 more->destroy (destroy_inventory);
902 more = 0;
903 }
904
905 if (destroy_inventory)
906 destroy_inv (true);
907
908 attachable::destroy ();
1007} 909}
1008 910
1009/* 911/*
1010 * sub_weight() recursively (outwards) subtracts a number from the 912 * sub_weight() recursively (outwards) subtracts a number from the
1011 * 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)).
1012 */ 914 */
1013
1014void 915void
1015sub_weight (object *op, signed long weight) 916sub_weight (object *op, signed long weight)
1016{ 917{
1017 while (op != NULL) 918 while (op != NULL)
1018 { 919 {
… …
1022 op->carrying -= weight; 923 op->carrying -= weight;
1023 op = op->env; 924 op = op->env;
1024 } 925 }
1025} 926}
1026 927
1027/* remove_ob(op): 928/* op->remove ():
1028 * 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
1029 * 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
1030 * object will have no environment. If the object previously had an 931 * object will have no environment. If the object previously had an
1031 * environment, the x and y coordinates will be updated to 932 * environment, the x and y coordinates will be updated to
1032 * the previous environment. 933 * the previous environment.
1033 * Beware: This function is called from the editor as well! 934 * Beware: This function is called from the editor as well!
1034 */ 935 */
1035
1036void 936void
1037remove_ob (object *op) 937object::remove ()
1038{ 938{
1039 object *tmp, *last = 0; 939 object *tmp, *last = 0;
1040 object *otmp; 940 object *otmp;
1041 941
1042 int check_walk_off;
1043 maptile *m;
1044
1045 sint16 x, y;
1046
1047 if (QUERY_FLAG (op, FLAG_REMOVED)) 942 if (QUERY_FLAG (this, FLAG_REMOVED))
1048 return; 943 return;
1049 944
1050 SET_FLAG (op, FLAG_REMOVED); 945 SET_FLAG (this, FLAG_REMOVED);
946 INVOKE_OBJECT (REMOVE, this);
1051 947
1052 if (op->more != NULL) 948 if (more)
1053 remove_ob (op->more); 949 more->remove ();
1054 950
1055 /* 951 /*
1056 * In this case, the object to be removed is in someones 952 * In this case, the object to be removed is in someones
1057 * inventory. 953 * inventory.
1058 */ 954 */
1059 if (op->env != NULL) 955 if (env)
1060 { 956 {
1061 if (op->nrof) 957 if (nrof)
1062 sub_weight (op->env, op->weight * op->nrof); 958 sub_weight (env, weight * nrof);
1063 else 959 else
1064 sub_weight (op->env, op->weight + op->carrying); 960 sub_weight (env, weight + carrying);
1065 961
1066 /* 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
1067 * made to players inventory. If set, avoiding the call 963 * made to players inventory. If set, avoiding the call
1068 * to save cpu time. 964 * to save cpu time.
1069 */ 965 */
1070 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))
1071 fix_player (otmp); 967 otmp->update_stats ();
1072 968
1073 if (op->above != NULL) 969 if (above != NULL)
1074 op->above->below = op->below; 970 above->below = below;
1075 else 971 else
1076 op->env->inv = op->below; 972 env->inv = below;
1077 973
1078 if (op->below != NULL) 974 if (below != NULL)
1079 op->below->above = op->above; 975 below->above = above;
1080 976
1081 /* we set up values so that it could be inserted into 977 /* we set up values so that it could be inserted into
1082 * 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
1083 * to the caller to decide what we want to do. 979 * to the caller to decide what we want to do.
1084 */ 980 */
1085 op->x = op->env->x, op->y = op->env->y; 981 x = env->x, y = env->y;
1086 op->map = op->env->map; 982 map = env->map;
1087 op->above = NULL, op->below = NULL; 983 above = 0, below = 0;
1088 op->env = NULL; 984 env = 0;
1089 } 985 }
1090 else if (op->map) 986 else if (map)
1091 { 987 {
1092 x = op->x;
1093 y = op->y;
1094 m = get_map_from_coord (op->map, &x, &y);
1095
1096 if (!m)
1097 {
1098 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1099 op->map->path, op->x, op->y);
1100 /* in old days, we used to set x and y to 0 and continue.
1101 * it seems if we get into this case, something is probablye
1102 * screwed up and should be fixed.
1103 */
1104 abort ();
1105 }
1106
1107 if (op->map != m)
1108 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1109 op->map->path, m->path, op->x, op->y, x, y);
1110
1111 /* 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
1112 * lots of logic for things we no longer care about 989 * lots of logic for things we no longer care about
1113 */ 990 */
1114 991
1115 /* link the object above us */ 992 /* link the object above us */
1116 if (op->above) 993 if (above)
1117 op->above->below = op->below; 994 above->below = below;
1118 else 995 else
1119 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 */
1120 997
1121 /* Relink the object below us, if there is one */ 998 /* Relink the object below us, if there is one */
1122 if (op->below) 999 if (below)
1123 op->below->above = op->above; 1000 below->above = above;
1124 else 1001 else
1125 { 1002 {
1126 /* 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
1127 * use translated coordinates in case some oddness with map tiling is 1004 * use translated coordinates in case some oddness with map tiling is
1128 * evident 1005 * evident
1129 */ 1006 */
1130 if (GET_MAP_OB (m, x, y) != op) 1007 if (GET_MAP_OB (map, x, y) != this)
1131 { 1008 {
1132 char *dump = dump_object (op); 1009 char *dump = dump_object (this);
1133 LOG (llevError, 1010 LOG (llevError,
1134 "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);
1135 free (dump); 1012 free (dump);
1136 dump = dump_object (GET_MAP_OB (m, x, y)); 1013 dump = dump_object (GET_MAP_OB (map, x, y));
1137 LOG (llevError, "%s\n", dump); 1014 LOG (llevError, "%s\n", dump);
1138 free (dump); 1015 free (dump);
1139 } 1016 }
1140 1017
1141 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1018 map->at (x, y).bot = above; /* goes on above it. */
1142 } 1019 }
1143 1020
1144 op->above = 0; 1021 above = 0;
1145 op->below = 0; 1022 below = 0;
1146 1023
1147 if (op->map->in_memory == MAP_SAVING) 1024 if (map->in_memory == MAP_SAVING)
1148 return; 1025 return;
1149 1026
1150 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1027 int check_walk_off = !flag [FLAG_NO_APPLY];
1151 1028
1152 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1029 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1153 { 1030 {
1154 /* 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
1155 * being removed. 1032 * being removed.
1156 */ 1033 */
1157 1034
1158 if (tmp->type == PLAYER && tmp != op) 1035 if (tmp->type == PLAYER && tmp != this)
1159 { 1036 {
1160 /* If a container that the player is currently using somehow gets 1037 /* If a container that the player is currently using somehow gets
1161 * removed (most likely destroyed), update the player view 1038 * removed (most likely destroyed), update the player view
1162 * appropriately. 1039 * appropriately.
1163 */ 1040 */
1164 if (tmp->container == op) 1041 if (tmp->container == this)
1165 { 1042 {
1166 CLEAR_FLAG (op, FLAG_APPLIED); 1043 flag [FLAG_APPLIED] = 0;
1167 tmp->container = NULL; 1044 tmp->container = 0;
1168 } 1045 }
1169 1046
1170 tmp->contr->socket.update_look = 1; 1047 if (tmp->contr->ns)
1048 tmp->contr->ns->floorbox_update ();
1171 } 1049 }
1172 1050
1173 /* See if player moving off should effect something */ 1051 /* See if player moving off should effect something */
1174 if (check_walk_off 1052 if (check_walk_off
1175 && ((op->move_type & tmp->move_off) 1053 && ((move_type & tmp->move_off)
1176 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1054 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1177 { 1055 {
1178 move_apply (tmp, op, NULL); 1056 move_apply (tmp, this, 0);
1179 1057
1180 if (op->destroyed ()) 1058 if (destroyed ())
1181 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 ());
1182 } 1060 }
1183 1061
1184 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1062 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1185 1063
1186 if (tmp->above == tmp) 1064 if (tmp->above == tmp)
1187 tmp->above = NULL; 1065 tmp->above = 0;
1188 1066
1189 last = tmp; 1067 last = tmp;
1190 } 1068 }
1191 1069
1192 /* last == NULL of there are no objects on this space */ 1070 /* last == NULL of there are no objects on this space */
1193 if (last == NULL) 1071 if (!last)
1194 { 1072 map->at (x, y).flags_ = P_NEED_UPDATE;
1195 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1196 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1197 * those out anyways, and if there are any flags set right now, they won't
1198 * be correct anyways.
1199 */
1200 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1201 update_position (op->map, op->x, op->y);
1202 }
1203 else 1073 else
1204 update_object (last, UP_OBJ_REMOVE); 1074 update_object (last, UP_OBJ_REMOVE);
1205 1075
1206 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1207 update_all_los (op->map, op->x, op->y); 1077 update_all_los (map, x, y);
1208 } 1078 }
1209} 1079}
1210 1080
1211/* 1081/*
1212 * merge_ob(op,top): 1082 * merge_ob(op,top):
… …
1220merge_ob (object *op, object *top) 1090merge_ob (object *op, object *top)
1221{ 1091{
1222 if (!op->nrof) 1092 if (!op->nrof)
1223 return 0; 1093 return 0;
1224 1094
1225 if (top == NULL) 1095 if (top)
1226 for (top = op; top != NULL && top->above != NULL; top = top->above); 1096 for (top = op; top && top->above; top = top->above)
1097 ;
1227 1098
1228 for (; top != NULL; top = top->below) 1099 for (; top; top = top->below)
1229 { 1100 {
1230 if (top == op) 1101 if (top == op)
1231 continue; 1102 continue;
1232 if (CAN_MERGE (op, top)) 1103
1104 if (object::can_merge (op, top))
1233 { 1105 {
1234 top->nrof += op->nrof; 1106 top->nrof += op->nrof;
1235 1107
1236/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1108/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1237 op->weight = 0; /* Don't want any adjustements now */ 1109 op->weight = 0; /* Don't want any adjustements now */
1238 remove_ob (op); 1110 op->destroy ();
1239 free_object (op);
1240 return top; 1111 return top;
1241 } 1112 }
1242 } 1113 }
1243 1114
1244 return 0; 1115 return 0;
… …
1283 * Return value: 1154 * Return value:
1284 * new object if 'op' was merged with other object 1155 * new object if 'op' was merged with other object
1285 * NULL if 'op' was destroyed 1156 * NULL if 'op' was destroyed
1286 * just 'op' otherwise 1157 * just 'op' otherwise
1287 */ 1158 */
1288
1289object * 1159object *
1290insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1291{ 1161{
1292 object *tmp, *top, *floor = NULL; 1162 object *tmp, *top, *floor = NULL;
1293 sint16 x, y; 1163 sint16 x, y;
… …
1327 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1328 free (dump); 1198 free (dump);
1329 return op; 1199 return op;
1330 } 1200 }
1331 1201
1332 if (op->more != NULL) 1202 if (op->more)
1333 { 1203 {
1334 /* The part may be on a different map. */ 1204 /* The part may be on a different map. */
1335 1205
1336 object *more = op->more; 1206 object *more = op->more;
1337 1207
… …
1353 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1354 { 1224 {
1355 if (!op->head) 1225 if (!op->head)
1356 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1357 1227
1358 return NULL; 1228 return 0;
1359 } 1229 }
1360 } 1230 }
1361 1231
1362 CLEAR_FLAG (op, FLAG_REMOVED); 1232 CLEAR_FLAG (op, FLAG_REMOVED);
1363 1233
… …
1371 1241
1372 /* this has to be done after we translate the coordinates. 1242 /* this has to be done after we translate the coordinates.
1373 */ 1243 */
1374 if (op->nrof && !(flag & INS_NO_MERGE)) 1244 if (op->nrof && !(flag & INS_NO_MERGE))
1375 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1376 if (CAN_MERGE (op, tmp)) 1246 if (object::can_merge (op, tmp))
1377 { 1247 {
1378 op->nrof += tmp->nrof; 1248 op->nrof += tmp->nrof;
1379 remove_ob (tmp); 1249 tmp->destroy ();
1380 free_object (tmp);
1381 } 1250 }
1382 1251
1383 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1252 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1384 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1253 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1385 1254
… …
1398 op->below = originator->below; 1267 op->below = originator->below;
1399 1268
1400 if (op->below) 1269 if (op->below)
1401 op->below->above = op; 1270 op->below->above = op;
1402 else 1271 else
1403 SET_MAP_OB (op->map, op->x, op->y, op); 1272 op->ms ().bot = op;
1404 1273
1405 /* since *below* originator, no need to update top */ 1274 /* since *below* originator, no need to update top */
1406 originator->below = op; 1275 originator->below = op;
1407 } 1276 }
1408 else 1277 else
… …
1454 * If INS_ON_TOP is used, don't do this processing 1323 * If INS_ON_TOP is used, don't do this processing
1455 * Need to find the object that in fact blocks view, otherwise 1324 * Need to find the object that in fact blocks view, otherwise
1456 * stacking is a bit odd. 1325 * stacking is a bit odd.
1457 */ 1326 */
1458 if (!(flag & INS_ON_TOP) && 1327 if (!(flag & INS_ON_TOP) &&
1459 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1328 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1460 { 1329 {
1461 for (last = top; last != floor; last = last->below) 1330 for (last = top; last != floor; last = last->below)
1462 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1331 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1463 break; 1332 break;
1464 /* Check to see if we found the object that blocks view, 1333 /* Check to see if we found the object that blocks view,
… …
1487 1356
1488 if (op->above) 1357 if (op->above)
1489 op->above->below = op; 1358 op->above->below = op;
1490 1359
1491 op->below = NULL; 1360 op->below = NULL;
1492 SET_MAP_OB (op->map, op->x, op->y, op); 1361 op->ms ().bot = op;
1493 } 1362 }
1494 else 1363 else
1495 { /* get inserted into the stack above top */ 1364 { /* get inserted into the stack above top */
1496 op->above = top->above; 1365 op->above = top->above;
1497 1366
… …
1501 op->below = top; 1370 op->below = top;
1502 top->above = op; 1371 top->above = op;
1503 } 1372 }
1504 1373
1505 if (op->above == NULL) 1374 if (op->above == NULL)
1506 SET_MAP_TOP (op->map, op->x, op->y, op); 1375 op->ms ().top = op;
1507 } /* else not INS_BELOW_ORIGINATOR */ 1376 } /* else not INS_BELOW_ORIGINATOR */
1508 1377
1509 if (op->type == PLAYER) 1378 if (op->type == PLAYER)
1510 op->contr->do_los = 1; 1379 op->contr->do_los = 1;
1511 1380
1512 /* If we have a floor, we know the player, if any, will be above 1381 /* If we have a floor, we know the player, if any, will be above
1513 * it, so save a few ticks and start from there. 1382 * it, so save a few ticks and start from there.
1514 */ 1383 */
1515 if (!(flag & INS_MAP_LOAD)) 1384 if (!(flag & INS_MAP_LOAD))
1516 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1385 if (object *pl = op->ms ().player ())
1517 if (tmp->type == PLAYER) 1386 if (pl->contr->ns)
1518 tmp->contr->socket.update_look = 1; 1387 pl->contr->ns->floorbox_update ();
1519 1388
1520 /* If this object glows, it may affect lighting conditions that are 1389 /* If this object glows, it may affect lighting conditions that are
1521 * visible to others on this map. But update_all_los is really 1390 * visible to others on this map. But update_all_los is really
1522 * an inefficient way to do this, as it means los for all players 1391 * an inefficient way to do this, as it means los for all players
1523 * on the map will get recalculated. The players could very well 1392 * on the map will get recalculated. The players could very well
1524 * be far away from this change and not affected in any way - 1393 * be far away from this change and not affected in any way -
1525 * this should get redone to only look for players within range, 1394 * this should get redone to only look for players within range,
1526 * or just updating the P_NEED_UPDATE for spaces within this area 1395 * or just updating the P_NEED_UPDATE for spaces within this area
1527 * of effect may be sufficient. 1396 * of effect may be sufficient.
1528 */ 1397 */
1529 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1398 if (op->map->darkness && (op->glow_radius != 0))
1530 update_all_los (op->map, op->x, op->y); 1399 update_all_los (op->map, op->x, op->y);
1531 1400
1532 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1401 /* updates flags (blocked, alive, no magic, etc) for this map space */
1533 update_object (op, UP_OBJ_INSERT); 1402 update_object (op, UP_OBJ_INSERT);
1534 1403
1404 INVOKE_OBJECT (INSERT, op);
1405
1535 /* Don't know if moving this to the end will break anything. However, 1406 /* Don't know if moving this to the end will break anything. However,
1536 * we want to have update_look set above before calling this. 1407 * we want to have floorbox_update called before calling this.
1537 * 1408 *
1538 * check_move_on() must be after this because code called from 1409 * check_move_on() must be after this because code called from
1539 * check_move_on() depends on correct map flags (so functions like 1410 * check_move_on() depends on correct map flags (so functions like
1540 * blocked() and wall() work properly), and these flags are updated by 1411 * blocked() and wall() work properly), and these flags are updated by
1541 * update_object(). 1412 * update_object().
… …
1543 1414
1544 /* if this is not the head or flag has been passed, don't check walk on status */ 1415 /* if this is not the head or flag has been passed, don't check walk on status */
1545 if (!(flag & INS_NO_WALK_ON) && !op->head) 1416 if (!(flag & INS_NO_WALK_ON) && !op->head)
1546 { 1417 {
1547 if (check_move_on (op, originator)) 1418 if (check_move_on (op, originator))
1548 return NULL; 1419 return 0;
1549 1420
1550 /* If we are a multi part object, lets work our way through the check 1421 /* If we are a multi part object, lets work our way through the check
1551 * walk on's. 1422 * walk on's.
1552 */ 1423 */
1553 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1424 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1554 if (check_move_on (tmp, originator)) 1425 if (check_move_on (tmp, originator))
1555 return NULL; 1426 return 0;
1556 } 1427 }
1557 1428
1558 return op; 1429 return op;
1559} 1430}
1560 1431
1561/* this function inserts an object in the map, but if it 1432/* this function inserts an object in the map, but if it
1562 * finds an object of its own type, it'll remove that one first. 1433 * finds an object of its own type, it'll remove that one first.
1563 * op is the object to insert it under: supplies x and the map. 1434 * op is the object to insert it under: supplies x and the map.
1564 */ 1435 */
1565void 1436void
1566replace_insert_ob_in_map (const char *arch_string, object *op) 1437replace_insert_ob_in_map (const char *arch_string, object *op)
1567{ 1438{
1568 object * 1439 object *tmp, *tmp1;
1569 tmp;
1570 object *
1571 tmp1;
1572 1440
1573 /* first search for itself and remove any old instances */ 1441 /* first search for itself and remove any old instances */
1574 1442
1575 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1443 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1576 {
1577 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1444 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1578 { 1445 tmp->destroy ();
1579 remove_ob (tmp);
1580 free_object (tmp);
1581 }
1582 }
1583 1446
1584 tmp1 = arch_to_object (archetype::find (arch_string)); 1447 tmp1 = arch_to_object (archetype::find (arch_string));
1585 1448
1586 tmp1->x = op->x; 1449 tmp1->x = op->x;
1587 tmp1->y = op->y; 1450 tmp1->y = op->y;
… …
1597 */ 1460 */
1598 1461
1599object * 1462object *
1600get_split_ob (object *orig_ob, uint32 nr) 1463get_split_ob (object *orig_ob, uint32 nr)
1601{ 1464{
1602 object * 1465 object *newob;
1603 newob;
1604 int
1605 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1466 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1606 1467
1607 if (orig_ob->nrof < nr) 1468 if (orig_ob->nrof < nr)
1608 { 1469 {
1609 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);
1610 return NULL; 1471 return NULL;
1611 } 1472 }
1612 1473
1613 newob = object_create_clone (orig_ob); 1474 newob = object_create_clone (orig_ob);
1614 1475
1615 if ((orig_ob->nrof -= nr) < 1) 1476 if ((orig_ob->nrof -= nr) < 1)
1616 { 1477 orig_ob->destroy (1);
1617 if (!is_removed)
1618 remove_ob (orig_ob);
1619 free_object2 (orig_ob, 1);
1620 }
1621 else if (!is_removed) 1478 else if (!is_removed)
1622 { 1479 {
1623 if (orig_ob->env != NULL) 1480 if (orig_ob->env != NULL)
1624 sub_weight (orig_ob->env, orig_ob->weight * nr); 1481 sub_weight (orig_ob->env, orig_ob->weight * nr);
1625 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)
… …
1645 1502
1646object * 1503object *
1647decrease_ob_nr (object *op, uint32 i) 1504decrease_ob_nr (object *op, uint32 i)
1648{ 1505{
1649 object *tmp; 1506 object *tmp;
1650 player *pl;
1651 1507
1652 if (i == 0) /* objects with op->nrof require this check */ 1508 if (i == 0) /* objects with op->nrof require this check */
1653 return op; 1509 return op;
1654 1510
1655 if (i > op->nrof) 1511 if (i > op->nrof)
1656 i = op->nrof; 1512 i = op->nrof;
1657 1513
1658 if (QUERY_FLAG (op, FLAG_REMOVED)) 1514 if (QUERY_FLAG (op, FLAG_REMOVED))
1659 op->nrof -= i; 1515 op->nrof -= i;
1660 else if (op->env != NULL) 1516 else if (op->env)
1661 { 1517 {
1662 /* is this object in the players inventory, or sub container 1518 /* is this object in the players inventory, or sub container
1663 * therein? 1519 * therein?
1664 */ 1520 */
1665 tmp = is_player_inv (op->env); 1521 tmp = op->in_player ();
1666 /* nope. Is this a container the player has opened? 1522 /* nope. Is this a container the player has opened?
1667 * If so, set tmp to that player. 1523 * If so, set tmp to that player.
1668 * IMO, searching through all the players will mostly 1524 * IMO, searching through all the players will mostly
1669 * likely be quicker than following op->env to the map, 1525 * likely be quicker than following op->env to the map,
1670 * and then searching the map for a player. 1526 * and then searching the map for a player.
1671 */ 1527 */
1672 if (!tmp) 1528 if (!tmp)
1673 { 1529 for_all_players (pl)
1674 for (pl = first_player; pl; pl = pl->next)
1675 if (pl->ob->container == op->env) 1530 if (pl->ob->container == op->env)
1531 {
1532 tmp = pl->ob;
1676 break; 1533 break;
1677 if (pl)
1678 tmp = pl->ob;
1679 else
1680 tmp = NULL;
1681 } 1534 }
1682 1535
1683 if (i < op->nrof) 1536 if (i < op->nrof)
1684 { 1537 {
1685 sub_weight (op->env, op->weight * i); 1538 sub_weight (op->env, op->weight * i);
1686 op->nrof -= i; 1539 op->nrof -= i;
1687 if (tmp) 1540 if (tmp)
1688 {
1689 esrv_send_item (tmp, op); 1541 esrv_send_item (tmp, op);
1690 }
1691 } 1542 }
1692 else 1543 else
1693 { 1544 {
1694 remove_ob (op); 1545 op->remove ();
1695 op->nrof = 0; 1546 op->nrof = 0;
1696 if (tmp) 1547 if (tmp)
1697 {
1698 esrv_del_item (tmp->contr, op->count); 1548 esrv_del_item (tmp->contr, op->count);
1699 }
1700 } 1549 }
1701 } 1550 }
1702 else 1551 else
1703 { 1552 {
1704 object *above = op->above; 1553 object *above = op->above;
1705 1554
1706 if (i < op->nrof) 1555 if (i < op->nrof)
1707 op->nrof -= i; 1556 op->nrof -= i;
1708 else 1557 else
1709 { 1558 {
1710 remove_ob (op); 1559 op->remove ();
1711 op->nrof = 0; 1560 op->nrof = 0;
1712 } 1561 }
1713 1562
1714 /* Since we just removed op, op->above is null */ 1563 /* Since we just removed op, op->above is null */
1715 for (tmp = above; tmp != NULL; tmp = tmp->above) 1564 for (tmp = above; tmp; tmp = tmp->above)
1716 if (tmp->type == PLAYER) 1565 if (tmp->type == PLAYER)
1717 { 1566 {
1718 if (op->nrof) 1567 if (op->nrof)
1719 esrv_send_item (tmp, op); 1568 esrv_send_item (tmp, op);
1720 else 1569 else
… …
1724 1573
1725 if (op->nrof) 1574 if (op->nrof)
1726 return op; 1575 return op;
1727 else 1576 else
1728 { 1577 {
1729 free_object (op); 1578 op->destroy ();
1730 return NULL; 1579 return 0;
1731 } 1580 }
1732} 1581}
1733 1582
1734/* 1583/*
1735 * add_weight(object, weight) adds the specified weight to an object, 1584 * add_weight(object, weight) adds the specified weight to an object,
… …
1747 op->carrying += weight; 1596 op->carrying += weight;
1748 op = op->env; 1597 op = op->env;
1749 } 1598 }
1750} 1599}
1751 1600
1752/*
1753 * insert_ob_in_ob(op,environment):
1754 * This function inserts the object op in the linked list
1755 * inside the object environment.
1756 *
1757 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1758 * the inventory at the last position or next to other objects of the same
1759 * type.
1760 * Frank: Now sorted by type, archetype and magic!
1761 *
1762 * The function returns now pointer to inserted item, and return value can
1763 * be != op, if items are merged. -Tero
1764 */
1765
1766object * 1601object *
1767insert_ob_in_ob (object *op, object *where) 1602insert_ob_in_ob (object *op, object *where)
1768{ 1603{
1769 object * 1604 if (!where)
1770 tmp, *
1771 otmp;
1772
1773 if (!QUERY_FLAG (op, FLAG_REMOVED))
1774 {
1775 char *dump = dump_object (op);
1776 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1777 free (dump);
1778 return op;
1779 }
1780
1781 if (where == NULL)
1782 { 1605 {
1783 char *dump = dump_object (op); 1606 char *dump = dump_object (op);
1784 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);
1785 free (dump); 1608 free (dump);
1786 return op; 1609 return op;
1787 } 1610 }
1788 1611
1789 if (where->head) 1612 if (where->head)
1790 { 1613 {
1791 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");
1792 where = where->head; 1615 where = where->head;
1793 } 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 ();
1794 1637
1795 if (op->more) 1638 if (op->more)
1796 { 1639 {
1797 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);
1798 return op; 1641 return op;
… …
1800 1643
1801 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1644 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1802 CLEAR_FLAG (op, FLAG_REMOVED); 1645 CLEAR_FLAG (op, FLAG_REMOVED);
1803 if (op->nrof) 1646 if (op->nrof)
1804 { 1647 {
1805 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1648 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1806 if (CAN_MERGE (tmp, op)) 1649 if (object::can_merge (tmp, op))
1807 { 1650 {
1808 /* return the original object and remove inserted object 1651 /* return the original object and remove inserted object
1809 (client needs the original object) */ 1652 (client needs the original object) */
1810 tmp->nrof += op->nrof; 1653 tmp->nrof += op->nrof;
1811 /* Weight handling gets pretty funky. Since we are adding to 1654 /* Weight handling gets pretty funky. Since we are adding to
1812 * tmp->nrof, we need to increase the weight. 1655 * tmp->nrof, we need to increase the weight.
1813 */ 1656 */
1814 add_weight (where, op->weight * op->nrof); 1657 add_weight (this, op->weight * op->nrof);
1815 SET_FLAG (op, FLAG_REMOVED); 1658 SET_FLAG (op, FLAG_REMOVED);
1816 free_object (op); /* free the inserted object */ 1659 op->destroy (); /* free the inserted object */
1817 op = tmp; 1660 op = tmp;
1818 remove_ob (op); /* and fix old object's links */ 1661 op->remove (); /* and fix old object's links */
1819 CLEAR_FLAG (op, FLAG_REMOVED); 1662 CLEAR_FLAG (op, FLAG_REMOVED);
1820 break; 1663 break;
1821 } 1664 }
1822 1665
1823 /* I assume combined objects have no inventory 1666 /* I assume combined objects have no inventory
1824 * We add the weight - this object could have just been removed 1667 * We add the weight - this object could have just been removed
1825 * (if it was possible to merge). calling remove_ob will subtract 1668 * (if it was possible to merge). calling remove_ob will subtract
1826 * 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
1827 * the linking below 1670 * the linking below
1828 */ 1671 */
1829 add_weight (where, op->weight * op->nrof); 1672 add_weight (this, op->weight * op->nrof);
1830 } 1673 }
1831 else 1674 else
1832 add_weight (where, (op->weight + op->carrying)); 1675 add_weight (this, (op->weight + op->carrying));
1833 1676
1834 otmp = is_player_inv (where); 1677 otmp = this->in_player ();
1835 if (otmp && otmp->contr != NULL) 1678 if (otmp && otmp->contr)
1836 {
1837 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1679 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1838 fix_player (otmp); 1680 otmp->update_stats ();
1839 }
1840 1681
1841 op->map = NULL; 1682 op->map = 0;
1842 op->env = where; 1683 op->env = this;
1843 op->above = NULL; 1684 op->above = 0;
1844 op->below = NULL; 1685 op->below = 0;
1845 op->x = 0, op->y = 0; 1686 op->x = 0, op->y = 0;
1846 1687
1847 /* 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 */
1848 if ((op->glow_radius != 0) && where->map) 1689 if ((op->glow_radius != 0) && map)
1849 { 1690 {
1850#ifdef DEBUG_LIGHTS 1691#ifdef DEBUG_LIGHTS
1851 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);
1852#endif /* DEBUG_LIGHTS */ 1693#endif /* DEBUG_LIGHTS */
1853 if (MAP_DARKNESS (where->map)) 1694 if (map->darkness)
1854 update_all_los (where->map, where->x, where->y); 1695 update_all_los (map, x, y);
1855 } 1696 }
1856 1697
1857 /* 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.
1858 * It sure simplifies this function... 1699 * It sure simplifies this function...
1859 */ 1700 */
1860 if (where->inv == NULL) 1701 if (!inv)
1861 where->inv = op; 1702 inv = op;
1862 else 1703 else
1863 { 1704 {
1864 op->below = where->inv; 1705 op->below = inv;
1865 op->below->above = op; 1706 op->below->above = op;
1866 where->inv = op; 1707 inv = op;
1867 } 1708 }
1709
1710 INVOKE_OBJECT (INSERT, this);
1711
1868 return op; 1712 return op;
1869} 1713}
1870 1714
1871/* 1715/*
1872 * Checks if any objects has a move_type that matches objects 1716 * Checks if any objects has a move_type that matches objects
… …
1923 1767
1924 /* The objects have to be checked from top to bottom. 1768 /* The objects have to be checked from top to bottom.
1925 * Hence, we first go to the top: 1769 * Hence, we first go to the top:
1926 */ 1770 */
1927 1771
1928 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1772 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1929 { 1773 {
1930 /* Trim the search when we find the first other spell effect 1774 /* Trim the search when we find the first other spell effect
1931 * this helps performance so that if a space has 50 spell objects, 1775 * this helps performance so that if a space has 50 spell objects,
1932 * we don't need to check all of them. 1776 * we don't need to check all of them.
1933 */ 1777 */
… …
1988/* 1832/*
1989 * present_arch(arch, map, x, y) searches for any objects with 1833 * present_arch(arch, map, x, y) searches for any objects with
1990 * a matching archetype at the given map and coordinates. 1834 * a matching archetype at the given map and coordinates.
1991 * The first matching object is returned, or NULL if none. 1835 * The first matching object is returned, or NULL if none.
1992 */ 1836 */
1993
1994object * 1837object *
1995present_arch (const archetype *at, maptile *m, int x, int y) 1838present_arch (const archetype *at, maptile *m, int x, int y)
1996{ 1839{
1997 object *
1998 tmp;
1999
2000 if (m == NULL || out_of_map (m, x, y)) 1840 if (m == NULL || out_of_map (m, x, y))
2001 { 1841 {
2002 LOG (llevError, "Present_arch called outside map.\n"); 1842 LOG (llevError, "Present_arch called outside map.\n");
2003 return NULL; 1843 return NULL;
2004 } 1844 }
1845
2005 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1846 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2006 if (tmp->arch == at) 1847 if (tmp->arch == at)
2007 return tmp; 1848 return tmp;
1849
2008 return NULL; 1850 return NULL;
2009} 1851}
2010 1852
2011/* 1853/*
2012 * present(type, map, x, y) searches for any objects with 1854 * present(type, map, x, y) searches for any objects with
2013 * a matching type variable at the given map and coordinates. 1855 * a matching type variable at the given map and coordinates.
2014 * The first matching object is returned, or NULL if none. 1856 * The first matching object is returned, or NULL if none.
2015 */ 1857 */
2016
2017object * 1858object *
2018present (unsigned char type, maptile *m, int x, int y) 1859present (unsigned char type, maptile *m, int x, int y)
2019{ 1860{
2020 object *
2021 tmp;
2022
2023 if (out_of_map (m, x, y)) 1861 if (out_of_map (m, x, y))
2024 { 1862 {
2025 LOG (llevError, "Present called outside map.\n"); 1863 LOG (llevError, "Present called outside map.\n");
2026 return NULL; 1864 return NULL;
2027 } 1865 }
1866
2028 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1867 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2029 if (tmp->type == type) 1868 if (tmp->type == type)
2030 return tmp; 1869 return tmp;
1870
2031 return NULL; 1871 return NULL;
2032} 1872}
2033 1873
2034/* 1874/*
2035 * present_in_ob(type, object) searches for any objects with 1875 * present_in_ob(type, object) searches for any objects with
2036 * a matching type variable in the inventory of the given object. 1876 * a matching type variable in the inventory of the given object.
2037 * The first matching object is returned, or NULL if none. 1877 * The first matching object is returned, or NULL if none.
2038 */ 1878 */
2039
2040object * 1879object *
2041present_in_ob (unsigned char type, const object *op) 1880present_in_ob (unsigned char type, const object *op)
2042{ 1881{
2043 object *
2044 tmp;
2045
2046 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1882 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047 if (tmp->type == type) 1883 if (tmp->type == type)
2048 return tmp; 1884 return tmp;
1885
2049 return NULL; 1886 return NULL;
2050} 1887}
2051 1888
2052/* 1889/*
2053 * present_in_ob (type, str, object) searches for any objects with 1890 * present_in_ob (type, str, object) searches for any objects with
… …
2061 * str is the string to match against. Note that we match against 1898 * str is the string to match against. Note that we match against
2062 * the object name, not the archetype name. this is so that the 1899 * the object name, not the archetype name. this is so that the
2063 * spell code can use one object type (force), but change it's name 1900 * spell code can use one object type (force), but change it's name
2064 * to be unique. 1901 * to be unique.
2065 */ 1902 */
2066
2067object * 1903object *
2068present_in_ob_by_name (int type, const char *str, const object *op) 1904present_in_ob_by_name (int type, const char *str, const object *op)
2069{ 1905{
2070 object *
2071 tmp;
2072
2073 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1906 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2074 {
2075 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1907 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2076 return tmp; 1908 return tmp;
2077 } 1909
2078 return NULL; 1910 return 0;
2079} 1911}
2080 1912
2081/* 1913/*
2082 * present_arch_in_ob(archetype, object) searches for any objects with 1914 * present_arch_in_ob(archetype, object) searches for any objects with
2083 * a matching archetype in the inventory of the given object. 1915 * a matching archetype in the inventory of the given object.
2084 * The first matching object is returned, or NULL if none. 1916 * The first matching object is returned, or NULL if none.
2085 */ 1917 */
2086
2087object * 1918object *
2088present_arch_in_ob (const archetype *at, const object *op) 1919present_arch_in_ob (const archetype *at, const object *op)
2089{ 1920{
2090 object *
2091 tmp;
2092
2093 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1921 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2094 if (tmp->arch == at) 1922 if (tmp->arch == at)
2095 return tmp; 1923 return tmp;
1924
2096 return NULL; 1925 return NULL;
2097} 1926}
2098 1927
2099/* 1928/*
2100 * activate recursively a flag on an object inventory 1929 * activate recursively a flag on an object inventory
2101 */ 1930 */
2102void 1931void
2103flag_inv (object *op, int flag) 1932flag_inv (object *op, int flag)
2104{ 1933{
2105 object *
2106 tmp;
2107
2108 if (op->inv) 1934 if (op->inv)
2109 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1935 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2110 { 1936 {
2111 SET_FLAG (tmp, flag); 1937 SET_FLAG (tmp, flag);
2112 flag_inv (tmp, flag); 1938 flag_inv (tmp, flag);
2113 } 1939 }
2114} /* 1940}
1941
1942/*
2115 * desactivate recursively a flag on an object inventory 1943 * deactivate recursively a flag on an object inventory
2116 */ 1944 */
2117void 1945void
2118unflag_inv (object *op, int flag) 1946unflag_inv (object *op, int flag)
2119{ 1947{
2120 object *
2121 tmp;
2122
2123 if (op->inv) 1948 if (op->inv)
2124 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1949 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2125 { 1950 {
2126 CLEAR_FLAG (tmp, flag); 1951 CLEAR_FLAG (tmp, flag);
2127 unflag_inv (tmp, flag); 1952 unflag_inv (tmp, flag);
2128 } 1953 }
2129} 1954}
… …
2132 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1957 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2133 * all it's inventory (recursively). 1958 * all it's inventory (recursively).
2134 * If checksums are used, a player will get set_cheat called for 1959 * If checksums are used, a player will get set_cheat called for
2135 * him/her-self and all object carried by a call to this function. 1960 * him/her-self and all object carried by a call to this function.
2136 */ 1961 */
2137
2138void 1962void
2139set_cheat (object *op) 1963set_cheat (object *op)
2140{ 1964{
2141 SET_FLAG (op, FLAG_WAS_WIZ); 1965 SET_FLAG (op, FLAG_WAS_WIZ);
2142 flag_inv (op, FLAG_WAS_WIZ); 1966 flag_inv (op, FLAG_WAS_WIZ);
… …
2161 * because arch_blocked (now ob_blocked) needs to know the movement type 1985 * because arch_blocked (now ob_blocked) needs to know the movement type
2162 * to know if the space in question will block the object. We can't use 1986 * to know if the space in question will block the object. We can't use
2163 * the archetype because that isn't correct if the monster has been 1987 * the archetype because that isn't correct if the monster has been
2164 * customized, changed states, etc. 1988 * customized, changed states, etc.
2165 */ 1989 */
2166
2167int 1990int
2168find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1991find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2169{ 1992{
2170 int
2171 i,
2172 index = 0, flag; 1993 int index = 0, flag;
2173 static int
2174 altern[SIZEOFFREE]; 1994 int altern[SIZEOFFREE];
2175 1995
2176 for (i = start; i < stop; i++) 1996 for (int i = start; i < stop; i++)
2177 { 1997 {
2178 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1998 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2179 if (!flag) 1999 if (!flag)
2180 altern[index++] = i; 2000 altern [index++] = i;
2181 2001
2182 /* Basically, if we find a wall on a space, we cut down the search size. 2002 /* Basically, if we find a wall on a space, we cut down the search size.
2183 * In this way, we won't return spaces that are on another side of a wall. 2003 * In this way, we won't return spaces that are on another side of a wall.
2184 * This mostly work, but it cuts down the search size in all directions - 2004 * This mostly work, but it cuts down the search size in all directions -
2185 * if the space being examined only has a wall to the north and empty 2005 * if the space being examined only has a wall to the north and empty
2186 * spaces in all the other directions, this will reduce the search space 2006 * spaces in all the other directions, this will reduce the search space
2187 * to only the spaces immediately surrounding the target area, and 2007 * to only the spaces immediately surrounding the target area, and
2188 * won't look 2 spaces south of the target space. 2008 * won't look 2 spaces south of the target space.
2189 */ 2009 */
2190 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2010 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2191 stop = maxfree[i]; 2011 stop = maxfree[i];
2192 } 2012 }
2013
2193 if (!index) 2014 if (!index)
2194 return -1; 2015 return -1;
2016
2195 return altern[RANDOM () % index]; 2017 return altern[RANDOM () % index];
2196} 2018}
2197 2019
2198/* 2020/*
2199 * find_first_free_spot(archetype, maptile, x, y) works like 2021 * find_first_free_spot(archetype, maptile, x, y) works like
2200 * find_free_spot(), but it will search max number of squares. 2022 * find_free_spot(), but it will search max number of squares.
2201 * But it will return the first available spot, not a random choice. 2023 * But it will return the first available spot, not a random choice.
2202 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2024 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2203 */ 2025 */
2204
2205int 2026int
2206find_first_free_spot (const object *ob, maptile *m, int x, int y) 2027find_first_free_spot (const object *ob, maptile *m, int x, int y)
2207{ 2028{
2208 int
2209 i;
2210
2211 for (i = 0; i < SIZEOFFREE; i++) 2029 for (int i = 0; i < SIZEOFFREE; i++)
2212 {
2213 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2030 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2214 return i; 2031 return i;
2215 } 2032
2216 return -1; 2033 return -1;
2217} 2034}
2218 2035
2219/* 2036/*
2220 * The function permute(arr, begin, end) randomly reorders the array 2037 * The function permute(arr, begin, end) randomly reorders the array
2221 * arr[begin..end-1]. 2038 * arr[begin..end-1].
2039 * now uses a fisher-yates shuffle, old permute was broken
2222 */ 2040 */
2223static void 2041static void
2224permute (int *arr, int begin, int end) 2042permute (int *arr, int begin, int end)
2225{ 2043{
2226 int 2044 arr += begin;
2227 i,
2228 j,
2229 tmp,
2230 len;
2231
2232 len = end - begin; 2045 end -= begin;
2233 for (i = begin; i < end; i++)
2234 {
2235 j = begin + RANDOM () % len;
2236 2046
2237 tmp = arr[i]; 2047 while (--end)
2238 arr[i] = arr[j]; 2048 swap (arr [end], arr [RANDOM () % (end + 1)]);
2239 arr[j] = tmp;
2240 }
2241} 2049}
2242 2050
2243/* new function to make monster searching more efficient, and effective! 2051/* new function to make monster searching more efficient, and effective!
2244 * This basically returns a randomized array (in the passed pointer) of 2052 * This basically returns a randomized array (in the passed pointer) of
2245 * the spaces to find monsters. In this way, it won't always look for 2053 * the spaces to find monsters. In this way, it won't always look for
… …
2248 * the 3x3 area will be searched, just not in a predictable order. 2056 * the 3x3 area will be searched, just not in a predictable order.
2249 */ 2057 */
2250void 2058void
2251get_search_arr (int *search_arr) 2059get_search_arr (int *search_arr)
2252{ 2060{
2253 int 2061 int i;
2254 i;
2255 2062
2256 for (i = 0; i < SIZEOFFREE; i++) 2063 for (i = 0; i < SIZEOFFREE; i++)
2257 {
2258 search_arr[i] = i; 2064 search_arr[i] = i;
2259 }
2260 2065
2261 permute (search_arr, 1, SIZEOFFREE1 + 1); 2066 permute (search_arr, 1, SIZEOFFREE1 + 1);
2262 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2067 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2263 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2068 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2264} 2069}
… …
2273 * Perhaps incorrectly, but I'm making the assumption that exclude 2078 * Perhaps incorrectly, but I'm making the assumption that exclude
2274 * is actually want is going to try and move there. We need this info 2079 * is actually want is going to try and move there. We need this info
2275 * because we have to know what movement the thing looking to move 2080 * because we have to know what movement the thing looking to move
2276 * there is capable of. 2081 * there is capable of.
2277 */ 2082 */
2278
2279int 2083int
2280find_dir (maptile *m, int x, int y, object *exclude) 2084find_dir (maptile *m, int x, int y, object *exclude)
2281{ 2085{
2282 int
2283 i,
2284 max = SIZEOFFREE, mflags; 2086 int i, max = SIZEOFFREE, mflags;
2285 2087
2286 sint16 nx, ny; 2088 sint16 nx, ny;
2287 object * 2089 object *tmp;
2288 tmp;
2289 maptile * 2090 maptile *mp;
2290 mp;
2291 2091
2292 MoveType blocked, move_type; 2092 MoveType blocked, move_type;
2293 2093
2294 if (exclude && exclude->head) 2094 if (exclude && exclude->head)
2295 { 2095 {
… …
2307 mp = m; 2107 mp = m;
2308 nx = x + freearr_x[i]; 2108 nx = x + freearr_x[i];
2309 ny = y + freearr_y[i]; 2109 ny = y + freearr_y[i];
2310 2110
2311 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2111 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2112
2312 if (mflags & P_OUT_OF_MAP) 2113 if (mflags & P_OUT_OF_MAP)
2313 {
2314 max = maxfree[i]; 2114 max = maxfree[i];
2315 }
2316 else 2115 else
2317 { 2116 {
2318 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2117 mapspace &ms = mp->at (nx, ny);
2118
2119 blocked = ms.move_block;
2319 2120
2320 if ((move_type & blocked) == move_type) 2121 if ((move_type & blocked) == move_type)
2321 {
2322 max = maxfree[i]; 2122 max = maxfree[i];
2323 }
2324 else if (mflags & P_IS_ALIVE) 2123 else if (mflags & P_IS_ALIVE)
2325 { 2124 {
2326 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2125 for (tmp = ms.bot; tmp; tmp = tmp->above)
2327 { 2126 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2328 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2127 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2329 {
2330 break; 2128 break;
2331 } 2129
2332 }
2333 if (tmp) 2130 if (tmp)
2334 {
2335 return freedir[i]; 2131 return freedir[i];
2336 }
2337 } 2132 }
2338 } 2133 }
2339 } 2134 }
2135
2340 return 0; 2136 return 0;
2341} 2137}
2342 2138
2343/* 2139/*
2344 * distance(object 1, object 2) will return the square of the 2140 * distance(object 1, object 2) will return the square of the
2345 * distance between the two given objects. 2141 * distance between the two given objects.
2346 */ 2142 */
2347
2348int 2143int
2349distance (const object *ob1, const object *ob2) 2144distance (const object *ob1, const object *ob2)
2350{ 2145{
2351 int
2352 i;
2353
2354 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2146 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2355 return i;
2356} 2147}
2357 2148
2358/* 2149/*
2359 * find_dir_2(delta-x,delta-y) will return a direction in which 2150 * find_dir_2(delta-x,delta-y) will return a direction in which
2360 * an object which has subtracted the x and y coordinates of another 2151 * an object which has subtracted the x and y coordinates of another
2361 * object, needs to travel toward it. 2152 * object, needs to travel toward it.
2362 */ 2153 */
2363
2364int 2154int
2365find_dir_2 (int x, int y) 2155find_dir_2 (int x, int y)
2366{ 2156{
2367 int 2157 int q;
2368 q;
2369 2158
2370 if (y) 2159 if (y)
2371 q = x * 100 / y; 2160 q = x * 100 / y;
2372 else if (x) 2161 else if (x)
2373 q = -300 * x; 2162 q = -300 * x;
… …
2408int 2197int
2409absdir (int d) 2198absdir (int d)
2410{ 2199{
2411 while (d < 1) 2200 while (d < 1)
2412 d += 8; 2201 d += 8;
2202
2413 while (d > 8) 2203 while (d > 8)
2414 d -= 8; 2204 d -= 8;
2205
2415 return d; 2206 return d;
2416} 2207}
2417 2208
2418/* 2209/*
2419 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2210 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2421 */ 2212 */
2422 2213
2423int 2214int
2424dirdiff (int dir1, int dir2) 2215dirdiff (int dir1, int dir2)
2425{ 2216{
2426 int 2217 int d;
2427 d;
2428 2218
2429 d = abs (dir1 - dir2); 2219 d = abs (dir1 - dir2);
2430 if (d > 4) 2220 if (d > 4)
2431 d = 8 - d; 2221 d = 8 - d;
2222
2432 return d; 2223 return d;
2433} 2224}
2434 2225
2435/* peterm: 2226/* peterm:
2436 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2227 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2439 * This basically means that if direction is 15, then it could either go 2230 * This basically means that if direction is 15, then it could either go
2440 * direction 4, 14, or 16 to get back to where we are. 2231 * direction 4, 14, or 16 to get back to where we are.
2441 * Moved from spell_util.c to object.c with the other related direction 2232 * Moved from spell_util.c to object.c with the other related direction
2442 * functions. 2233 * functions.
2443 */ 2234 */
2444
2445int
2446 reduction_dir[SIZEOFFREE][3] = { 2235int reduction_dir[SIZEOFFREE][3] = {
2447 {0, 0, 0}, /* 0 */ 2236 {0, 0, 0}, /* 0 */
2448 {0, 0, 0}, /* 1 */ 2237 {0, 0, 0}, /* 1 */
2449 {0, 0, 0}, /* 2 */ 2238 {0, 0, 0}, /* 2 */
2450 {0, 0, 0}, /* 3 */ 2239 {0, 0, 0}, /* 3 */
2451 {0, 0, 0}, /* 4 */ 2240 {0, 0, 0}, /* 4 */
… …
2499 * find a path to that monster that we found. If not, 2288 * find a path to that monster that we found. If not,
2500 * we don't bother going toward it. Returns 1 if we 2289 * we don't bother going toward it. Returns 1 if we
2501 * can see a direct way to get it 2290 * can see a direct way to get it
2502 * Modified to be map tile aware -.MSW 2291 * Modified to be map tile aware -.MSW
2503 */ 2292 */
2504
2505
2506int 2293int
2507can_see_monsterP (maptile *m, int x, int y, int dir) 2294can_see_monsterP (maptile *m, int x, int y, int dir)
2508{ 2295{
2509 sint16 dx, dy; 2296 sint16 dx, dy;
2510 int
2511 mflags; 2297 int mflags;
2512 2298
2513 if (dir < 0) 2299 if (dir < 0)
2514 return 0; /* exit condition: invalid direction */ 2300 return 0; /* exit condition: invalid direction */
2515 2301
2516 dx = x + freearr_x[dir]; 2302 dx = x + freearr_x[dir];
… …
2529 return 0; 2315 return 0;
2530 2316
2531 /* yes, can see. */ 2317 /* yes, can see. */
2532 if (dir < 9) 2318 if (dir < 9)
2533 return 1; 2319 return 1;
2320
2534 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2321 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2535 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2322 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2323 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2536} 2324}
2537
2538
2539 2325
2540/* 2326/*
2541 * can_pick(picker, item): finds out if an object is possible to be 2327 * can_pick(picker, item): finds out if an object is possible to be
2542 * picked up by the picker. Returnes 1 if it can be 2328 * picked up by the picker. Returnes 1 if it can be
2543 * picked up, otherwise 0. 2329 * picked up, otherwise 0.
… …
2554 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2340 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2555 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2341 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2556 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2342 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2557} 2343}
2558 2344
2559
2560/* 2345/*
2561 * create clone from object to another 2346 * create clone from object to another
2562 */ 2347 */
2563object * 2348object *
2564object_create_clone (object *asrc) 2349object_create_clone (object *asrc)
2565{ 2350{
2566 object *
2567 dst = NULL, *tmp, *src, *part, *prev, *item; 2351 object *dst = 0, *tmp, *src, *part, *prev, *item;
2568 2352
2569 if (!asrc) 2353 if (!asrc)
2570 return NULL; 2354 return 0;
2355
2571 src = asrc; 2356 src = asrc;
2572 if (src->head) 2357 if (src->head)
2573 src = src->head; 2358 src = src->head;
2574 2359
2575 prev = NULL; 2360 prev = 0;
2576 for (part = src; part; part = part->more) 2361 for (part = src; part; part = part->more)
2577 { 2362 {
2578 tmp = get_object (); 2363 tmp = part->clone ();
2579 copy_object (part, tmp);
2580 tmp->x -= src->x; 2364 tmp->x -= src->x;
2581 tmp->y -= src->y; 2365 tmp->y -= src->y;
2366
2582 if (!part->head) 2367 if (!part->head)
2583 { 2368 {
2584 dst = tmp; 2369 dst = tmp;
2585 tmp->head = NULL; 2370 tmp->head = 0;
2586 } 2371 }
2587 else 2372 else
2588 {
2589 tmp->head = dst; 2373 tmp->head = dst;
2590 } 2374
2591 tmp->more = NULL; 2375 tmp->more = 0;
2376
2592 if (prev) 2377 if (prev)
2593 prev->more = tmp; 2378 prev->more = tmp;
2379
2594 prev = tmp; 2380 prev = tmp;
2595 } 2381 }
2596 2382
2597 for (item = src->inv; item; item = item->below) 2383 for (item = src->inv; item; item = item->below)
2598 insert_ob_in_ob (object_create_clone (item), dst); 2384 insert_ob_in_ob (object_create_clone (item), dst);
… …
2604/* Basically, we save the content of the string to a temp file, then call */ 2390/* Basically, we save the content of the string to a temp file, then call */
2605/* load_object on it. I admit it is a highly inefficient way to make things, */ 2391/* load_object on it. I admit it is a highly inefficient way to make things, */
2606/* but it was simple to make and allows reusing the load_object function. */ 2392/* but it was simple to make and allows reusing the load_object function. */
2607/* Remember not to use load_object_str in a time-critical situation. */ 2393/* Remember not to use load_object_str in a time-critical situation. */
2608/* Also remember that multiparts objects are not supported for now. */ 2394/* Also remember that multiparts objects are not supported for now. */
2609
2610object * 2395object *
2611load_object_str (const char *obstr) 2396load_object_str (const char *obstr)
2612{ 2397{
2613 object *op; 2398 object *op;
2614 char filename[MAX_BUF]; 2399 char filename[MAX_BUF];
… …
2624 } 2409 }
2625 2410
2626 fprintf (tempfile, obstr); 2411 fprintf (tempfile, obstr);
2627 fclose (tempfile); 2412 fclose (tempfile);
2628 2413
2629 op = get_object (); 2414 op = object::create ();
2630 2415
2631 object_thawer thawer (filename); 2416 object_thawer thawer (filename);
2632 2417
2633 if (thawer) 2418 if (thawer)
2634 load_object (thawer, op, 0); 2419 load_object (thawer, op, 0);
… …
2644 * returns NULL if no match. 2429 * returns NULL if no match.
2645 */ 2430 */
2646object * 2431object *
2647find_obj_by_type_subtype (const object *who, int type, int subtype) 2432find_obj_by_type_subtype (const object *who, int type, int subtype)
2648{ 2433{
2649 object *tmp;
2650
2651 for (tmp = who->inv; tmp; tmp = tmp->below) 2434 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2652 if (tmp->type == type && tmp->subtype == subtype) 2435 if (tmp->type == type && tmp->subtype == subtype)
2653 return tmp; 2436 return tmp;
2654 2437
2655 return NULL; 2438 return 0;
2656} 2439}
2657 2440
2658/* If ob has a field named key, return the link from the list, 2441/* If ob has a field named key, return the link from the list,
2659 * otherwise return NULL. 2442 * otherwise return NULL.
2660 * 2443 *
… …
2662 * do the desired thing. 2445 * do the desired thing.
2663 */ 2446 */
2664key_value * 2447key_value *
2665get_ob_key_link (const object *ob, const char *key) 2448get_ob_key_link (const object *ob, const char *key)
2666{ 2449{
2667 key_value *link;
2668
2669 for (link = ob->key_values; link != NULL; link = link->next) 2450 for (key_value *link = ob->key_values; link; link = link->next)
2670 if (link->key == key) 2451 if (link->key == key)
2671 return link; 2452 return link;
2672 2453
2673 return NULL; 2454 return 0;
2674} 2455}
2675 2456
2676/* 2457/*
2677 * Returns the value of op has an extra_field for key, or NULL. 2458 * Returns the value of op has an extra_field for key, or NULL.
2678 * 2459 *
… …
2718 * Returns TRUE on success. 2499 * Returns TRUE on success.
2719 */ 2500 */
2720int 2501int
2721set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2502set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2722{ 2503{
2723 key_value *
2724 field = NULL, *last = NULL; 2504 key_value *field = NULL, *last = NULL;
2725 2505
2726 for (field = op->key_values; field != NULL; field = field->next) 2506 for (field = op->key_values; field != NULL; field = field->next)
2727 { 2507 {
2728 if (field->key != canonical_key) 2508 if (field->key != canonical_key)
2729 { 2509 {
… …
2757 /* IF we get here, key doesn't exist */ 2537 /* IF we get here, key doesn't exist */
2758 2538
2759 /* No field, we'll have to add it. */ 2539 /* No field, we'll have to add it. */
2760 2540
2761 if (!add_key) 2541 if (!add_key)
2762 {
2763 return FALSE; 2542 return FALSE;
2764 } 2543
2765 /* There isn't any good reason to store a null 2544 /* There isn't any good reason to store a null
2766 * value in the key/value list. If the archetype has 2545 * value in the key/value list. If the archetype has
2767 * this key, then we should also have it, so shouldn't 2546 * this key, then we should also have it, so shouldn't
2768 * be here. If user wants to store empty strings, 2547 * be here. If user wants to store empty strings,
2769 * should pass in "" 2548 * should pass in ""

Diff Legend

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