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

Diff Legend

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