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.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.105 by pippijn, Wed Jan 3 00:21:35 2007 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
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);
489
558 if (is_removed) 490 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
560 492
561 if (op2->speed < 0) 493 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 495
564 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
565 if (op2->key_values) 497 if (key_values)
566 { 498 {
567 key_value *tail = 0; 499 key_value *tail = 0;
568 key_value *i; 500 key_value *i;
569 501
570 op->key_values = 0; 502 dst->key_values = 0;
571 503
572 for (i = op2->key_values; i; i = i->next) 504 for (i = key_values; i; i = i->next)
573 { 505 {
574 key_value *new_link = new key_value; 506 key_value *new_link = new key_value;
575 507
576 new_link->next = 0; 508 new_link->next = 0;
577 new_link->key = i->key; 509 new_link->key = i->key;
578 new_link->value = i->value; 510 new_link->value = i->value;
579 511
580 /* Try and be clever here, too. */ 512 /* Try and be clever here, too. */
581 if (!op->key_values) 513 if (!dst->key_values)
582 { 514 {
583 op->key_values = new_link; 515 dst->key_values = new_link;
584 tail = new_link; 516 tail = new_link;
585 } 517 }
586 else 518 else
587 { 519 {
588 tail->next = new_link; 520 tail->next = new_link;
589 tail = new_link; 521 tail = new_link;
590 } 522 }
591 } 523 }
592 } 524 }
593 525
594 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;
595} 535}
596 536
597/* 537/*
598 * 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
599 * 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
600 * 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.
601 */ 541 */
602
603void 542void
604update_turn_face (object *op) 543update_turn_face (object *op)
605{ 544{
606 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 545 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
607 return; 546 return;
547
608 SET_ANIMATION (op, op->direction); 548 SET_ANIMATION (op, op->direction);
609 update_object (op, UP_OBJ_FACE); 549 update_object (op, UP_OBJ_FACE);
610} 550}
611 551
612/* 552/*
613 * 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
614 * 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.
615 * 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.
616 */ 556 */
617void 557void
618update_ob_speed (object *op) 558object::set_speed (float speed)
619{ 559{
620 extern int arch_init; 560 if (flag [FLAG_FREED] && speed)
621
622 /* No reason putting the archetypes objects on the speed list,
623 * since they never really need to be updated.
624 */
625
626 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
627 { 561 {
628 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 562 LOG (llevError, "Object %s is freed but has speed.\n", &name);
629#ifdef MANY_CORES
630 abort ();
631#else
632 op->speed = 0; 563 speed = 0;
633#endif
634 }
635
636 if (arch_init)
637 return;
638
639 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
640 { 564 }
641 /* If already on active list, don't do anything */
642 if (op->active_next || op->active_prev || op == active_objects)
643 return;
644 565
645 /* process_events() expects us to insert the object at the beginning 566 this->speed = speed;
646 * of the list. */
647 op->active_next = active_objects;
648 567
649 if (op->active_next != NULL) 568 if (has_active_speed ())
650 op->active_next->active_prev = op; 569 activate ();
651
652 active_objects = op;
653 }
654 else 570 else
655 { 571 deactivate ();
656 /* If not on the active list, nothing needs to be done */
657 if (!op->active_next && !op->active_prev && op != active_objects)
658 return;
659
660 if (op->active_prev == NULL)
661 {
662 active_objects = op->active_next;
663
664 if (op->active_next != NULL)
665 op->active_next->active_prev = NULL;
666 }
667 else
668 {
669 op->active_prev->active_next = op->active_next;
670
671 if (op->active_next)
672 op->active_next->active_prev = op->active_prev;
673 }
674
675 op->active_next = NULL;
676 op->active_prev = NULL;
677 }
678} 572}
679 573
680/* This function removes object 'op' from the list of active
681 * objects.
682 * This should only be used for style maps or other such
683 * reference maps where you don't want an object that isn't
684 * in play chewing up cpu time getting processed.
685 * The reverse of this is to call update_ob_speed, which
686 * will do the right thing based on the speed of the object.
687 */
688void
689remove_from_active_list (object *op)
690{
691 /* If not on the active list, nothing needs to be done */
692 if (!op->active_next && !op->active_prev && op != active_objects)
693 return;
694
695 if (op->active_prev == NULL)
696 {
697 active_objects = op->active_next;
698 if (op->active_next != NULL)
699 op->active_next->active_prev = NULL;
700 }
701 else
702 {
703 op->active_prev->active_next = op->active_next;
704 if (op->active_next)
705 op->active_next->active_prev = op->active_prev;
706 }
707 op->active_next = NULL;
708 op->active_prev = NULL;
709}
710
711/* 574/*
712 * update_object() updates the array which represents the map. 575 * update_object() updates the the map.
713 * It takes into account invisible objects (and represent squares covered 576 * It takes into account invisible objects (and represent squares covered
714 * 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
715 * invisible object, etc...) 578 * invisible object, etc...)
716 * 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
717 * 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
718 * updating that window, though, since update_object() is called _often_) 581 * updating that window, though, since update_object() is called _often_)
719 * 582 *
720 * 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.
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: 584 * current action are:
726 * UP_OBJ_INSERT: op was inserted 585 * UP_OBJ_INSERT: op was inserted
727 * UP_OBJ_REMOVE: op was removed 586 * UP_OBJ_REMOVE: op was removed
728 * 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
729 * 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.
730 * UP_OBJ_FACE: only the objects face has changed. 589 * UP_OBJ_FACE: only the objects face has changed.
731 */ 590 */
732
733void 591void
734update_object (object *op, int action) 592update_object (object *op, int action)
735{ 593{
736 int update_now = 0, flags;
737 MoveType move_on, move_off, move_block, move_slow; 594 MoveType move_on, move_off, move_block, move_slow;
738 595
739 if (op == NULL) 596 if (op == NULL)
740 { 597 {
741 /* this should never happen */ 598 /* this should never happen */
742 LOG (llevDebug, "update_object() called for NULL object.\n"); 599 LOG (llevDebug, "update_object() called for NULL object.\n");
743 return; 600 return;
744 } 601 }
745 602
746 if (op->env != NULL) 603 if (op->env)
747 { 604 {
748 /* Animation is currently handled by client, so nothing 605 /* Animation is currently handled by client, so nothing
749 * to do in this case. 606 * to do in this case.
750 */ 607 */
751 return; 608 return;
… …
756 */ 613 */
757 if (!op->map || op->map->in_memory == MAP_SAVING) 614 if (!op->map || op->map->in_memory == MAP_SAVING)
758 return; 615 return;
759 616
760 /* make sure the object is within map boundaries */ 617 /* 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)) 618 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
762 { 619 {
763 LOG (llevError, "update_object() called for object out of map!\n"); 620 LOG (llevError, "update_object() called for object out of map!\n");
764#ifdef MANY_CORES 621#ifdef MANY_CORES
765 abort (); 622 abort ();
766#endif 623#endif
767 return; 624 return;
768 } 625 }
769 626
770 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 627 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 628
629 if (!(m.flags_ & P_UPTODATE))
630 /* nop */;
777 if (action == UP_OBJ_INSERT) 631 else if (action == UP_OBJ_INSERT)
778 { 632 {
633 // this is likely overkill, TODO: revisit (schmorp)
779 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 634 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)) 635 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783 update_now = 1; 636 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784 637 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
638 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 639 || (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) 640 || (m.move_on | op->move_on ) != m.move_on
795 update_now = 1;
796
797 if ((move_off | op->move_off) != move_off) 641 || (m.move_off | op->move_off ) != m.move_off
798 update_now = 1; 642 || (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 643 /* This isn't perfect, but I don't expect a lot of objects to
801 * to have move_allow right now. 644 * to have move_allow right now.
802 */ 645 */
803 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804 update_now = 1; 647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805 648 m.flags_ = 0;
806 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1;
808 } 649 }
809 /* if the object is being removed, we can't make intelligent 650 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 651 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 652 * that is being removed.
812 */ 653 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814 update_now = 1; 655 m.flags_ = 0;
815 else if (action == UP_OBJ_FACE) 656 else if (action == UP_OBJ_FACE)
816 /* Nothing to do for that case */ ; 657 /* Nothing to do for that case */ ;
817 else 658 else
818 LOG (llevError, "update_object called with invalid action: %d\n", action); 659 LOG (llevError, "update_object called with invalid action: %d\n", action);
819 660
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) 661 if (op->more)
827 update_object (op->more, action); 662 update_object (op->more, action);
828} 663}
829 664
830object::vector object::mortals;
831object::vector object::objects; // not yet used
832object *object::first; 665object *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 666
854object::object () 667object::object ()
855{ 668{
856 SET_FLAG (this, FLAG_REMOVED); 669 SET_FLAG (this, FLAG_REMOVED);
857 670
… …
889 702
890 prev = 0; 703 prev = 0;
891 next = 0; 704 next = 0;
892} 705}
893 706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711}
712
713void
714object::activate ()
715{
716 /* If already on active list, don't do anything */
717 if (active ())
718 return;
719
720 if (has_active_speed ())
721 {
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731}
732
733void
734object::activate_recursive ()
735{
736 activate ();
737
738 for (object *op = inv; op; op = op->below)
739 op->activate_recursive ();
740}
741
742/* This function removes object 'op' from the list of active
743 * objects.
744 * This should only be used for style maps or other such
745 * reference maps where you don't want an object that isn't
746 * in play chewing up cpu time getting processed.
747 * The reverse of this is to call update_ob_speed, which
748 * will do the right thing based on the speed of the object.
749 */
750void
751object::deactivate ()
752{
753 /* If not on the active list, nothing needs to be done */
754 if (!active ())
755 return;
756
757 if (active_prev == 0)
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772}
773
774void
775object::deactivate_recursive ()
776{
777 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive ();
779
780 deactivate ();
781}
782
783/*
784 * Remove and free all objects in the inventory of the given object.
785 * object.c ?
786 */
787void
788object::destroy_inv (bool drop_to_ground)
789{
790 // need to check first, because the checks below might segfault
791 // as we might be on an invalid mapspace and crossfire code
792 // is too buggy to ensure that the inventory is empty.
793 // corollary: if you create arrows etc. with stuff in tis inventory,
794 // cf will crash below with off-map x and y
795 if (!inv)
796 return;
797
798 /* Only if the space blocks everything do we not process -
799 * if some form of movement is allowed, let objects
800 * drop on that space.
801 */
802 if (!drop_to_ground
803 || !map
804 || map->in_memory != MAP_IN_MEMORY
805 || ms ().move_block == MOVE_ALL)
806 {
807 while (inv)
808 {
809 inv->destroy_inv (drop_to_ground);
810 inv->destroy ();
811 }
812 }
813 else
814 { /* Put objects in inventory onto this space */
815 while (inv)
816 {
817 object *op = inv;
818
819 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE
822 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE])
824 op->destroy ();
825 else
826 map->insert (op, x, y);
827 }
828 }
829}
830
894object *object::create () 831object *object::create ()
895{ 832{
896 object *op = new object; 833 object *op = new object;
897 op->link (); 834 op->link ();
898 return op; 835 return op;
899} 836}
900 837
901/* 838void
902 * free_object() frees everything allocated by an object, removes 839object::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{ 840{
913 if (QUERY_FLAG (this, FLAG_FREED)) 841 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this);
843
844 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this);
846
847 if (!flag [FLAG_REMOVED])
848 remove ();
849
850 if (flag [FLAG_FREED])
914 return; 851 return;
915 852
916 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 853 set_speed (0);
917 remove_friendly_object (this);
918 854
919 if (!QUERY_FLAG (this, FLAG_REMOVED)) 855 flag [FLAG_FREED] = 1;
920 remove_ob (this);
921 856
922 SET_FLAG (this, FLAG_FREED); 857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861
862 // hack to ensure that freed objects still have a valid map
863 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes
865
866 if (!freed_map)
867 {
868 freed_map = new maptile;
869
870 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3;
872 freed_map->height = 3;
873
874 freed_map->alloc ();
875 freed_map->in_memory = MAP_IN_MEMORY;
876 }
877
878 map = freed_map;
879 x = 1;
880 y = 1;
881 }
882
883 head = 0;
923 884
924 if (more) 885 if (more)
925 { 886 {
926 more->destroy (destroy_inventory); 887 more->destroy ();
927 more = 0; 888 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 } 889 }
971 890
972 // clear those pointers that likely might have circular references to us 891 // clear those pointers that likely might have circular references to us
973 owner = 0; 892 owner = 0;
974 enemy = 0; 893 enemy = 0;
975 attacked_by = 0; 894 attacked_by = 0;
976 895
977 // only relevant for players(?), but make sure of it anyways 896 // only relevant for players(?), but make sure of it anyways
978 contr = 0; 897 contr = 0;
898}
979 899
980 /* Remove object from the active list */ 900void
981 speed = 0; 901object::destroy (bool destroy_inventory)
982 update_ob_speed (this); 902{
903 if (destroyed ())
904 return;
983 905
984 unlink (); 906 if (destroy_inventory)
907 destroy_inv (false);
985 908
986 mortals.push_back (this); 909 attachable::destroy ();
987} 910}
988 911
989/* 912/*
990 * sub_weight() recursively (outwards) subtracts a number from the 913 * sub_weight() recursively (outwards) subtracts a number from the
991 * weight of an object (and what is carried by it's environment(s)). 914 * weight of an object (and what is carried by it's environment(s)).
992 */ 915 */
993
994void 916void
995sub_weight (object *op, signed long weight) 917sub_weight (object *op, signed long weight)
996{ 918{
997 while (op != NULL) 919 while (op != NULL)
998 { 920 {
… …
1002 op->carrying -= weight; 924 op->carrying -= weight;
1003 op = op->env; 925 op = op->env;
1004 } 926 }
1005} 927}
1006 928
1007/* remove_ob(op): 929/* op->remove ():
1008 * This function removes the object op from the linked list of objects 930 * This function removes the object op from the linked list of objects
1009 * which it is currently tied to. When this function is done, the 931 * which it is currently tied to. When this function is done, the
1010 * object will have no environment. If the object previously had an 932 * object will have no environment. If the object previously had an
1011 * environment, the x and y coordinates will be updated to 933 * environment, the x and y coordinates will be updated to
1012 * the previous environment. 934 * the previous environment.
1013 * Beware: This function is called from the editor as well! 935 * Beware: This function is called from the editor as well!
1014 */ 936 */
1015
1016void 937void
1017remove_ob (object *op) 938object::remove ()
1018{ 939{
1019 object *tmp, *last = 0; 940 object *tmp, *last = 0;
1020 object *otmp; 941 object *otmp;
1021 942
1022 int check_walk_off;
1023 maptile *m;
1024
1025 sint16 x, y;
1026
1027 if (QUERY_FLAG (op, FLAG_REMOVED)) 943 if (QUERY_FLAG (this, FLAG_REMOVED))
1028 return; 944 return;
1029 945
1030 SET_FLAG (op, FLAG_REMOVED); 946 SET_FLAG (this, FLAG_REMOVED);
947 INVOKE_OBJECT (REMOVE, this);
1031 948
1032 if (op->more != NULL) 949 if (more)
1033 remove_ob (op->more); 950 more->remove ();
1034 951
1035 /* 952 /*
1036 * In this case, the object to be removed is in someones 953 * In this case, the object to be removed is in someones
1037 * inventory. 954 * inventory.
1038 */ 955 */
1039 if (op->env != NULL) 956 if (env)
1040 { 957 {
1041 if (op->nrof) 958 if (nrof)
1042 sub_weight (op->env, op->weight * op->nrof); 959 sub_weight (env, weight * nrof);
1043 else 960 else
1044 sub_weight (op->env, op->weight + op->carrying); 961 sub_weight (env, weight + carrying);
1045 962
1046 /* NO_FIX_PLAYER is set when a great many changes are being 963 /* NO_FIX_PLAYER is set when a great many changes are being
1047 * made to players inventory. If set, avoiding the call 964 * made to players inventory. If set, avoiding the call
1048 * to save cpu time. 965 * to save cpu time.
1049 */ 966 */
1050 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 967 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1051 fix_player (otmp); 968 otmp->update_stats ();
1052 969
1053 if (op->above != NULL) 970 if (above)
1054 op->above->below = op->below; 971 above->below = below;
1055 else 972 else
1056 op->env->inv = op->below; 973 env->inv = below;
1057 974
1058 if (op->below != NULL) 975 if (below)
1059 op->below->above = op->above; 976 below->above = above;
1060 977
1061 /* we set up values so that it could be inserted into 978 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up 979 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do. 980 * to the caller to decide what we want to do.
1064 */ 981 */
1065 op->x = op->env->x, op->y = op->env->y; 982 x = env->x, y = env->y;
1066 op->map = op->env->map; 983 map = env->map;
1067 op->above = NULL, op->below = NULL; 984 above = 0, below = 0;
1068 op->env = NULL; 985 env = 0;
1069 } 986 }
1070 else if (op->map) 987 else if (map)
1071 { 988 {
1072 x = op->x; 989 if (type == PLAYER)
1073 y = op->y;
1074 m = get_map_from_coord (op->map, &x, &y);
1075
1076 if (!m)
1077 {
1078 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1079 op->map->path, op->x, op->y);
1080 /* in old days, we used to set x and y to 0 and continue.
1081 * it seems if we get into this case, something is probablye
1082 * screwed up and should be fixed.
1083 */
1084 abort ();
1085 } 990 {
1086 991 --map->players;
1087 if (op->map != m) 992 map->touch ();
1088 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1089 op->map->path, m->path, op->x, op->y, x, y);
1090
1091 /* Re did the following section of code - it looks like it had
1092 * lots of logic for things we no longer care about
1093 */ 993 }
994
995 map->dirty = true;
1094 996
1095 /* link the object above us */ 997 /* link the object above us */
1096 if (op->above) 998 if (above)
1097 op->above->below = op->below; 999 above->below = below;
1098 else 1000 else
1099 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1001 map->at (x, y).top = below; /* we were top, set new top */
1100 1002
1101 /* Relink the object below us, if there is one */ 1003 /* Relink the object below us, if there is one */
1102 if (op->below) 1004 if (below)
1103 op->below->above = op->above; 1005 below->above = above;
1104 else 1006 else
1105 { 1007 {
1106 /* Nothing below, which means we need to relink map object for this space 1008 /* Nothing below, which means we need to relink map object for this space
1107 * use translated coordinates in case some oddness with map tiling is 1009 * use translated coordinates in case some oddness with map tiling is
1108 * evident 1010 * evident
1109 */ 1011 */
1110 if (GET_MAP_OB (m, x, y) != op) 1012 if (GET_MAP_OB (map, x, y) != this)
1111 { 1013 {
1112 char *dump = dump_object (op); 1014 char *dump = dump_object (this);
1113 LOG (llevError, 1015 LOG (llevError,
1114 "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); 1016 "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);
1115 free (dump); 1017 free (dump);
1116 dump = dump_object (GET_MAP_OB (m, x, y)); 1018 dump = dump_object (GET_MAP_OB (map, x, y));
1117 LOG (llevError, "%s\n", dump); 1019 LOG (llevError, "%s\n", dump);
1118 free (dump); 1020 free (dump);
1119 } 1021 }
1120 1022
1121 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1023 map->at (x, y).bot = above; /* goes on above it. */
1122 } 1024 }
1123 1025
1124 op->above = 0; 1026 above = 0;
1125 op->below = 0; 1027 below = 0;
1126 1028
1127 if (op->map->in_memory == MAP_SAVING) 1029 if (map->in_memory == MAP_SAVING)
1128 return; 1030 return;
1129 1031
1130 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1032 int check_walk_off = !flag [FLAG_NO_APPLY];
1131 1033
1132 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1034 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1133 { 1035 {
1134 /* No point updating the players look faces if he is the object 1036 /* No point updating the players look faces if he is the object
1135 * being removed. 1037 * being removed.
1136 */ 1038 */
1137 1039
1138 if (tmp->type == PLAYER && tmp != op) 1040 if (tmp->type == PLAYER && tmp != this)
1139 { 1041 {
1140 /* If a container that the player is currently using somehow gets 1042 /* If a container that the player is currently using somehow gets
1141 * removed (most likely destroyed), update the player view 1043 * removed (most likely destroyed), update the player view
1142 * appropriately. 1044 * appropriately.
1143 */ 1045 */
1144 if (tmp->container == op) 1046 if (tmp->container == this)
1145 { 1047 {
1146 CLEAR_FLAG (op, FLAG_APPLIED); 1048 flag [FLAG_APPLIED] = 0;
1147 tmp->container = NULL; 1049 tmp->container = 0;
1148 } 1050 }
1149 1051
1150 tmp->contr->socket.update_look = 1; 1052 if (tmp->contr->ns)
1053 tmp->contr->ns->floorbox_update ();
1151 } 1054 }
1152 1055
1153 /* See if player moving off should effect something */ 1056 /* See if object moving off should effect something */
1154 if (check_walk_off 1057 if (check_walk_off
1155 && ((op->move_type & tmp->move_off) 1058 && ((move_type & tmp->move_off)
1156 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1059 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1157 { 1060 {
1158 move_apply (tmp, op, NULL); 1061 move_apply (tmp, this, 0);
1159 1062
1160 if (op->destroyed ()) 1063 if (destroyed ())
1161 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1064 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162 } 1065 }
1163 1066
1164 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1067 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1165 1068 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1166 if (tmp->above == tmp) 1069 if (tmp->above == tmp)
1167 tmp->above = NULL; 1070 tmp->above = 0;
1168 1071
1169 last = tmp; 1072 last = tmp;
1170 } 1073 }
1171 1074
1172 /* last == NULL of there are no objects on this space */ 1075 /* last == NULL if there are no objects on this space */
1076 //TODO: this makes little sense, why only update the topmost object?
1173 if (last == NULL) 1077 if (!last)
1174 { 1078 map->at (x, y).flags_ = 0;
1175 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1176 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1177 * those out anyways, and if there are any flags set right now, they won't
1178 * be correct anyways.
1179 */
1180 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1181 update_position (op->map, op->x, op->y);
1182 }
1183 else 1079 else
1184 update_object (last, UP_OBJ_REMOVE); 1080 update_object (last, UP_OBJ_REMOVE);
1185 1081
1186 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1082 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1187 update_all_los (op->map, op->x, op->y); 1083 update_all_los (map, x, y);
1188 } 1084 }
1189} 1085}
1190 1086
1191/* 1087/*
1192 * merge_ob(op,top): 1088 * merge_ob(op,top):
… …
1200merge_ob (object *op, object *top) 1096merge_ob (object *op, object *top)
1201{ 1097{
1202 if (!op->nrof) 1098 if (!op->nrof)
1203 return 0; 1099 return 0;
1204 1100
1205 if (top == NULL) 1101 if (top)
1206 for (top = op; top != NULL && top->above != NULL; top = top->above); 1102 for (top = op; top && top->above; top = top->above)
1103 ;
1207 1104
1208 for (; top != NULL; top = top->below) 1105 for (; top; top = top->below)
1209 { 1106 {
1210 if (top == op) 1107 if (top == op)
1211 continue; 1108 continue;
1212 if (CAN_MERGE (op, top)) 1109
1110 if (object::can_merge (op, top))
1213 { 1111 {
1214 top->nrof += op->nrof; 1112 top->nrof += op->nrof;
1215 1113
1216/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1114/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1217 op->weight = 0; /* Don't want any adjustements now */ 1115 op->weight = 0; /* Don't want any adjustements now */
1218 remove_ob (op); 1116 op->destroy ();
1219 free_object (op);
1220 return top; 1117 return top;
1221 } 1118 }
1222 } 1119 }
1223 1120
1224 return 0; 1121 return 0;
… …
1229 * job preparing multi-part monsters 1126 * job preparing multi-part monsters
1230 */ 1127 */
1231object * 1128object *
1232insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1129insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1233{ 1130{
1234 object *tmp;
1235
1236 if (op->head)
1237 op = op->head;
1238
1239 for (tmp = op; tmp; tmp = tmp->more) 1131 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1240 { 1132 {
1241 tmp->x = x + tmp->arch->clone.x; 1133 tmp->x = x + tmp->arch->clone.x;
1242 tmp->y = y + tmp->arch->clone.y; 1134 tmp->y = y + tmp->arch->clone.y;
1243 } 1135 }
1244 1136
… …
1263 * Return value: 1155 * Return value:
1264 * new object if 'op' was merged with other object 1156 * new object if 'op' was merged with other object
1265 * NULL if 'op' was destroyed 1157 * NULL if 'op' was destroyed
1266 * just 'op' otherwise 1158 * just 'op' otherwise
1267 */ 1159 */
1268
1269object * 1160object *
1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1161insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1271{ 1162{
1272 object *tmp, *top, *floor = NULL; 1163 object *tmp, *top, *floor = NULL;
1273 sint16 x, y; 1164 sint16 x, y;
… …
1276 { 1167 {
1277 LOG (llevError, "Trying to insert freed object!\n"); 1168 LOG (llevError, "Trying to insert freed object!\n");
1278 return NULL; 1169 return NULL;
1279 } 1170 }
1280 1171
1281 if (m == NULL) 1172 if (!m)
1282 { 1173 {
1283 char *dump = dump_object (op); 1174 char *dump = dump_object (op);
1284 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1175 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1285 free (dump); 1176 free (dump);
1286 return op; 1177 return op;
… …
1307 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1198 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1308 free (dump); 1199 free (dump);
1309 return op; 1200 return op;
1310 } 1201 }
1311 1202
1312 if (op->more != NULL) 1203 if (op->more)
1313 { 1204 {
1314 /* The part may be on a different map. */ 1205 /* The part may be on a different map. */
1315 1206
1316 object *more = op->more; 1207 object *more = op->more;
1317 1208
1318 /* We really need the caller to normalize coordinates - if 1209 /* We really need the caller to normalise coordinates - if
1319 * we set the map, that doesn't work if the location is within 1210 * we set the map, that doesn't work if the location is within
1320 * a map and this is straddling an edge. So only if coordinate 1211 * a map and this is straddling an edge. So only if coordinate
1321 * is clear wrong do we normalize it. 1212 * is clear wrong do we normalise it.
1322 */ 1213 */
1323 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1214 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1324 more->map = get_map_from_coord (m, &more->x, &more->y); 1215 more->map = get_map_from_coord (m, &more->x, &more->y);
1325 else if (!more->map) 1216 else if (!more->map)
1326 { 1217 {
… …
1333 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1224 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1334 { 1225 {
1335 if (!op->head) 1226 if (!op->head)
1336 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1227 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1337 1228
1338 return NULL; 1229 return 0;
1339 } 1230 }
1340 } 1231 }
1341 1232
1342 CLEAR_FLAG (op, FLAG_REMOVED); 1233 CLEAR_FLAG (op, FLAG_REMOVED);
1343 1234
… …
1350 y = op->y; 1241 y = op->y;
1351 1242
1352 /* this has to be done after we translate the coordinates. 1243 /* this has to be done after we translate the coordinates.
1353 */ 1244 */
1354 if (op->nrof && !(flag & INS_NO_MERGE)) 1245 if (op->nrof && !(flag & INS_NO_MERGE))
1355 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1246 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1356 if (CAN_MERGE (op, tmp)) 1247 if (object::can_merge (op, tmp))
1357 { 1248 {
1358 op->nrof += tmp->nrof; 1249 op->nrof += tmp->nrof;
1359 remove_ob (tmp); 1250 tmp->destroy ();
1360 free_object (tmp);
1361 } 1251 }
1362 1252
1363 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1253 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1364 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1254 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1365 1255
… …
1378 op->below = originator->below; 1268 op->below = originator->below;
1379 1269
1380 if (op->below) 1270 if (op->below)
1381 op->below->above = op; 1271 op->below->above = op;
1382 else 1272 else
1383 SET_MAP_OB (op->map, op->x, op->y, op); 1273 op->ms ().bot = op;
1384 1274
1385 /* since *below* originator, no need to update top */ 1275 /* since *below* originator, no need to update top */
1386 originator->below = op; 1276 originator->below = op;
1387 } 1277 }
1388 else 1278 else
1389 { 1279 {
1390 /* If there are other objects, then */ 1280 /* If there are other objects, then */
1391 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1281 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1392 { 1282 {
1393 object *last = NULL; 1283 object *last = 0;
1394 1284
1395 /* 1285 /*
1396 * If there are multiple objects on this space, we do some trickier handling. 1286 * If there are multiple objects on this space, we do some trickier handling.
1397 * We've already dealt with merging if appropriate. 1287 * We've already dealt with merging if appropriate.
1398 * Generally, we want to put the new object on top. But if 1288 * Generally, we want to put the new object on top. But if
… …
1402 * once we get to them. This reduces the need to traverse over all of 1292 * once we get to them. This reduces the need to traverse over all of
1403 * them when adding another one - this saves quite a bit of cpu time 1293 * them when adding another one - this saves quite a bit of cpu time
1404 * when lots of spells are cast in one area. Currently, it is presumed 1294 * when lots of spells are cast in one area. Currently, it is presumed
1405 * that flying non pickable objects are spell objects. 1295 * that flying non pickable objects are spell objects.
1406 */ 1296 */
1407
1408 while (top != NULL) 1297 while (top)
1409 { 1298 {
1410 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1299 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1411 floor = top; 1300 floor = top;
1412 1301
1413 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1302 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1434 * If INS_ON_TOP is used, don't do this processing 1323 * If INS_ON_TOP is used, don't do this processing
1435 * Need to find the object that in fact blocks view, otherwise 1324 * Need to find the object that in fact blocks view, otherwise
1436 * stacking is a bit odd. 1325 * stacking is a bit odd.
1437 */ 1326 */
1438 if (!(flag & INS_ON_TOP) && 1327 if (!(flag & INS_ON_TOP) &&
1439 (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))
1440 { 1329 {
1441 for (last = top; last != floor; last = last->below) 1330 for (last = top; last != floor; last = last->below)
1442 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1331 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1443 break; 1332 break;
1444 /* Check to see if we found the object that blocks view, 1333 /* Check to see if we found the object that blocks view,
… …
1466 op->above = GET_MAP_OB (op->map, op->x, op->y); 1355 op->above = GET_MAP_OB (op->map, op->x, op->y);
1467 1356
1468 if (op->above) 1357 if (op->above)
1469 op->above->below = op; 1358 op->above->below = op;
1470 1359
1471 op->below = NULL; 1360 op->below = 0;
1472 SET_MAP_OB (op->map, op->x, op->y, op); 1361 op->ms ().bot = op;
1473 } 1362 }
1474 else 1363 else
1475 { /* get inserted into the stack above top */ 1364 { /* get inserted into the stack above top */
1476 op->above = top->above; 1365 op->above = top->above;
1477 1366
… …
1480 1369
1481 op->below = top; 1370 op->below = top;
1482 top->above = op; 1371 top->above = op;
1483 } 1372 }
1484 1373
1485 if (op->above == NULL) 1374 if (!op->above)
1486 SET_MAP_TOP (op->map, op->x, op->y, op); 1375 op->ms ().top = op;
1487 } /* else not INS_BELOW_ORIGINATOR */ 1376 } /* else not INS_BELOW_ORIGINATOR */
1488 1377
1489 if (op->type == PLAYER) 1378 if (op->type == PLAYER)
1379 {
1490 op->contr->do_los = 1; 1380 op->contr->do_los = 1;
1381 ++op->map->players;
1382 op->map->touch ();
1383 }
1384
1385 op->map->dirty = true;
1491 1386
1492 /* If we have a floor, we know the player, if any, will be above 1387 /* If we have a floor, we know the player, if any, will be above
1493 * it, so save a few ticks and start from there. 1388 * it, so save a few ticks and start from there.
1494 */ 1389 */
1495 if (!(flag & INS_MAP_LOAD)) 1390 if (!(flag & INS_MAP_LOAD))
1496 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1391 if (object *pl = op->ms ().player ())
1497 if (tmp->type == PLAYER) 1392 if (pl->contr->ns)
1498 tmp->contr->socket.update_look = 1; 1393 pl->contr->ns->floorbox_update ();
1499 1394
1500 /* If this object glows, it may affect lighting conditions that are 1395 /* If this object glows, it may affect lighting conditions that are
1501 * visible to others on this map. But update_all_los is really 1396 * visible to others on this map. But update_all_los is really
1502 * an inefficient way to do this, as it means los for all players 1397 * an inefficient way to do this, as it means los for all players
1503 * on the map will get recalculated. The players could very well 1398 * on the map will get recalculated. The players could very well
1504 * be far away from this change and not affected in any way - 1399 * be far away from this change and not affected in any way -
1505 * this should get redone to only look for players within range, 1400 * this should get redone to only look for players within range,
1506 * or just updating the P_NEED_UPDATE for spaces within this area 1401 * or just updating the P_UPTODATE for spaces within this area
1507 * of effect may be sufficient. 1402 * of effect may be sufficient.
1508 */ 1403 */
1509 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1404 if (op->map->darkness && (op->glow_radius != 0))
1510 update_all_los (op->map, op->x, op->y); 1405 update_all_los (op->map, op->x, op->y);
1511 1406
1512 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1407 /* updates flags (blocked, alive, no magic, etc) for this map space */
1513 update_object (op, UP_OBJ_INSERT); 1408 update_object (op, UP_OBJ_INSERT);
1514 1409
1410 INVOKE_OBJECT (INSERT, op);
1411
1515 /* Don't know if moving this to the end will break anything. However, 1412 /* Don't know if moving this to the end will break anything. However,
1516 * we want to have update_look set above before calling this. 1413 * we want to have floorbox_update called before calling this.
1517 * 1414 *
1518 * check_move_on() must be after this because code called from 1415 * check_move_on() must be after this because code called from
1519 * check_move_on() depends on correct map flags (so functions like 1416 * check_move_on() depends on correct map flags (so functions like
1520 * blocked() and wall() work properly), and these flags are updated by 1417 * blocked() and wall() work properly), and these flags are updated by
1521 * update_object(). 1418 * update_object().
… …
1523 1420
1524 /* if this is not the head or flag has been passed, don't check walk on status */ 1421 /* if this is not the head or flag has been passed, don't check walk on status */
1525 if (!(flag & INS_NO_WALK_ON) && !op->head) 1422 if (!(flag & INS_NO_WALK_ON) && !op->head)
1526 { 1423 {
1527 if (check_move_on (op, originator)) 1424 if (check_move_on (op, originator))
1528 return NULL; 1425 return 0;
1529 1426
1530 /* If we are a multi part object, lets work our way through the check 1427 /* If we are a multi part object, lets work our way through the check
1531 * walk on's. 1428 * walk on's.
1532 */ 1429 */
1533 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1430 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1534 if (check_move_on (tmp, originator)) 1431 if (check_move_on (tmp, originator))
1535 return NULL; 1432 return 0;
1536 } 1433 }
1537 1434
1538 return op; 1435 return op;
1539} 1436}
1540 1437
1541/* this function inserts an object in the map, but if it 1438/* this function inserts an object in the map, but if it
1542 * finds an object of its own type, it'll remove that one first. 1439 * finds an object of its own type, it'll remove that one first.
1543 * op is the object to insert it under: supplies x and the map. 1440 * op is the object to insert it under: supplies x and the map.
1544 */ 1441 */
1545void 1442void
1546replace_insert_ob_in_map (const char *arch_string, object *op) 1443replace_insert_ob_in_map (const char *arch_string, object *op)
1547{ 1444{
1548 object * 1445 object *tmp, *tmp1;
1549 tmp;
1550 object *
1551 tmp1;
1552 1446
1553 /* first search for itself and remove any old instances */ 1447 /* first search for itself and remove any old instances */
1554 1448
1555 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1449 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1556 {
1557 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1450 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1558 { 1451 tmp->destroy ();
1559 remove_ob (tmp);
1560 free_object (tmp);
1561 }
1562 }
1563 1452
1564 tmp1 = arch_to_object (archetype::find (arch_string)); 1453 tmp1 = arch_to_object (archetype::find (arch_string));
1565 1454
1566 tmp1->x = op->x; 1455 tmp1->x = op->x;
1567 tmp1->y = op->y; 1456 tmp1->y = op->y;
1568 insert_ob_in_map (tmp1, op->map, op, 0); 1457 insert_ob_in_map (tmp1, op->map, op, 0);
1458}
1459
1460object *
1461object::insert_at (object *where, object *originator, int flags)
1462{
1463 where->map->insert (this, where->x, where->y, originator, flags);
1569} 1464}
1570 1465
1571/* 1466/*
1572 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1467 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1573 * is returned contains nr objects, and the remaining parts contains 1468 * is returned contains nr objects, and the remaining parts contains
1574 * the rest (or is removed and freed if that number is 0). 1469 * the rest (or is removed and freed if that number is 0).
1575 * On failure, NULL is returned, and the reason put into the 1470 * On failure, NULL is returned, and the reason put into the
1576 * global static errmsg array. 1471 * global static errmsg array.
1577 */ 1472 */
1578
1579object * 1473object *
1580get_split_ob (object *orig_ob, uint32 nr) 1474get_split_ob (object *orig_ob, uint32 nr)
1581{ 1475{
1582 object * 1476 object *newob;
1583 newob;
1584 int
1585 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1477 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1586 1478
1587 if (orig_ob->nrof < nr) 1479 if (orig_ob->nrof < nr)
1588 { 1480 {
1589 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1481 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1590 return NULL; 1482 return NULL;
1591 } 1483 }
1592 1484
1593 newob = object_create_clone (orig_ob); 1485 newob = object_create_clone (orig_ob);
1594 1486
1595 if ((orig_ob->nrof -= nr) < 1) 1487 if ((orig_ob->nrof -= nr) < 1)
1596 { 1488 orig_ob->destroy (1);
1597 if (!is_removed)
1598 remove_ob (orig_ob);
1599 free_object2 (orig_ob, 1);
1600 }
1601 else if (!is_removed) 1489 else if (!is_removed)
1602 { 1490 {
1603 if (orig_ob->env != NULL) 1491 if (orig_ob->env != NULL)
1604 sub_weight (orig_ob->env, orig_ob->weight * nr); 1492 sub_weight (orig_ob->env, orig_ob->weight * nr);
1605 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1493 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1625 1513
1626object * 1514object *
1627decrease_ob_nr (object *op, uint32 i) 1515decrease_ob_nr (object *op, uint32 i)
1628{ 1516{
1629 object *tmp; 1517 object *tmp;
1630 player *pl;
1631 1518
1632 if (i == 0) /* objects with op->nrof require this check */ 1519 if (i == 0) /* objects with op->nrof require this check */
1633 return op; 1520 return op;
1634 1521
1635 if (i > op->nrof) 1522 if (i > op->nrof)
1636 i = op->nrof; 1523 i = op->nrof;
1637 1524
1638 if (QUERY_FLAG (op, FLAG_REMOVED)) 1525 if (QUERY_FLAG (op, FLAG_REMOVED))
1639 op->nrof -= i; 1526 op->nrof -= i;
1640 else if (op->env != NULL) 1527 else if (op->env)
1641 { 1528 {
1642 /* is this object in the players inventory, or sub container 1529 /* is this object in the players inventory, or sub container
1643 * therein? 1530 * therein?
1644 */ 1531 */
1645 tmp = is_player_inv (op->env); 1532 tmp = op->in_player ();
1646 /* nope. Is this a container the player has opened? 1533 /* nope. Is this a container the player has opened?
1647 * If so, set tmp to that player. 1534 * If so, set tmp to that player.
1648 * IMO, searching through all the players will mostly 1535 * IMO, searching through all the players will mostly
1649 * likely be quicker than following op->env to the map, 1536 * likely be quicker than following op->env to the map,
1650 * and then searching the map for a player. 1537 * and then searching the map for a player.
1651 */ 1538 */
1652 if (!tmp) 1539 if (!tmp)
1653 { 1540 for_all_players (pl)
1654 for (pl = first_player; pl; pl = pl->next)
1655 if (pl->ob->container == op->env) 1541 if (pl->ob->container == op->env)
1542 {
1543 tmp = pl->ob;
1656 break; 1544 break;
1657 if (pl)
1658 tmp = pl->ob;
1659 else
1660 tmp = NULL;
1661 } 1545 }
1662 1546
1663 if (i < op->nrof) 1547 if (i < op->nrof)
1664 { 1548 {
1665 sub_weight (op->env, op->weight * i); 1549 sub_weight (op->env, op->weight * i);
1666 op->nrof -= i; 1550 op->nrof -= i;
1667 if (tmp) 1551 if (tmp)
1668 {
1669 esrv_send_item (tmp, op); 1552 esrv_send_item (tmp, op);
1670 }
1671 } 1553 }
1672 else 1554 else
1673 { 1555 {
1674 remove_ob (op); 1556 op->remove ();
1675 op->nrof = 0; 1557 op->nrof = 0;
1676 if (tmp) 1558 if (tmp)
1677 {
1678 esrv_del_item (tmp->contr, op->count); 1559 esrv_del_item (tmp->contr, op->count);
1679 }
1680 } 1560 }
1681 } 1561 }
1682 else 1562 else
1683 { 1563 {
1684 object *above = op->above; 1564 object *above = op->above;
1685 1565
1686 if (i < op->nrof) 1566 if (i < op->nrof)
1687 op->nrof -= i; 1567 op->nrof -= i;
1688 else 1568 else
1689 { 1569 {
1690 remove_ob (op); 1570 op->remove ();
1691 op->nrof = 0; 1571 op->nrof = 0;
1692 } 1572 }
1693 1573
1694 /* Since we just removed op, op->above is null */ 1574 /* Since we just removed op, op->above is null */
1695 for (tmp = above; tmp != NULL; tmp = tmp->above) 1575 for (tmp = above; tmp; tmp = tmp->above)
1696 if (tmp->type == PLAYER) 1576 if (tmp->type == PLAYER)
1697 { 1577 {
1698 if (op->nrof) 1578 if (op->nrof)
1699 esrv_send_item (tmp, op); 1579 esrv_send_item (tmp, op);
1700 else 1580 else
… …
1704 1584
1705 if (op->nrof) 1585 if (op->nrof)
1706 return op; 1586 return op;
1707 else 1587 else
1708 { 1588 {
1709 free_object (op); 1589 op->destroy ();
1710 return NULL; 1590 return 0;
1711 } 1591 }
1712} 1592}
1713 1593
1714/* 1594/*
1715 * add_weight(object, weight) adds the specified weight to an object, 1595 * add_weight(object, weight) adds the specified weight to an object,
… …
1727 op->carrying += weight; 1607 op->carrying += weight;
1728 op = op->env; 1608 op = op->env;
1729 } 1609 }
1730} 1610}
1731 1611
1732/*
1733 * insert_ob_in_ob(op,environment):
1734 * This function inserts the object op in the linked list
1735 * inside the object environment.
1736 *
1737 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1738 * the inventory at the last position or next to other objects of the same
1739 * type.
1740 * Frank: Now sorted by type, archetype and magic!
1741 *
1742 * The function returns now pointer to inserted item, and return value can
1743 * be != op, if items are merged. -Tero
1744 */
1745
1746object * 1612object *
1747insert_ob_in_ob (object *op, object *where) 1613insert_ob_in_ob (object *op, object *where)
1748{ 1614{
1749 object * 1615 if (!where)
1750 tmp, *
1751 otmp;
1752
1753 if (!QUERY_FLAG (op, FLAG_REMOVED))
1754 {
1755 char *dump = dump_object (op);
1756 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757 free (dump);
1758 return op;
1759 }
1760
1761 if (where == NULL)
1762 { 1616 {
1763 char *dump = dump_object (op); 1617 char *dump = dump_object (op);
1764 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1618 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765 free (dump); 1619 free (dump);
1766 return op; 1620 return op;
1767 } 1621 }
1768 1622
1769 if (where->head) 1623 if (where->head)
1770 { 1624 {
1771 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1625 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1772 where = where->head; 1626 where = where->head;
1773 } 1627 }
1628
1629 return where->insert (op);
1630}
1631
1632/*
1633 * env->insert (op)
1634 * This function inserts the object op in the linked list
1635 * inside the object environment.
1636 *
1637 * The function returns now pointer to inserted item, and return value can
1638 * be != op, if items are merged. -Tero
1639 */
1640
1641object *
1642object::insert (object *op)
1643{
1644 object *tmp, *otmp;
1645
1646 if (!QUERY_FLAG (op, FLAG_REMOVED))
1647 op->remove ();
1774 1648
1775 if (op->more) 1649 if (op->more)
1776 { 1650 {
1777 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1651 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1778 return op; 1652 return op;
… …
1780 1654
1781 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1655 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1782 CLEAR_FLAG (op, FLAG_REMOVED); 1656 CLEAR_FLAG (op, FLAG_REMOVED);
1783 if (op->nrof) 1657 if (op->nrof)
1784 { 1658 {
1785 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1659 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1786 if (CAN_MERGE (tmp, op)) 1660 if (object::can_merge (tmp, op))
1787 { 1661 {
1788 /* return the original object and remove inserted object 1662 /* return the original object and remove inserted object
1789 (client needs the original object) */ 1663 (client needs the original object) */
1790 tmp->nrof += op->nrof; 1664 tmp->nrof += op->nrof;
1791 /* Weight handling gets pretty funky. Since we are adding to 1665 /* Weight handling gets pretty funky. Since we are adding to
1792 * tmp->nrof, we need to increase the weight. 1666 * tmp->nrof, we need to increase the weight.
1793 */ 1667 */
1794 add_weight (where, op->weight * op->nrof); 1668 add_weight (this, op->weight * op->nrof);
1795 SET_FLAG (op, FLAG_REMOVED); 1669 SET_FLAG (op, FLAG_REMOVED);
1796 free_object (op); /* free the inserted object */ 1670 op->destroy (); /* free the inserted object */
1797 op = tmp; 1671 op = tmp;
1798 remove_ob (op); /* and fix old object's links */ 1672 op->remove (); /* and fix old object's links */
1799 CLEAR_FLAG (op, FLAG_REMOVED); 1673 CLEAR_FLAG (op, FLAG_REMOVED);
1800 break; 1674 break;
1801 } 1675 }
1802 1676
1803 /* I assume combined objects have no inventory 1677 /* I assume combined objects have no inventory
1804 * We add the weight - this object could have just been removed 1678 * We add the weight - this object could have just been removed
1805 * (if it was possible to merge). calling remove_ob will subtract 1679 * (if it was possible to merge). calling remove_ob will subtract
1806 * the weight, so we need to add it in again, since we actually do 1680 * the weight, so we need to add it in again, since we actually do
1807 * the linking below 1681 * the linking below
1808 */ 1682 */
1809 add_weight (where, op->weight * op->nrof); 1683 add_weight (this, op->weight * op->nrof);
1810 } 1684 }
1811 else 1685 else
1812 add_weight (where, (op->weight + op->carrying)); 1686 add_weight (this, (op->weight + op->carrying));
1813 1687
1814 otmp = is_player_inv (where); 1688 otmp = this->in_player ();
1815 if (otmp && otmp->contr != NULL) 1689 if (otmp && otmp->contr)
1816 {
1817 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1690 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1818 fix_player (otmp); 1691 otmp->update_stats ();
1819 }
1820 1692
1821 op->map = NULL; 1693 op->map = 0;
1822 op->env = where; 1694 op->env = this;
1823 op->above = NULL; 1695 op->above = 0;
1824 op->below = NULL; 1696 op->below = 0;
1825 op->x = 0, op->y = 0; 1697 op->x = 0, op->y = 0;
1826 1698
1827 /* reset the light list and los of the players on the map */ 1699 /* reset the light list and los of the players on the map */
1828 if ((op->glow_radius != 0) && where->map) 1700 if ((op->glow_radius != 0) && map)
1829 { 1701 {
1830#ifdef DEBUG_LIGHTS 1702#ifdef DEBUG_LIGHTS
1831 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1703 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1832#endif /* DEBUG_LIGHTS */ 1704#endif /* DEBUG_LIGHTS */
1833 if (MAP_DARKNESS (where->map)) 1705 if (map->darkness)
1834 update_all_los (where->map, where->x, where->y); 1706 update_all_los (map, x, y);
1835 } 1707 }
1836 1708
1837 /* Client has no idea of ordering so lets not bother ordering it here. 1709 /* Client has no idea of ordering so lets not bother ordering it here.
1838 * It sure simplifies this function... 1710 * It sure simplifies this function...
1839 */ 1711 */
1840 if (where->inv == NULL) 1712 if (!inv)
1841 where->inv = op; 1713 inv = op;
1842 else 1714 else
1843 { 1715 {
1844 op->below = where->inv; 1716 op->below = inv;
1845 op->below->above = op; 1717 op->below->above = op;
1846 where->inv = op; 1718 inv = op;
1847 } 1719 }
1720
1721 INVOKE_OBJECT (INSERT, this);
1722
1848 return op; 1723 return op;
1849} 1724}
1850 1725
1851/* 1726/*
1852 * Checks if any objects has a move_type that matches objects 1727 * Checks if any objects has a move_type that matches objects
… …
1866 * 1741 *
1867 * MSW 2001-07-08: Check all objects on space, not just those below 1742 * MSW 2001-07-08: Check all objects on space, not just those below
1868 * object being inserted. insert_ob_in_map may not put new objects 1743 * object being inserted. insert_ob_in_map may not put new objects
1869 * on top. 1744 * on top.
1870 */ 1745 */
1871
1872int 1746int
1873check_move_on (object *op, object *originator) 1747check_move_on (object *op, object *originator)
1874{ 1748{
1875 object *tmp; 1749 object *tmp;
1876 maptile *m = op->map; 1750 maptile *m = op->map;
… …
1903 1777
1904 /* The objects have to be checked from top to bottom. 1778 /* The objects have to be checked from top to bottom.
1905 * Hence, we first go to the top: 1779 * Hence, we first go to the top:
1906 */ 1780 */
1907 1781
1908 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1782 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1909 { 1783 {
1910 /* Trim the search when we find the first other spell effect 1784 /* Trim the search when we find the first other spell effect
1911 * this helps performance so that if a space has 50 spell objects, 1785 * this helps performance so that if a space has 50 spell objects,
1912 * we don't need to check all of them. 1786 * we don't need to check all of them.
1913 */ 1787 */
… …
1968/* 1842/*
1969 * present_arch(arch, map, x, y) searches for any objects with 1843 * present_arch(arch, map, x, y) searches for any objects with
1970 * a matching archetype at the given map and coordinates. 1844 * a matching archetype at the given map and coordinates.
1971 * The first matching object is returned, or NULL if none. 1845 * The first matching object is returned, or NULL if none.
1972 */ 1846 */
1973
1974object * 1847object *
1975present_arch (const archetype *at, maptile *m, int x, int y) 1848present_arch (const archetype *at, maptile *m, int x, int y)
1976{ 1849{
1977 object *
1978 tmp;
1979
1980 if (m == NULL || out_of_map (m, x, y)) 1850 if (!m || out_of_map (m, x, y))
1981 { 1851 {
1982 LOG (llevError, "Present_arch called outside map.\n"); 1852 LOG (llevError, "Present_arch called outside map.\n");
1983 return NULL; 1853 return NULL;
1984 } 1854 }
1985 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1855
1856 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1986 if (tmp->arch == at) 1857 if (tmp->arch == at)
1987 return tmp; 1858 return tmp;
1859
1988 return NULL; 1860 return NULL;
1989} 1861}
1990 1862
1991/* 1863/*
1992 * present(type, map, x, y) searches for any objects with 1864 * present(type, map, x, y) searches for any objects with
1993 * a matching type variable at the given map and coordinates. 1865 * a matching type variable at the given map and coordinates.
1994 * The first matching object is returned, or NULL if none. 1866 * The first matching object is returned, or NULL if none.
1995 */ 1867 */
1996
1997object * 1868object *
1998present (unsigned char type, maptile *m, int x, int y) 1869present (unsigned char type, maptile *m, int x, int y)
1999{ 1870{
2000 object *
2001 tmp;
2002
2003 if (out_of_map (m, x, y)) 1871 if (out_of_map (m, x, y))
2004 { 1872 {
2005 LOG (llevError, "Present called outside map.\n"); 1873 LOG (llevError, "Present called outside map.\n");
2006 return NULL; 1874 return NULL;
2007 } 1875 }
2008 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1876
1877 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2009 if (tmp->type == type) 1878 if (tmp->type == type)
2010 return tmp; 1879 return tmp;
1880
2011 return NULL; 1881 return NULL;
2012} 1882}
2013 1883
2014/* 1884/*
2015 * present_in_ob(type, object) searches for any objects with 1885 * present_in_ob(type, object) searches for any objects with
2016 * a matching type variable in the inventory of the given object. 1886 * a matching type variable in the inventory of the given object.
2017 * The first matching object is returned, or NULL if none. 1887 * The first matching object is returned, or NULL if none.
2018 */ 1888 */
2019
2020object * 1889object *
2021present_in_ob (unsigned char type, const object *op) 1890present_in_ob (unsigned char type, const object *op)
2022{ 1891{
2023 object *
2024 tmp;
2025
2026 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1892 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2027 if (tmp->type == type) 1893 if (tmp->type == type)
2028 return tmp; 1894 return tmp;
1895
2029 return NULL; 1896 return NULL;
2030} 1897}
2031 1898
2032/* 1899/*
2033 * present_in_ob (type, str, object) searches for any objects with 1900 * present_in_ob (type, str, object) searches for any objects with
… …
2041 * str is the string to match against. Note that we match against 1908 * str is the string to match against. Note that we match against
2042 * the object name, not the archetype name. this is so that the 1909 * the object name, not the archetype name. this is so that the
2043 * spell code can use one object type (force), but change it's name 1910 * spell code can use one object type (force), but change it's name
2044 * to be unique. 1911 * to be unique.
2045 */ 1912 */
2046
2047object * 1913object *
2048present_in_ob_by_name (int type, const char *str, const object *op) 1914present_in_ob_by_name (int type, const char *str, const object *op)
2049{ 1915{
2050 object *
2051 tmp;
2052
2053 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1916 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2054 {
2055 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1917 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2056 return tmp; 1918 return tmp;
2057 } 1919
2058 return NULL; 1920 return 0;
2059} 1921}
2060 1922
2061/* 1923/*
2062 * present_arch_in_ob(archetype, object) searches for any objects with 1924 * present_arch_in_ob(archetype, object) searches for any objects with
2063 * a matching archetype in the inventory of the given object. 1925 * a matching archetype in the inventory of the given object.
2064 * The first matching object is returned, or NULL if none. 1926 * The first matching object is returned, or NULL if none.
2065 */ 1927 */
2066
2067object * 1928object *
2068present_arch_in_ob (const archetype *at, const object *op) 1929present_arch_in_ob (const archetype *at, const object *op)
2069{ 1930{
2070 object *
2071 tmp;
2072
2073 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1931 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2074 if (tmp->arch == at) 1932 if (tmp->arch == at)
2075 return tmp; 1933 return tmp;
1934
2076 return NULL; 1935 return NULL;
2077} 1936}
2078 1937
2079/* 1938/*
2080 * activate recursively a flag on an object inventory 1939 * activate recursively a flag on an object inventory
2081 */ 1940 */
2082void 1941void
2083flag_inv (object *op, int flag) 1942flag_inv (object *op, int flag)
2084{ 1943{
2085 object *
2086 tmp;
2087
2088 if (op->inv) 1944 if (op->inv)
2089 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1945 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2090 { 1946 {
2091 SET_FLAG (tmp, flag); 1947 SET_FLAG (tmp, flag);
2092 flag_inv (tmp, flag); 1948 flag_inv (tmp, flag);
2093 } 1949 }
2094} /* 1950}
1951
1952/*
2095 * desactivate recursively a flag on an object inventory 1953 * deactivate recursively a flag on an object inventory
2096 */ 1954 */
2097void 1955void
2098unflag_inv (object *op, int flag) 1956unflag_inv (object *op, int flag)
2099{ 1957{
2100 object *
2101 tmp;
2102
2103 if (op->inv) 1958 if (op->inv)
2104 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1959 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2105 { 1960 {
2106 CLEAR_FLAG (tmp, flag); 1961 CLEAR_FLAG (tmp, flag);
2107 unflag_inv (tmp, flag); 1962 unflag_inv (tmp, flag);
2108 } 1963 }
2109} 1964}
… …
2112 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1967 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2113 * all it's inventory (recursively). 1968 * all it's inventory (recursively).
2114 * If checksums are used, a player will get set_cheat called for 1969 * If checksums are used, a player will get set_cheat called for
2115 * him/her-self and all object carried by a call to this function. 1970 * him/her-self and all object carried by a call to this function.
2116 */ 1971 */
2117
2118void 1972void
2119set_cheat (object *op) 1973set_cheat (object *op)
2120{ 1974{
2121 SET_FLAG (op, FLAG_WAS_WIZ); 1975 SET_FLAG (op, FLAG_WAS_WIZ);
2122 flag_inv (op, FLAG_WAS_WIZ); 1976 flag_inv (op, FLAG_WAS_WIZ);
… …
2141 * because arch_blocked (now ob_blocked) needs to know the movement type 1995 * because arch_blocked (now ob_blocked) needs to know the movement type
2142 * to know if the space in question will block the object. We can't use 1996 * to know if the space in question will block the object. We can't use
2143 * the archetype because that isn't correct if the monster has been 1997 * the archetype because that isn't correct if the monster has been
2144 * customized, changed states, etc. 1998 * customized, changed states, etc.
2145 */ 1999 */
2146
2147int 2000int
2148find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2001find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2149{ 2002{
2150 int
2151 i,
2152 index = 0, flag; 2003 int index = 0, flag;
2153 static int
2154 altern[SIZEOFFREE]; 2004 int altern[SIZEOFFREE];
2155 2005
2156 for (i = start; i < stop; i++) 2006 for (int i = start; i < stop; i++)
2157 { 2007 {
2158 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2008 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2159 if (!flag) 2009 if (!flag)
2160 altern[index++] = i; 2010 altern [index++] = i;
2161 2011
2162 /* Basically, if we find a wall on a space, we cut down the search size. 2012 /* Basically, if we find a wall on a space, we cut down the search size.
2163 * In this way, we won't return spaces that are on another side of a wall. 2013 * In this way, we won't return spaces that are on another side of a wall.
2164 * This mostly work, but it cuts down the search size in all directions - 2014 * This mostly work, but it cuts down the search size in all directions -
2165 * if the space being examined only has a wall to the north and empty 2015 * if the space being examined only has a wall to the north and empty
2166 * spaces in all the other directions, this will reduce the search space 2016 * spaces in all the other directions, this will reduce the search space
2167 * to only the spaces immediately surrounding the target area, and 2017 * to only the spaces immediately surrounding the target area, and
2168 * won't look 2 spaces south of the target space. 2018 * won't look 2 spaces south of the target space.
2169 */ 2019 */
2170 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2020 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2171 stop = maxfree[i]; 2021 stop = maxfree[i];
2172 } 2022 }
2023
2173 if (!index) 2024 if (!index)
2174 return -1; 2025 return -1;
2026
2175 return altern[RANDOM () % index]; 2027 return altern[RANDOM () % index];
2176} 2028}
2177 2029
2178/* 2030/*
2179 * find_first_free_spot(archetype, maptile, x, y) works like 2031 * find_first_free_spot(archetype, maptile, x, y) works like
2180 * find_free_spot(), but it will search max number of squares. 2032 * find_free_spot(), but it will search max number of squares.
2181 * But it will return the first available spot, not a random choice. 2033 * But it will return the first available spot, not a random choice.
2182 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2034 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2183 */ 2035 */
2184
2185int 2036int
2186find_first_free_spot (const object *ob, maptile *m, int x, int y) 2037find_first_free_spot (const object *ob, maptile *m, int x, int y)
2187{ 2038{
2188 int
2189 i;
2190
2191 for (i = 0; i < SIZEOFFREE; i++) 2039 for (int i = 0; i < SIZEOFFREE; i++)
2192 {
2193 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2040 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2194 return i; 2041 return i;
2195 } 2042
2196 return -1; 2043 return -1;
2197} 2044}
2198 2045
2199/* 2046/*
2200 * The function permute(arr, begin, end) randomly reorders the array 2047 * The function permute(arr, begin, end) randomly reorders the array
2201 * arr[begin..end-1]. 2048 * arr[begin..end-1].
2049 * now uses a fisher-yates shuffle, old permute was broken
2202 */ 2050 */
2203static void 2051static void
2204permute (int *arr, int begin, int end) 2052permute (int *arr, int begin, int end)
2205{ 2053{
2206 int 2054 arr += begin;
2207 i,
2208 j,
2209 tmp,
2210 len;
2211
2212 len = end - begin; 2055 end -= begin;
2213 for (i = begin; i < end; i++)
2214 {
2215 j = begin + RANDOM () % len;
2216 2056
2217 tmp = arr[i]; 2057 while (--end)
2218 arr[i] = arr[j]; 2058 swap (arr [end], arr [RANDOM () % (end + 1)]);
2219 arr[j] = tmp;
2220 }
2221} 2059}
2222 2060
2223/* new function to make monster searching more efficient, and effective! 2061/* new function to make monster searching more efficient, and effective!
2224 * This basically returns a randomized array (in the passed pointer) of 2062 * This basically returns a randomized array (in the passed pointer) of
2225 * the spaces to find monsters. In this way, it won't always look for 2063 * the spaces to find monsters. In this way, it won't always look for
… …
2228 * the 3x3 area will be searched, just not in a predictable order. 2066 * the 3x3 area will be searched, just not in a predictable order.
2229 */ 2067 */
2230void 2068void
2231get_search_arr (int *search_arr) 2069get_search_arr (int *search_arr)
2232{ 2070{
2233 int 2071 int i;
2234 i;
2235 2072
2236 for (i = 0; i < SIZEOFFREE; i++) 2073 for (i = 0; i < SIZEOFFREE; i++)
2237 {
2238 search_arr[i] = i; 2074 search_arr[i] = i;
2239 }
2240 2075
2241 permute (search_arr, 1, SIZEOFFREE1 + 1); 2076 permute (search_arr, 1, SIZEOFFREE1 + 1);
2242 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2077 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2243 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2078 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2244} 2079}
… …
2253 * Perhaps incorrectly, but I'm making the assumption that exclude 2088 * Perhaps incorrectly, but I'm making the assumption that exclude
2254 * is actually want is going to try and move there. We need this info 2089 * is actually want is going to try and move there. We need this info
2255 * because we have to know what movement the thing looking to move 2090 * because we have to know what movement the thing looking to move
2256 * there is capable of. 2091 * there is capable of.
2257 */ 2092 */
2258
2259int 2093int
2260find_dir (maptile *m, int x, int y, object *exclude) 2094find_dir (maptile *m, int x, int y, object *exclude)
2261{ 2095{
2262 int
2263 i,
2264 max = SIZEOFFREE, mflags; 2096 int i, max = SIZEOFFREE, mflags;
2265 2097
2266 sint16 nx, ny; 2098 sint16 nx, ny;
2267 object * 2099 object *tmp;
2268 tmp;
2269 maptile * 2100 maptile *mp;
2270 mp;
2271 2101
2272 MoveType blocked, move_type; 2102 MoveType blocked, move_type;
2273 2103
2274 if (exclude && exclude->head) 2104 if (exclude && exclude->head)
2275 { 2105 {
… …
2287 mp = m; 2117 mp = m;
2288 nx = x + freearr_x[i]; 2118 nx = x + freearr_x[i];
2289 ny = y + freearr_y[i]; 2119 ny = y + freearr_y[i];
2290 2120
2291 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2121 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2122
2292 if (mflags & P_OUT_OF_MAP) 2123 if (mflags & P_OUT_OF_MAP)
2293 {
2294 max = maxfree[i]; 2124 max = maxfree[i];
2295 }
2296 else 2125 else
2297 { 2126 {
2298 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2127 mapspace &ms = mp->at (nx, ny);
2128
2129 blocked = ms.move_block;
2299 2130
2300 if ((move_type & blocked) == move_type) 2131 if ((move_type & blocked) == move_type)
2301 {
2302 max = maxfree[i]; 2132 max = maxfree[i];
2303 }
2304 else if (mflags & P_IS_ALIVE) 2133 else if (mflags & P_IS_ALIVE)
2305 { 2134 {
2306 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2135 for (tmp = ms.bot; tmp; tmp = tmp->above)
2307 { 2136 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2308 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2137 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2309 {
2310 break; 2138 break;
2311 } 2139
2312 }
2313 if (tmp) 2140 if (tmp)
2314 {
2315 return freedir[i]; 2141 return freedir[i];
2316 }
2317 } 2142 }
2318 } 2143 }
2319 } 2144 }
2145
2320 return 0; 2146 return 0;
2321} 2147}
2322 2148
2323/* 2149/*
2324 * distance(object 1, object 2) will return the square of the 2150 * distance(object 1, object 2) will return the square of the
2325 * distance between the two given objects. 2151 * distance between the two given objects.
2326 */ 2152 */
2327
2328int 2153int
2329distance (const object *ob1, const object *ob2) 2154distance (const object *ob1, const object *ob2)
2330{ 2155{
2331 int
2332 i;
2333
2334 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2156 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2335 return i;
2336} 2157}
2337 2158
2338/* 2159/*
2339 * find_dir_2(delta-x,delta-y) will return a direction in which 2160 * find_dir_2(delta-x,delta-y) will return a direction in which
2340 * an object which has subtracted the x and y coordinates of another 2161 * an object which has subtracted the x and y coordinates of another
2341 * object, needs to travel toward it. 2162 * object, needs to travel toward it.
2342 */ 2163 */
2343
2344int 2164int
2345find_dir_2 (int x, int y) 2165find_dir_2 (int x, int y)
2346{ 2166{
2347 int 2167 int q;
2348 q;
2349 2168
2350 if (y) 2169 if (y)
2351 q = x * 100 / y; 2170 q = x * 100 / y;
2352 else if (x) 2171 else if (x)
2353 q = -300 * x; 2172 q = -300 * x;
… …
2388int 2207int
2389absdir (int d) 2208absdir (int d)
2390{ 2209{
2391 while (d < 1) 2210 while (d < 1)
2392 d += 8; 2211 d += 8;
2212
2393 while (d > 8) 2213 while (d > 8)
2394 d -= 8; 2214 d -= 8;
2215
2395 return d; 2216 return d;
2396} 2217}
2397 2218
2398/* 2219/*
2399 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2220 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2401 */ 2222 */
2402 2223
2403int 2224int
2404dirdiff (int dir1, int dir2) 2225dirdiff (int dir1, int dir2)
2405{ 2226{
2406 int 2227 int d;
2407 d;
2408 2228
2409 d = abs (dir1 - dir2); 2229 d = abs (dir1 - dir2);
2410 if (d > 4) 2230 if (d > 4)
2411 d = 8 - d; 2231 d = 8 - d;
2232
2412 return d; 2233 return d;
2413} 2234}
2414 2235
2415/* peterm: 2236/* peterm:
2416 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2237 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2419 * This basically means that if direction is 15, then it could either go 2240 * This basically means that if direction is 15, then it could either go
2420 * direction 4, 14, or 16 to get back to where we are. 2241 * direction 4, 14, or 16 to get back to where we are.
2421 * Moved from spell_util.c to object.c with the other related direction 2242 * Moved from spell_util.c to object.c with the other related direction
2422 * functions. 2243 * functions.
2423 */ 2244 */
2424
2425int
2426 reduction_dir[SIZEOFFREE][3] = { 2245int reduction_dir[SIZEOFFREE][3] = {
2427 {0, 0, 0}, /* 0 */ 2246 {0, 0, 0}, /* 0 */
2428 {0, 0, 0}, /* 1 */ 2247 {0, 0, 0}, /* 1 */
2429 {0, 0, 0}, /* 2 */ 2248 {0, 0, 0}, /* 2 */
2430 {0, 0, 0}, /* 3 */ 2249 {0, 0, 0}, /* 3 */
2431 {0, 0, 0}, /* 4 */ 2250 {0, 0, 0}, /* 4 */
… …
2479 * find a path to that monster that we found. If not, 2298 * find a path to that monster that we found. If not,
2480 * we don't bother going toward it. Returns 1 if we 2299 * we don't bother going toward it. Returns 1 if we
2481 * can see a direct way to get it 2300 * can see a direct way to get it
2482 * Modified to be map tile aware -.MSW 2301 * Modified to be map tile aware -.MSW
2483 */ 2302 */
2484
2485
2486int 2303int
2487can_see_monsterP (maptile *m, int x, int y, int dir) 2304can_see_monsterP (maptile *m, int x, int y, int dir)
2488{ 2305{
2489 sint16 dx, dy; 2306 sint16 dx, dy;
2490 int
2491 mflags; 2307 int mflags;
2492 2308
2493 if (dir < 0) 2309 if (dir < 0)
2494 return 0; /* exit condition: invalid direction */ 2310 return 0; /* exit condition: invalid direction */
2495 2311
2496 dx = x + freearr_x[dir]; 2312 dx = x + freearr_x[dir];
… …
2509 return 0; 2325 return 0;
2510 2326
2511 /* yes, can see. */ 2327 /* yes, can see. */
2512 if (dir < 9) 2328 if (dir < 9)
2513 return 1; 2329 return 1;
2330
2514 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2331 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2515 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2332 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2333 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2516} 2334}
2517
2518
2519 2335
2520/* 2336/*
2521 * can_pick(picker, item): finds out if an object is possible to be 2337 * can_pick(picker, item): finds out if an object is possible to be
2522 * picked up by the picker. Returnes 1 if it can be 2338 * picked up by the picker. Returnes 1 if it can be
2523 * picked up, otherwise 0. 2339 * picked up, otherwise 0.
… …
2534 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2350 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2535 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2351 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2536 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2352 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2537} 2353}
2538 2354
2539
2540/* 2355/*
2541 * create clone from object to another 2356 * create clone from object to another
2542 */ 2357 */
2543object * 2358object *
2544object_create_clone (object *asrc) 2359object_create_clone (object *asrc)
2545{ 2360{
2546 object *
2547 dst = NULL, *tmp, *src, *part, *prev, *item; 2361 object *dst = 0, *tmp, *src, *part, *prev, *item;
2548 2362
2549 if (!asrc) 2363 if (!asrc)
2550 return NULL; 2364 return 0;
2365
2551 src = asrc; 2366 src = asrc;
2552 if (src->head) 2367 if (src->head)
2553 src = src->head; 2368 src = src->head;
2554 2369
2555 prev = NULL; 2370 prev = 0;
2556 for (part = src; part; part = part->more) 2371 for (part = src; part; part = part->more)
2557 { 2372 {
2558 tmp = get_object (); 2373 tmp = part->clone ();
2559 copy_object (part, tmp);
2560 tmp->x -= src->x; 2374 tmp->x -= src->x;
2561 tmp->y -= src->y; 2375 tmp->y -= src->y;
2376
2562 if (!part->head) 2377 if (!part->head)
2563 { 2378 {
2564 dst = tmp; 2379 dst = tmp;
2565 tmp->head = NULL; 2380 tmp->head = 0;
2566 } 2381 }
2567 else 2382 else
2568 {
2569 tmp->head = dst; 2383 tmp->head = dst;
2570 } 2384
2571 tmp->more = NULL; 2385 tmp->more = 0;
2386
2572 if (prev) 2387 if (prev)
2573 prev->more = tmp; 2388 prev->more = tmp;
2389
2574 prev = tmp; 2390 prev = tmp;
2575 } 2391 }
2576 2392
2577 for (item = src->inv; item; item = item->below) 2393 for (item = src->inv; item; item = item->below)
2578 insert_ob_in_ob (object_create_clone (item), dst); 2394 insert_ob_in_ob (object_create_clone (item), dst);
… …
2584/* Basically, we save the content of the string to a temp file, then call */ 2400/* Basically, we save the content of the string to a temp file, then call */
2585/* load_object on it. I admit it is a highly inefficient way to make things, */ 2401/* load_object on it. I admit it is a highly inefficient way to make things, */
2586/* but it was simple to make and allows reusing the load_object function. */ 2402/* but it was simple to make and allows reusing the load_object function. */
2587/* Remember not to use load_object_str in a time-critical situation. */ 2403/* Remember not to use load_object_str in a time-critical situation. */
2588/* Also remember that multiparts objects are not supported for now. */ 2404/* Also remember that multiparts objects are not supported for now. */
2589
2590object * 2405object *
2591load_object_str (const char *obstr) 2406load_object_str (const char *obstr)
2592{ 2407{
2593 object *op; 2408 object *op;
2594 char filename[MAX_BUF]; 2409 char filename[MAX_BUF];
… …
2604 } 2419 }
2605 2420
2606 fprintf (tempfile, obstr); 2421 fprintf (tempfile, obstr);
2607 fclose (tempfile); 2422 fclose (tempfile);
2608 2423
2609 op = get_object (); 2424 op = object::create ();
2610 2425
2611 object_thawer thawer (filename); 2426 object_thawer thawer (filename);
2612 2427
2613 if (thawer) 2428 if (thawer)
2614 load_object (thawer, op, 0); 2429 load_object (thawer, op, 0);
… …
2624 * returns NULL if no match. 2439 * returns NULL if no match.
2625 */ 2440 */
2626object * 2441object *
2627find_obj_by_type_subtype (const object *who, int type, int subtype) 2442find_obj_by_type_subtype (const object *who, int type, int subtype)
2628{ 2443{
2629 object *tmp;
2630
2631 for (tmp = who->inv; tmp; tmp = tmp->below) 2444 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2632 if (tmp->type == type && tmp->subtype == subtype) 2445 if (tmp->type == type && tmp->subtype == subtype)
2633 return tmp; 2446 return tmp;
2634 2447
2635 return NULL; 2448 return 0;
2636} 2449}
2637 2450
2638/* If ob has a field named key, return the link from the list, 2451/* If ob has a field named key, return the link from the list,
2639 * otherwise return NULL. 2452 * otherwise return NULL.
2640 * 2453 *
… …
2642 * do the desired thing. 2455 * do the desired thing.
2643 */ 2456 */
2644key_value * 2457key_value *
2645get_ob_key_link (const object *ob, const char *key) 2458get_ob_key_link (const object *ob, const char *key)
2646{ 2459{
2647 key_value *link;
2648
2649 for (link = ob->key_values; link != NULL; link = link->next) 2460 for (key_value *link = ob->key_values; link; link = link->next)
2650 if (link->key == key) 2461 if (link->key == key)
2651 return link; 2462 return link;
2652 2463
2653 return NULL; 2464 return 0;
2654} 2465}
2655 2466
2656/* 2467/*
2657 * Returns the value of op has an extra_field for key, or NULL. 2468 * Returns the value of op has an extra_field for key, or NULL.
2658 * 2469 *
… …
2698 * Returns TRUE on success. 2509 * Returns TRUE on success.
2699 */ 2510 */
2700int 2511int
2701set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2512set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2702{ 2513{
2703 key_value *
2704 field = NULL, *last = NULL; 2514 key_value *field = NULL, *last = NULL;
2705 2515
2706 for (field = op->key_values; field != NULL; field = field->next) 2516 for (field = op->key_values; field != NULL; field = field->next)
2707 { 2517 {
2708 if (field->key != canonical_key) 2518 if (field->key != canonical_key)
2709 { 2519 {
… …
2737 /* IF we get here, key doesn't exist */ 2547 /* IF we get here, key doesn't exist */
2738 2548
2739 /* No field, we'll have to add it. */ 2549 /* No field, we'll have to add it. */
2740 2550
2741 if (!add_key) 2551 if (!add_key)
2742 {
2743 return FALSE; 2552 return FALSE;
2744 } 2553
2745 /* There isn't any good reason to store a null 2554 /* There isn't any good reason to store a null
2746 * value in the key/value list. If the archetype has 2555 * value in the key/value list. If the archetype has
2747 * this key, then we should also have it, so shouldn't 2556 * this key, then we should also have it, so shouldn't
2748 * be here. If user wants to store empty strings, 2557 * be here. If user wants to store empty strings,
2749 * should pass in "" 2558 * should pass in ""
… …
2798 } 2607 }
2799 else 2608 else
2800 item = item->env; 2609 item = item->env;
2801} 2610}
2802 2611
2612
2613const char *
2614object::flag_desc (char *desc, int len) const
2615{
2616 char *p = desc;
2617 bool first = true;
2618
2619 *p = 0;
2620
2621 for (int i = 0; i < NUM_FLAGS; i++)
2622 {
2623 if (len <= 10) // magic constant!
2624 {
2625 snprintf (p, len, ",...");
2626 break;
2627 }
2628
2629 if (flag [i])
2630 {
2631 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2632 len -= cnt;
2633 p += cnt;
2634 first = false;
2635 }
2636 }
2637
2638 return desc;
2639}
2640
2803// return a suitable string describing an objetc in enough detail to find it 2641// return a suitable string describing an object in enough detail to find it
2804const char * 2642const char *
2805object::debug_desc (char *info) const 2643object::debug_desc (char *info) const
2806{ 2644{
2645 char flagdesc[512];
2807 char info2[256 * 3]; 2646 char info2[256 * 4];
2808 char *p = info; 2647 char *p = info;
2809 2648
2810 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2649 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2811 count, 2650 count, uuid.seq,
2812 &name, 2651 &name,
2813 title ? " " : "", 2652 title ? "\",title:" : "",
2814 title ? (const char *)title : ""); 2653 title ? (const char *)title : "",
2654 flag_desc (flagdesc, 512), type);
2815 2655
2816 if (env) 2656 if (env)
2817 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2657 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2818 2658
2819 if (map) 2659 if (map)
2820 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2660 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2821 2661
2822 return info; 2662 return info;
2823} 2663}
2824 2664
2825const char * 2665const char *
2826object::debug_desc () const 2666object::debug_desc () const
2827{ 2667{
2828 static char info[256 * 3]; 2668 static char info[256 * 4];
2829 return debug_desc (info); 2669 return debug_desc (info);
2830} 2670}
2831 2671

Diff Legend

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