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.53 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.75 by root, Wed Dec 20 11:36:38 2006 UTC

… …
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <loader.h> 33#include <loader.h>
34
35#include <bitset>
34 36
35int nrofallocobjects = 0; 37int nrofallocobjects = 0;
36static UUID uuid; 38static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
38 40
… …
104 _exit (1); 106 _exit (1);
105 } 107 }
106 108
107 uuid.seq = uid; 109 uuid.seq = uid;
108 write_uuid (); 110 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 112 fclose (fp);
111} 113}
112 114
113UUID 115UUID
114gen_uuid () 116gen_uuid ()
… …
183 * 185 *
184 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
187 * 189 *
188 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
189 * 191 *
190 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
191 * check weight 193 * check weight
192 */ 194 */
193 195
194bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
195{ 197{
196 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
198 return 0; 204 return 0;
199 205
200 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 209 * used to store nrof).
206 */ 210 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 222
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 225
222 226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 251 return 0;
254 252
255 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 254 * check all objects in the inventory.
257 */ 255 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 260 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 264 return 0;
267 265
268 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 267 * if it is valid.
270 */ 268 */
… …
354 op = op->env; 352 op = op->env;
355 return op; 353 return op;
356} 354}
357 355
358/* 356/*
359 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
360 * a better check. We basically keeping traversing up until we can't
361 * or find a player.
362 */
363
364object *
365is_player_inv (object *op)
366{
367 for (; op != NULL && op->type != PLAYER; op = op->env)
368 if (op->env == op)
369 op->env = NULL;
370 return op;
371}
372
373/*
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 358 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array. 359 * The result of the dump is stored in the static global errmsg array.
377 */ 360 */
378 361
… …
412 */ 395 */
413 396
414object * 397object *
415find_object (tag_t i) 398find_object (tag_t i)
416{ 399{
417 object *op;
418
419 for (op = object::first; op != NULL; op = op->next) 400 for (object *op = object::first; op; op = op->next)
420 if (op->count == i) 401 if (op->count == i)
421 break; 402 return op;
422 403
423 return op; 404 return 0;
424} 405}
425 406
426/* 407/*
427 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
428 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
528 509
529 if (settings.casting_time) 510 if (settings.casting_time)
530 casting_time = -1; 511 casting_time = -1;
531} 512}
532 513
533void object::clone (object *destination)
534{
535 *(object_copy *)destination = *this;
536 *(object_pod *)destination = *this;
537
538 if (self || cb)
539 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
540}
541
542/* 514/*
543 * copy object first frees everything allocated by the second object, 515 * copy_to first frees everything allocated by the dst object,
544 * and then copies the contends of the first object into the second 516 * and then copies the contents of itself into the second
545 * object, allocating what needs to be allocated. Basically, any 517 * object, allocating what needs to be allocated. Basically, any
546 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 518 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
547 * if the first object is freed, the pointers in the new object 519 * if the first object is freed, the pointers in the new object
548 * will point at garbage. 520 * will point at garbage.
549 */ 521 */
550void 522void
551copy_object (object *op2, object *op) 523object::copy_to (object *dst)
552{ 524{
553 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
554 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
555 527
556 op2->clone (op); 528 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
557 533
558 if (is_freed) 534 if (is_freed)
559 SET_FLAG (op, FLAG_FREED); 535 SET_FLAG (dst, FLAG_FREED);
536
560 if (is_removed) 537 if (is_removed)
561 SET_FLAG (op, FLAG_REMOVED); 538 SET_FLAG (dst, FLAG_REMOVED);
562 539
563 if (op2->speed < 0) 540 if (speed < 0)
564 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 541 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
565 542
566 /* Copy over key_values, if any. */ 543 /* Copy over key_values, if any. */
567 if (op2->key_values) 544 if (key_values)
568 { 545 {
569 key_value *tail = 0; 546 key_value *tail = 0;
570 key_value *i; 547 key_value *i;
571 548
572 op->key_values = 0; 549 dst->key_values = 0;
573 550
574 for (i = op2->key_values; i; i = i->next) 551 for (i = key_values; i; i = i->next)
575 { 552 {
576 key_value *new_link = new key_value; 553 key_value *new_link = new key_value;
577 554
578 new_link->next = 0; 555 new_link->next = 0;
579 new_link->key = i->key; 556 new_link->key = i->key;
580 new_link->value = i->value; 557 new_link->value = i->value;
581 558
582 /* Try and be clever here, too. */ 559 /* Try and be clever here, too. */
583 if (!op->key_values) 560 if (!dst->key_values)
584 { 561 {
585 op->key_values = new_link; 562 dst->key_values = new_link;
586 tail = new_link; 563 tail = new_link;
587 } 564 }
588 else 565 else
589 { 566 {
590 tail->next = new_link; 567 tail->next = new_link;
591 tail = new_link; 568 tail = new_link;
592 } 569 }
593 } 570 }
594 } 571 }
595 572
596 update_ob_speed (op); 573 update_ob_speed (dst);
574}
575
576object *
577object::clone ()
578{
579 object *neu = create ();
580 copy_to (neu);
581 return neu;
597} 582}
598 583
599/* 584/*
600 * If an object with the IS_TURNABLE() flag needs to be turned due 585 * If an object with the IS_TURNABLE() flag needs to be turned due
601 * to the closest player being on the other side, this function can 586 * to the closest player being on the other side, this function can
… …
709 op->active_next = NULL; 694 op->active_next = NULL;
710 op->active_prev = NULL; 695 op->active_prev = NULL;
711} 696}
712 697
713/* 698/*
714 * update_object() updates the array which represents the map. 699 * update_object() updates the the map.
715 * It takes into account invisible objects (and represent squares covered 700 * It takes into account invisible objects (and represent squares covered
716 * by invisible objects by whatever is below them (unless it's another 701 * by invisible objects by whatever is below them (unless it's another
717 * invisible object, etc...) 702 * invisible object, etc...)
718 * If the object being updated is beneath a player, the look-window 703 * If the object being updated is beneath a player, the look-window
719 * of that player is updated (this might be a suboptimal way of 704 * of that player is updated (this might be a suboptimal way of
720 * updating that window, though, since update_object() is called _often_) 705 * updating that window, though, since update_object() is called _often_)
721 * 706 *
722 * action is a hint of what the caller believes need to be done. 707 * action is a hint of what the caller believes need to be done.
723 * For example, if the only thing that has changed is the face (due to
724 * an animation), we don't need to call update_position until that actually
725 * comes into view of a player. OTOH, many other things, like addition/removal
726 * of walls or living creatures may need us to update the flags now.
727 * current action are: 708 * current action are:
728 * UP_OBJ_INSERT: op was inserted 709 * UP_OBJ_INSERT: op was inserted
729 * UP_OBJ_REMOVE: op was removed 710 * UP_OBJ_REMOVE: op was removed
730 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 711 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731 * as that is easier than trying to look at what may have changed. 712 * as that is easier than trying to look at what may have changed.
732 * UP_OBJ_FACE: only the objects face has changed. 713 * UP_OBJ_FACE: only the objects face has changed.
733 */ 714 */
734
735void 715void
736update_object (object *op, int action) 716update_object (object *op, int action)
737{ 717{
738 int update_now = 0, flags;
739 MoveType move_on, move_off, move_block, move_slow; 718 MoveType move_on, move_off, move_block, move_slow;
740 719
741 if (op == NULL) 720 if (op == NULL)
742 { 721 {
743 /* this should never happen */ 722 /* this should never happen */
744 LOG (llevDebug, "update_object() called for NULL object.\n"); 723 LOG (llevDebug, "update_object() called for NULL object.\n");
745 return; 724 return;
746 } 725 }
747 726
748 if (op->env != NULL) 727 if (op->env)
749 { 728 {
750 /* Animation is currently handled by client, so nothing 729 /* Animation is currently handled by client, so nothing
751 * to do in this case. 730 * to do in this case.
752 */ 731 */
753 return; 732 return;
… …
767 abort (); 746 abort ();
768#endif 747#endif
769 return; 748 return;
770 } 749 }
771 750
772 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 751 mapspace &m = op->map->at (op->x, op->y);
773 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778 752
753 if (m.flags_ & P_NEED_UPDATE)
754 /* nop */;
779 if (action == UP_OBJ_INSERT) 755 else if (action == UP_OBJ_INSERT)
780 { 756 {
757 // this is likely overkill, TODO: revisit (schmorp)
781 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 758 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782 update_now = 1;
783
784 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 759 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785 update_now = 1; 760 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786 761 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
762 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 763 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788 update_now = 1;
789
790 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791 update_now = 1;
792
793 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794 update_now = 1;
795
796 if ((move_on | op->move_on) != move_on) 764 || (m.move_on | op->move_on ) != m.move_on
797 update_now = 1;
798
799 if ((move_off | op->move_off) != move_off) 765 || (m.move_off | op->move_off ) != m.move_off
800 update_now = 1; 766 || (m.move_slow | op->move_slow) != m.move_slow
801
802 /* This isn't perfect, but I don't expect a lot of objects to 767 /* This isn't perfect, but I don't expect a lot of objects to
803 * to have move_allow right now. 768 * to have move_allow right now.
804 */ 769 */
805 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 770 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806 update_now = 1; 771 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807 772 m.flags_ = P_NEED_UPDATE;
808 if ((move_slow | op->move_slow) != move_slow)
809 update_now = 1;
810 } 773 }
811 /* if the object is being removed, we can't make intelligent 774 /* if the object is being removed, we can't make intelligent
812 * decisions, because remove_ob can't really pass the object 775 * decisions, because remove_ob can't really pass the object
813 * that is being removed. 776 * that is being removed.
814 */ 777 */
815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 778 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
816 update_now = 1; 779 m.flags_ = P_NEED_UPDATE;
817 else if (action == UP_OBJ_FACE) 780 else if (action == UP_OBJ_FACE)
818 /* Nothing to do for that case */ ; 781 /* Nothing to do for that case */ ;
819 else 782 else
820 LOG (llevError, "update_object called with invalid action: %d\n", action); 783 LOG (llevError, "update_object called with invalid action: %d\n", action);
821 784
822 if (update_now)
823 {
824 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
825 update_position (op->map, op->x, op->y);
826 }
827
828 if (op->more != NULL) 785 if (op->more)
829 update_object (op->more, action); 786 update_object (op->more, action);
830} 787}
831 788
832object::vector object::mortals; 789object::vector object::mortals;
833object::vector object::objects; // not yet used 790object::vector object::objects; // not yet used
… …
841 else 798 else
842 { 799 {
843 delete *i; 800 delete *i;
844 mortals.erase (i); 801 mortals.erase (i);
845 } 802 }
846
847 static int lastmortals = 0;//D
848
849 if (mortals.size() != lastmortals && lastmortals > 100)//D
850 {
851 lastmortals = mortals.size ();//D
852 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853 }
854} 803}
855 804
856object::object () 805object::object ()
857{ 806{
858 SET_FLAG (this, FLAG_REMOVED); 807 SET_FLAG (this, FLAG_REMOVED);
… …
917 866
918 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 867 if (QUERY_FLAG (this, FLAG_FRIENDLY))
919 remove_friendly_object (this); 868 remove_friendly_object (this);
920 869
921 if (!QUERY_FLAG (this, FLAG_REMOVED)) 870 if (!QUERY_FLAG (this, FLAG_REMOVED))
922 remove_ob (this); 871 remove ();
923 872
924 SET_FLAG (this, FLAG_FREED); 873 SET_FLAG (this, FLAG_FREED);
925 874
926 if (more) 875 if (more)
927 { 876 {
… …
952 901
953 while (op) 902 while (op)
954 { 903 {
955 object *tmp = op->below; 904 object *tmp = op->below;
956 905
957 remove_ob (op); 906 op->remove ();
958 907
959 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 908 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
960 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 909 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
961 free_object (op); 910 op->destroy ();
962 else 911 else
963 { 912 {
964 op->x = x; 913 op->x = x;
965 op->y = y; 914 op->y = y;
966 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 915 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
969 op = tmp; 918 op = tmp;
970 } 919 }
971 } 920 }
972 } 921 }
973 922
923 // hack to ensure that freed objects still have a valid map
924 {
925 static maptile *freed_map; // freed objects are moved here to avoid crashes
926
927 if (!freed_map)
928 {
929 freed_map = new maptile;
930
931 freed_map->name = "/internal/freed_objects_map";
932 freed_map->width = 3;
933 freed_map->height = 3;
934
935 freed_map->allocate ();
936 }
937
938 map = freed_map;
939 x = 1;
940 y = 1;
941 }
942
974 // clear those pointers that likely might have circular references to us 943 // clear those pointers that likely might have circular references to us
975 owner = 0; 944 owner = 0;
976 enemy = 0; 945 enemy = 0;
977 attacked_by = 0; 946 attacked_by = 0;
978 947
… …
990 959
991/* 960/*
992 * sub_weight() recursively (outwards) subtracts a number from the 961 * sub_weight() recursively (outwards) subtracts a number from the
993 * weight of an object (and what is carried by it's environment(s)). 962 * weight of an object (and what is carried by it's environment(s)).
994 */ 963 */
995
996void 964void
997sub_weight (object *op, signed long weight) 965sub_weight (object *op, signed long weight)
998{ 966{
999 while (op != NULL) 967 while (op != NULL)
1000 { 968 {
… …
1004 op->carrying -= weight; 972 op->carrying -= weight;
1005 op = op->env; 973 op = op->env;
1006 } 974 }
1007} 975}
1008 976
1009/* remove_ob(op): 977/* op->remove ():
1010 * This function removes the object op from the linked list of objects 978 * This function removes the object op from the linked list of objects
1011 * which it is currently tied to. When this function is done, the 979 * which it is currently tied to. When this function is done, the
1012 * object will have no environment. If the object previously had an 980 * object will have no environment. If the object previously had an
1013 * environment, the x and y coordinates will be updated to 981 * environment, the x and y coordinates will be updated to
1014 * the previous environment. 982 * the previous environment.
1015 * Beware: This function is called from the editor as well! 983 * Beware: This function is called from the editor as well!
1016 */ 984 */
1017
1018void 985void
1019remove_ob (object *op) 986object::remove ()
1020{ 987{
1021 object *tmp, *last = 0; 988 object *tmp, *last = 0;
1022 object *otmp; 989 object *otmp;
1023 990
1024 int check_walk_off; 991 int check_walk_off;
1025 maptile *m;
1026 992
1027 sint16 x, y;
1028
1029 if (QUERY_FLAG (op, FLAG_REMOVED)) 993 if (QUERY_FLAG (this, FLAG_REMOVED))
1030 return; 994 return;
1031 995
1032 SET_FLAG (op, FLAG_REMOVED); 996 SET_FLAG (this, FLAG_REMOVED);
1033 997
1034 if (op->more != NULL) 998 if (more)
1035 remove_ob (op->more); 999 more->remove ();
1036 1000
1037 /* 1001 /*
1038 * In this case, the object to be removed is in someones 1002 * In this case, the object to be removed is in someones
1039 * inventory. 1003 * inventory.
1040 */ 1004 */
1041 if (op->env != NULL) 1005 if (env)
1042 { 1006 {
1043 if (op->nrof) 1007 if (nrof)
1044 sub_weight (op->env, op->weight * op->nrof); 1008 sub_weight (env, weight * nrof);
1045 else 1009 else
1046 sub_weight (op->env, op->weight + op->carrying); 1010 sub_weight (env, weight + carrying);
1047 1011
1048 /* NO_FIX_PLAYER is set when a great many changes are being 1012 /* NO_FIX_PLAYER is set when a great many changes are being
1049 * made to players inventory. If set, avoiding the call 1013 * made to players inventory. If set, avoiding the call
1050 * to save cpu time. 1014 * to save cpu time.
1051 */ 1015 */
1052 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1016 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1053 fix_player (otmp); 1017 fix_player (otmp);
1054 1018
1055 if (op->above != NULL) 1019 if (above != NULL)
1056 op->above->below = op->below; 1020 above->below = below;
1057 else 1021 else
1058 op->env->inv = op->below; 1022 env->inv = below;
1059 1023
1060 if (op->below != NULL) 1024 if (below != NULL)
1061 op->below->above = op->above; 1025 below->above = above;
1062 1026
1063 /* we set up values so that it could be inserted into 1027 /* we set up values so that it could be inserted into
1064 * the map, but we don't actually do that - it is up 1028 * the map, but we don't actually do that - it is up
1065 * to the caller to decide what we want to do. 1029 * to the caller to decide what we want to do.
1066 */ 1030 */
1067 op->x = op->env->x, op->y = op->env->y; 1031 x = env->x, y = env->y;
1068 op->map = op->env->map; 1032 map = env->map;
1069 op->above = NULL, op->below = NULL; 1033 above = 0, below = 0;
1070 op->env = NULL; 1034 env = 0;
1071 } 1035 }
1072 else if (op->map) 1036 else if (map)
1073 { 1037 {
1074 x = op->x;
1075 y = op->y;
1076 m = get_map_from_coord (op->map, &x, &y);
1077
1078 if (!m)
1079 {
1080 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1081 op->map->path, op->x, op->y);
1082 /* in old days, we used to set x and y to 0 and continue.
1083 * it seems if we get into this case, something is probablye
1084 * screwed up and should be fixed.
1085 */
1086 abort ();
1087 }
1088
1089 if (op->map != m)
1090 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1091 op->map->path, m->path, op->x, op->y, x, y);
1092
1093 /* Re did the following section of code - it looks like it had 1038 /* Re did the following section of code - it looks like it had
1094 * lots of logic for things we no longer care about 1039 * lots of logic for things we no longer care about
1095 */ 1040 */
1096 1041
1097 /* link the object above us */ 1042 /* link the object above us */
1098 if (op->above) 1043 if (above)
1099 op->above->below = op->below; 1044 above->below = below;
1100 else 1045 else
1101 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1046 map->at (x, y).top = below; /* we were top, set new top */
1102 1047
1103 /* Relink the object below us, if there is one */ 1048 /* Relink the object below us, if there is one */
1104 if (op->below) 1049 if (below)
1105 op->below->above = op->above; 1050 below->above = above;
1106 else 1051 else
1107 { 1052 {
1108 /* Nothing below, which means we need to relink map object for this space 1053 /* Nothing below, which means we need to relink map object for this space
1109 * use translated coordinates in case some oddness with map tiling is 1054 * use translated coordinates in case some oddness with map tiling is
1110 * evident 1055 * evident
1111 */ 1056 */
1112 if (GET_MAP_OB (m, x, y) != op) 1057 if (GET_MAP_OB (map, x, y) != this)
1113 { 1058 {
1114 char *dump = dump_object (op); 1059 char *dump = dump_object (this);
1115 LOG (llevError, 1060 LOG (llevError,
1116 "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); 1061 "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);
1117 free (dump); 1062 free (dump);
1118 dump = dump_object (GET_MAP_OB (m, x, y)); 1063 dump = dump_object (GET_MAP_OB (map, x, y));
1119 LOG (llevError, "%s\n", dump); 1064 LOG (llevError, "%s\n", dump);
1120 free (dump); 1065 free (dump);
1121 } 1066 }
1122 1067
1123 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1068 map->at (x, y).bottom = above; /* goes on above it. */
1124 } 1069 }
1125 1070
1126 op->above = 0; 1071 above = 0;
1127 op->below = 0; 1072 below = 0;
1128 1073
1129 if (op->map->in_memory == MAP_SAVING) 1074 if (map->in_memory == MAP_SAVING)
1130 return; 1075 return;
1131 1076
1132 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1077 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1133 1078
1134 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1079 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1135 { 1080 {
1136 /* No point updating the players look faces if he is the object 1081 /* No point updating the players look faces if he is the object
1137 * being removed. 1082 * being removed.
1138 */ 1083 */
1139 1084
1140 if (tmp->type == PLAYER && tmp != op) 1085 if (tmp->type == PLAYER && tmp != this)
1141 { 1086 {
1142 /* If a container that the player is currently using somehow gets 1087 /* If a container that the player is currently using somehow gets
1143 * removed (most likely destroyed), update the player view 1088 * removed (most likely destroyed), update the player view
1144 * appropriately. 1089 * appropriately.
1145 */ 1090 */
1146 if (tmp->container == op) 1091 if (tmp->container == this)
1147 { 1092 {
1148 CLEAR_FLAG (op, FLAG_APPLIED); 1093 CLEAR_FLAG (this, FLAG_APPLIED);
1149 tmp->container = NULL; 1094 tmp->container = 0;
1150 } 1095 }
1151 1096
1152 tmp->contr->socket.update_look = 1; 1097 tmp->contr->socket->floorbox_update ();
1153 } 1098 }
1154 1099
1155 /* See if player moving off should effect something */ 1100 /* See if player moving off should effect something */
1156 if (check_walk_off 1101 if (check_walk_off
1157 && ((op->move_type & tmp->move_off) 1102 && ((move_type & tmp->move_off)
1158 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1103 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1159 { 1104 {
1160 move_apply (tmp, op, NULL); 1105 move_apply (tmp, this, 0);
1161 1106
1162 if (op->destroyed ()) 1107 if (destroyed ())
1163 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1108 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1164 } 1109 }
1165 1110
1166 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1111 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1167 1112
1168 if (tmp->above == tmp) 1113 if (tmp->above == tmp)
1169 tmp->above = NULL; 1114 tmp->above = 0;
1170 1115
1171 last = tmp; 1116 last = tmp;
1172 } 1117 }
1173 1118
1174 /* last == NULL of there are no objects on this space */ 1119 /* last == NULL of there are no objects on this space */
1175 if (last == NULL) 1120 if (!last)
1176 { 1121 map->at (x, y).flags_ = P_NEED_UPDATE;
1177 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1178 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1179 * those out anyways, and if there are any flags set right now, they won't
1180 * be correct anyways.
1181 */
1182 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1183 update_position (op->map, op->x, op->y);
1184 }
1185 else 1122 else
1186 update_object (last, UP_OBJ_REMOVE); 1123 update_object (last, UP_OBJ_REMOVE);
1187 1124
1188 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1125 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1189 update_all_los (op->map, op->x, op->y); 1126 update_all_los (map, x, y);
1190 } 1127 }
1191} 1128}
1192 1129
1193/* 1130/*
1194 * merge_ob(op,top): 1131 * merge_ob(op,top):
… …
1209 1146
1210 for (; top != NULL; top = top->below) 1147 for (; top != NULL; top = top->below)
1211 { 1148 {
1212 if (top == op) 1149 if (top == op)
1213 continue; 1150 continue;
1214 if (CAN_MERGE (op, top)) 1151
1152 if (object::can_merge (op, top))
1215 { 1153 {
1216 top->nrof += op->nrof; 1154 top->nrof += op->nrof;
1217 1155
1218/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1156/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1219 op->weight = 0; /* Don't want any adjustements now */ 1157 op->weight = 0; /* Don't want any adjustements now */
1220 remove_ob (op); 1158 op->destroy ();
1221 free_object (op);
1222 return top; 1159 return top;
1223 } 1160 }
1224 } 1161 }
1225 1162
1226 return 0; 1163 return 0;
… …
1353 1290
1354 /* this has to be done after we translate the coordinates. 1291 /* this has to be done after we translate the coordinates.
1355 */ 1292 */
1356 if (op->nrof && !(flag & INS_NO_MERGE)) 1293 if (op->nrof && !(flag & INS_NO_MERGE))
1357 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1294 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1358 if (CAN_MERGE (op, tmp)) 1295 if (object::can_merge (op, tmp))
1359 { 1296 {
1360 op->nrof += tmp->nrof; 1297 op->nrof += tmp->nrof;
1361 remove_ob (tmp); 1298 tmp->destroy ();
1362 free_object (tmp);
1363 } 1299 }
1364 1300
1365 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1301 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1366 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1302 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1367 1303
… …
1380 op->below = originator->below; 1316 op->below = originator->below;
1381 1317
1382 if (op->below) 1318 if (op->below)
1383 op->below->above = op; 1319 op->below->above = op;
1384 else 1320 else
1385 SET_MAP_OB (op->map, op->x, op->y, op); 1321 op->map->at (op->x, op->y).bottom = op;
1386 1322
1387 /* since *below* originator, no need to update top */ 1323 /* since *below* originator, no need to update top */
1388 originator->below = op; 1324 originator->below = op;
1389 } 1325 }
1390 else 1326 else
… …
1436 * If INS_ON_TOP is used, don't do this processing 1372 * If INS_ON_TOP is used, don't do this processing
1437 * Need to find the object that in fact blocks view, otherwise 1373 * Need to find the object that in fact blocks view, otherwise
1438 * stacking is a bit odd. 1374 * stacking is a bit odd.
1439 */ 1375 */
1440 if (!(flag & INS_ON_TOP) && 1376 if (!(flag & INS_ON_TOP) &&
1441 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1377 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1442 { 1378 {
1443 for (last = top; last != floor; last = last->below) 1379 for (last = top; last != floor; last = last->below)
1444 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1380 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1445 break; 1381 break;
1446 /* Check to see if we found the object that blocks view, 1382 /* Check to see if we found the object that blocks view,
… …
1469 1405
1470 if (op->above) 1406 if (op->above)
1471 op->above->below = op; 1407 op->above->below = op;
1472 1408
1473 op->below = NULL; 1409 op->below = NULL;
1474 SET_MAP_OB (op->map, op->x, op->y, op); 1410 op->map->at (op->x, op->y).bottom = op;
1475 } 1411 }
1476 else 1412 else
1477 { /* get inserted into the stack above top */ 1413 { /* get inserted into the stack above top */
1478 op->above = top->above; 1414 op->above = top->above;
1479 1415
… …
1483 op->below = top; 1419 op->below = top;
1484 top->above = op; 1420 top->above = op;
1485 } 1421 }
1486 1422
1487 if (op->above == NULL) 1423 if (op->above == NULL)
1488 SET_MAP_TOP (op->map, op->x, op->y, op); 1424 op->map->at (op->x, op->y).top = op;
1489 } /* else not INS_BELOW_ORIGINATOR */ 1425 } /* else not INS_BELOW_ORIGINATOR */
1490 1426
1491 if (op->type == PLAYER) 1427 if (op->type == PLAYER)
1492 op->contr->do_los = 1; 1428 op->contr->do_los = 1;
1493 1429
1494 /* If we have a floor, we know the player, if any, will be above 1430 /* If we have a floor, we know the player, if any, will be above
1495 * it, so save a few ticks and start from there. 1431 * it, so save a few ticks and start from there.
1496 */ 1432 */
1497 if (!(flag & INS_MAP_LOAD)) 1433 if (!(flag & INS_MAP_LOAD))
1498 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1434 if (object *pl = op->map->at (op->x, op->y).player ())
1499 if (tmp->type == PLAYER) 1435 pl->contr->socket->floorbox_update ();
1500 tmp->contr->socket.update_look = 1;
1501 1436
1502 /* If this object glows, it may affect lighting conditions that are 1437 /* If this object glows, it may affect lighting conditions that are
1503 * visible to others on this map. But update_all_los is really 1438 * visible to others on this map. But update_all_los is really
1504 * an inefficient way to do this, as it means los for all players 1439 * an inefficient way to do this, as it means los for all players
1505 * on the map will get recalculated. The players could very well 1440 * on the map will get recalculated. The players could very well
… …
1513 1448
1514 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1449 /* updates flags (blocked, alive, no magic, etc) for this map space */
1515 update_object (op, UP_OBJ_INSERT); 1450 update_object (op, UP_OBJ_INSERT);
1516 1451
1517 /* Don't know if moving this to the end will break anything. However, 1452 /* Don't know if moving this to the end will break anything. However,
1518 * we want to have update_look set above before calling this. 1453 * we want to have floorbox_update called before calling this.
1519 * 1454 *
1520 * check_move_on() must be after this because code called from 1455 * check_move_on() must be after this because code called from
1521 * check_move_on() depends on correct map flags (so functions like 1456 * check_move_on() depends on correct map flags (so functions like
1522 * blocked() and wall() work properly), and these flags are updated by 1457 * blocked() and wall() work properly), and these flags are updated by
1523 * update_object(). 1458 * update_object().
… …
1539 1474
1540 return op; 1475 return op;
1541} 1476}
1542 1477
1543/* this function inserts an object in the map, but if it 1478/* this function inserts an object in the map, but if it
1544 * finds an object of its own type, it'll remove that one first. 1479 * finds an object of its own type, it'll remove that one first.
1545 * op is the object to insert it under: supplies x and the map. 1480 * op is the object to insert it under: supplies x and the map.
1546 */ 1481 */
1547void 1482void
1548replace_insert_ob_in_map (const char *arch_string, object *op) 1483replace_insert_ob_in_map (const char *arch_string, object *op)
1549{ 1484{
1550 object * 1485 object *tmp, *tmp1;
1551 tmp;
1552 object *
1553 tmp1;
1554 1486
1555 /* first search for itself and remove any old instances */ 1487 /* first search for itself and remove any old instances */
1556 1488
1557 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1489 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1558 {
1559 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1490 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1560 { 1491 tmp->destroy ();
1561 remove_ob (tmp);
1562 free_object (tmp);
1563 }
1564 }
1565 1492
1566 tmp1 = arch_to_object (archetype::find (arch_string)); 1493 tmp1 = arch_to_object (archetype::find (arch_string));
1567 1494
1568 tmp1->x = op->x; 1495 tmp1->x = op->x;
1569 tmp1->y = op->y; 1496 tmp1->y = op->y;
… …
1579 */ 1506 */
1580 1507
1581object * 1508object *
1582get_split_ob (object *orig_ob, uint32 nr) 1509get_split_ob (object *orig_ob, uint32 nr)
1583{ 1510{
1584 object * 1511 object *newob;
1585 newob;
1586 int
1587 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1512 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1588 1513
1589 if (orig_ob->nrof < nr) 1514 if (orig_ob->nrof < nr)
1590 { 1515 {
1591 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1516 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1592 return NULL; 1517 return NULL;
1593 } 1518 }
1594 1519
1595 newob = object_create_clone (orig_ob); 1520 newob = object_create_clone (orig_ob);
1596 1521
1597 if ((orig_ob->nrof -= nr) < 1) 1522 if ((orig_ob->nrof -= nr) < 1)
1598 { 1523 orig_ob->destroy (1);
1599 if (!is_removed)
1600 remove_ob (orig_ob);
1601 free_object2 (orig_ob, 1);
1602 }
1603 else if (!is_removed) 1524 else if (!is_removed)
1604 { 1525 {
1605 if (orig_ob->env != NULL) 1526 if (orig_ob->env != NULL)
1606 sub_weight (orig_ob->env, orig_ob->weight * nr); 1527 sub_weight (orig_ob->env, orig_ob->weight * nr);
1607 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1528 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1637 if (i > op->nrof) 1558 if (i > op->nrof)
1638 i = op->nrof; 1559 i = op->nrof;
1639 1560
1640 if (QUERY_FLAG (op, FLAG_REMOVED)) 1561 if (QUERY_FLAG (op, FLAG_REMOVED))
1641 op->nrof -= i; 1562 op->nrof -= i;
1642 else if (op->env != NULL) 1563 else if (op->env)
1643 { 1564 {
1644 /* is this object in the players inventory, or sub container 1565 /* is this object in the players inventory, or sub container
1645 * therein? 1566 * therein?
1646 */ 1567 */
1647 tmp = is_player_inv (op->env); 1568 tmp = op->in_player ();
1648 /* nope. Is this a container the player has opened? 1569 /* nope. Is this a container the player has opened?
1649 * If so, set tmp to that player. 1570 * If so, set tmp to that player.
1650 * IMO, searching through all the players will mostly 1571 * IMO, searching through all the players will mostly
1651 * likely be quicker than following op->env to the map, 1572 * likely be quicker than following op->env to the map,
1652 * and then searching the map for a player. 1573 * and then searching the map for a player.
1653 */ 1574 */
1654 if (!tmp) 1575 if (!tmp)
1655 { 1576 {
1656 for (pl = first_player; pl; pl = pl->next) 1577 for (pl = first_player; pl; pl = pl->next)
1657 if (pl->ob->container == op->env) 1578 if (pl->ob->container == op->env)
1579 {
1580 tmp = pl->ob;
1658 break; 1581 break;
1659 if (pl) 1582 }
1660 tmp = pl->ob;
1661 else
1662 tmp = NULL;
1663 } 1583 }
1664 1584
1665 if (i < op->nrof) 1585 if (i < op->nrof)
1666 { 1586 {
1667 sub_weight (op->env, op->weight * i); 1587 sub_weight (op->env, op->weight * i);
1668 op->nrof -= i; 1588 op->nrof -= i;
1669 if (tmp) 1589 if (tmp)
1670 {
1671 esrv_send_item (tmp, op); 1590 esrv_send_item (tmp, op);
1672 }
1673 } 1591 }
1674 else 1592 else
1675 { 1593 {
1676 remove_ob (op); 1594 op->remove ();
1677 op->nrof = 0; 1595 op->nrof = 0;
1678 if (tmp) 1596 if (tmp)
1679 {
1680 esrv_del_item (tmp->contr, op->count); 1597 esrv_del_item (tmp->contr, op->count);
1681 }
1682 } 1598 }
1683 } 1599 }
1684 else 1600 else
1685 { 1601 {
1686 object *above = op->above; 1602 object *above = op->above;
1687 1603
1688 if (i < op->nrof) 1604 if (i < op->nrof)
1689 op->nrof -= i; 1605 op->nrof -= i;
1690 else 1606 else
1691 { 1607 {
1692 remove_ob (op); 1608 op->remove ();
1693 op->nrof = 0; 1609 op->nrof = 0;
1694 } 1610 }
1695 1611
1696 /* Since we just removed op, op->above is null */ 1612 /* Since we just removed op, op->above is null */
1697 for (tmp = above; tmp != NULL; tmp = tmp->above) 1613 for (tmp = above; tmp; tmp = tmp->above)
1698 if (tmp->type == PLAYER) 1614 if (tmp->type == PLAYER)
1699 { 1615 {
1700 if (op->nrof) 1616 if (op->nrof)
1701 esrv_send_item (tmp, op); 1617 esrv_send_item (tmp, op);
1702 else 1618 else
… …
1706 1622
1707 if (op->nrof) 1623 if (op->nrof)
1708 return op; 1624 return op;
1709 else 1625 else
1710 { 1626 {
1711 free_object (op); 1627 op->destroy ();
1712 return NULL; 1628 return 0;
1713 } 1629 }
1714} 1630}
1715 1631
1716/* 1632/*
1717 * add_weight(object, weight) adds the specified weight to an object, 1633 * add_weight(object, weight) adds the specified weight to an object,
… …
1729 op->carrying += weight; 1645 op->carrying += weight;
1730 op = op->env; 1646 op = op->env;
1731 } 1647 }
1732} 1648}
1733 1649
1734/*
1735 * insert_ob_in_ob(op,environment):
1736 * This function inserts the object op in the linked list
1737 * inside the object environment.
1738 *
1739 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1740 * the inventory at the last position or next to other objects of the same
1741 * type.
1742 * Frank: Now sorted by type, archetype and magic!
1743 *
1744 * The function returns now pointer to inserted item, and return value can
1745 * be != op, if items are merged. -Tero
1746 */
1747
1748object * 1650object *
1749insert_ob_in_ob (object *op, object *where) 1651insert_ob_in_ob (object *op, object *where)
1750{ 1652{
1751 object * 1653 if (!where)
1752 tmp, *
1753 otmp;
1754
1755 if (!QUERY_FLAG (op, FLAG_REMOVED))
1756 {
1757 char *dump = dump_object (op);
1758 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1759 free (dump);
1760 return op;
1761 }
1762
1763 if (where == NULL)
1764 { 1654 {
1765 char *dump = dump_object (op); 1655 char *dump = dump_object (op);
1766 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1656 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1767 free (dump); 1657 free (dump);
1768 return op; 1658 return op;
1769 } 1659 }
1770 1660
1771 if (where->head) 1661 if (where->head)
1772 { 1662 {
1773 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1663 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1774 where = where->head; 1664 where = where->head;
1775 } 1665 }
1666
1667 return where->insert (op);
1668}
1669
1670/*
1671 * env->insert (op)
1672 * This function inserts the object op in the linked list
1673 * inside the object environment.
1674 *
1675 * The function returns now pointer to inserted item, and return value can
1676 * be != op, if items are merged. -Tero
1677 */
1678
1679object *
1680object::insert (object *op)
1681{
1682 object *tmp, *otmp;
1683
1684 if (!QUERY_FLAG (op, FLAG_REMOVED))
1685 op->remove ();
1776 1686
1777 if (op->more) 1687 if (op->more)
1778 { 1688 {
1779 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1689 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1780 return op; 1690 return op;
… …
1782 1692
1783 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1693 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1784 CLEAR_FLAG (op, FLAG_REMOVED); 1694 CLEAR_FLAG (op, FLAG_REMOVED);
1785 if (op->nrof) 1695 if (op->nrof)
1786 { 1696 {
1787 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1697 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1788 if (CAN_MERGE (tmp, op)) 1698 if (object::can_merge (tmp, op))
1789 { 1699 {
1790 /* return the original object and remove inserted object 1700 /* return the original object and remove inserted object
1791 (client needs the original object) */ 1701 (client needs the original object) */
1792 tmp->nrof += op->nrof; 1702 tmp->nrof += op->nrof;
1793 /* Weight handling gets pretty funky. Since we are adding to 1703 /* Weight handling gets pretty funky. Since we are adding to
1794 * tmp->nrof, we need to increase the weight. 1704 * tmp->nrof, we need to increase the weight.
1795 */ 1705 */
1796 add_weight (where, op->weight * op->nrof); 1706 add_weight (this, op->weight * op->nrof);
1797 SET_FLAG (op, FLAG_REMOVED); 1707 SET_FLAG (op, FLAG_REMOVED);
1798 free_object (op); /* free the inserted object */ 1708 op->destroy (); /* free the inserted object */
1799 op = tmp; 1709 op = tmp;
1800 remove_ob (op); /* and fix old object's links */ 1710 op->remove (); /* and fix old object's links */
1801 CLEAR_FLAG (op, FLAG_REMOVED); 1711 CLEAR_FLAG (op, FLAG_REMOVED);
1802 break; 1712 break;
1803 } 1713 }
1804 1714
1805 /* I assume combined objects have no inventory 1715 /* I assume combined objects have no inventory
1806 * We add the weight - this object could have just been removed 1716 * We add the weight - this object could have just been removed
1807 * (if it was possible to merge). calling remove_ob will subtract 1717 * (if it was possible to merge). calling remove_ob will subtract
1808 * the weight, so we need to add it in again, since we actually do 1718 * the weight, so we need to add it in again, since we actually do
1809 * the linking below 1719 * the linking below
1810 */ 1720 */
1811 add_weight (where, op->weight * op->nrof); 1721 add_weight (this, op->weight * op->nrof);
1812 } 1722 }
1813 else 1723 else
1814 add_weight (where, (op->weight + op->carrying)); 1724 add_weight (this, (op->weight + op->carrying));
1815 1725
1816 otmp = is_player_inv (where); 1726 otmp = this->in_player ();
1817 if (otmp && otmp->contr != NULL) 1727 if (otmp && otmp->contr)
1818 {
1819 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1728 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1820 fix_player (otmp); 1729 fix_player (otmp);
1821 }
1822 1730
1823 op->map = NULL; 1731 op->map = 0;
1824 op->env = where; 1732 op->env = this;
1825 op->above = NULL; 1733 op->above = 0;
1826 op->below = NULL; 1734 op->below = 0;
1827 op->x = 0, op->y = 0; 1735 op->x = 0, op->y = 0;
1828 1736
1829 /* reset the light list and los of the players on the map */ 1737 /* reset the light list and los of the players on the map */
1830 if ((op->glow_radius != 0) && where->map) 1738 if ((op->glow_radius != 0) && map)
1831 { 1739 {
1832#ifdef DEBUG_LIGHTS 1740#ifdef DEBUG_LIGHTS
1833 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1741 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1834#endif /* DEBUG_LIGHTS */ 1742#endif /* DEBUG_LIGHTS */
1835 if (MAP_DARKNESS (where->map)) 1743 if (MAP_DARKNESS (map))
1836 update_all_los (where->map, where->x, where->y); 1744 update_all_los (map, x, y);
1837 } 1745 }
1838 1746
1839 /* Client has no idea of ordering so lets not bother ordering it here. 1747 /* Client has no idea of ordering so lets not bother ordering it here.
1840 * It sure simplifies this function... 1748 * It sure simplifies this function...
1841 */ 1749 */
1842 if (where->inv == NULL) 1750 if (!inv)
1843 where->inv = op; 1751 inv = op;
1844 else 1752 else
1845 { 1753 {
1846 op->below = where->inv; 1754 op->below = inv;
1847 op->below->above = op; 1755 op->below->above = op;
1848 where->inv = op; 1756 inv = op;
1849 } 1757 }
1758
1850 return op; 1759 return op;
1851} 1760}
1852 1761
1853/* 1762/*
1854 * Checks if any objects has a move_type that matches objects 1763 * Checks if any objects has a move_type that matches objects
… …
2167 * if the space being examined only has a wall to the north and empty 2076 * if the space being examined only has a wall to the north and empty
2168 * spaces in all the other directions, this will reduce the search space 2077 * spaces in all the other directions, this will reduce the search space
2169 * to only the spaces immediately surrounding the target area, and 2078 * to only the spaces immediately surrounding the target area, and
2170 * won't look 2 spaces south of the target space. 2079 * won't look 2 spaces south of the target space.
2171 */ 2080 */
2172 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2081 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2173 stop = maxfree[i]; 2082 stop = maxfree[i];
2174 } 2083 }
2084
2175 if (!index) 2085 if (!index)
2176 return -1; 2086 return -1;
2087
2177 return altern[RANDOM () % index]; 2088 return altern[RANDOM () % index];
2178} 2089}
2179 2090
2180/* 2091/*
2181 * find_first_free_spot(archetype, maptile, x, y) works like 2092 * find_first_free_spot(archetype, maptile, x, y) works like
… …
2289 mp = m; 2200 mp = m;
2290 nx = x + freearr_x[i]; 2201 nx = x + freearr_x[i];
2291 ny = y + freearr_y[i]; 2202 ny = y + freearr_y[i];
2292 2203
2293 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2204 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2205
2294 if (mflags & P_OUT_OF_MAP) 2206 if (mflags & P_OUT_OF_MAP)
2295 {
2296 max = maxfree[i]; 2207 max = maxfree[i];
2297 }
2298 else 2208 else
2299 { 2209 {
2300 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2210 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2301 2211
2302 if ((move_type & blocked) == move_type) 2212 if ((move_type & blocked) == move_type)
2303 {
2304 max = maxfree[i]; 2213 max = maxfree[i];
2305 }
2306 else if (mflags & P_IS_ALIVE) 2214 else if (mflags & P_IS_ALIVE)
2307 { 2215 {
2308 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2216 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2309 {
2310 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2217 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2311 {
2312 break; 2218 break;
2313 } 2219
2314 }
2315 if (tmp) 2220 if (tmp)
2316 {
2317 return freedir[i]; 2221 return freedir[i];
2318 }
2319 } 2222 }
2320 } 2223 }
2321 } 2224 }
2225
2322 return 0; 2226 return 0;
2323} 2227}
2324 2228
2325/* 2229/*
2326 * distance(object 1, object 2) will return the square of the 2230 * distance(object 1, object 2) will return the square of the
… …
2328 */ 2232 */
2329 2233
2330int 2234int
2331distance (const object *ob1, const object *ob2) 2235distance (const object *ob1, const object *ob2)
2332{ 2236{
2333 int 2237 int i;
2334 i;
2335 2238
2336 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2239 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2337 return i; 2240 return i;
2338} 2241}
2339 2242
… …
2344 */ 2247 */
2345 2248
2346int 2249int
2347find_dir_2 (int x, int y) 2250find_dir_2 (int x, int y)
2348{ 2251{
2349 int 2252 int q;
2350 q;
2351 2253
2352 if (y) 2254 if (y)
2353 q = x * 100 / y; 2255 q = x * 100 / y;
2354 else if (x) 2256 else if (x)
2355 q = -300 * x; 2257 q = -300 * x;
… …
2481 * find a path to that monster that we found. If not, 2383 * find a path to that monster that we found. If not,
2482 * we don't bother going toward it. Returns 1 if we 2384 * we don't bother going toward it. Returns 1 if we
2483 * can see a direct way to get it 2385 * can see a direct way to get it
2484 * Modified to be map tile aware -.MSW 2386 * Modified to be map tile aware -.MSW
2485 */ 2387 */
2486
2487
2488int 2388int
2489can_see_monsterP (maptile *m, int x, int y, int dir) 2389can_see_monsterP (maptile *m, int x, int y, int dir)
2490{ 2390{
2491 sint16 dx, dy; 2391 sint16 dx, dy;
2492 int
2493 mflags; 2392 int mflags;
2494 2393
2495 if (dir < 0) 2394 if (dir < 0)
2496 return 0; /* exit condition: invalid direction */ 2395 return 0; /* exit condition: invalid direction */
2497 2396
2498 dx = x + freearr_x[dir]; 2397 dx = x + freearr_x[dir];
… …
2511 return 0; 2410 return 0;
2512 2411
2513 /* yes, can see. */ 2412 /* yes, can see. */
2514 if (dir < 9) 2413 if (dir < 9)
2515 return 1; 2414 return 1;
2415
2516 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2416 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2517 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2417 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2418 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2518} 2419}
2519
2520
2521 2420
2522/* 2421/*
2523 * can_pick(picker, item): finds out if an object is possible to be 2422 * can_pick(picker, item): finds out if an object is possible to be
2524 * picked up by the picker. Returnes 1 if it can be 2423 * picked up by the picker. Returnes 1 if it can be
2525 * picked up, otherwise 0. 2424 * picked up, otherwise 0.
… …
2536 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2435 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2537 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2436 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2538 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2437 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2539} 2438}
2540 2439
2541
2542/* 2440/*
2543 * create clone from object to another 2441 * create clone from object to another
2544 */ 2442 */
2545object * 2443object *
2546object_create_clone (object *asrc) 2444object_create_clone (object *asrc)
2547{ 2445{
2548 object *
2549 dst = NULL, *tmp, *src, *part, *prev, *item; 2446 object *dst = 0, *tmp, *src, *part, *prev, *item;
2550 2447
2551 if (!asrc) 2448 if (!asrc)
2552 return NULL; 2449 return 0;
2450
2553 src = asrc; 2451 src = asrc;
2554 if (src->head) 2452 if (src->head)
2555 src = src->head; 2453 src = src->head;
2556 2454
2557 prev = NULL; 2455 prev = 0;
2558 for (part = src; part; part = part->more) 2456 for (part = src; part; part = part->more)
2559 { 2457 {
2560 tmp = get_object (); 2458 tmp = part->clone ();
2561 copy_object (part, tmp);
2562 tmp->x -= src->x; 2459 tmp->x -= src->x;
2563 tmp->y -= src->y; 2460 tmp->y -= src->y;
2461
2564 if (!part->head) 2462 if (!part->head)
2565 { 2463 {
2566 dst = tmp; 2464 dst = tmp;
2567 tmp->head = NULL; 2465 tmp->head = 0;
2568 } 2466 }
2569 else 2467 else
2570 {
2571 tmp->head = dst; 2468 tmp->head = dst;
2572 } 2469
2573 tmp->more = NULL; 2470 tmp->more = 0;
2471
2574 if (prev) 2472 if (prev)
2575 prev->more = tmp; 2473 prev->more = tmp;
2474
2576 prev = tmp; 2475 prev = tmp;
2577 } 2476 }
2578 2477
2579 for (item = src->inv; item; item = item->below) 2478 for (item = src->inv; item; item = item->below)
2580 insert_ob_in_ob (object_create_clone (item), dst); 2479 insert_ob_in_ob (object_create_clone (item), dst);
… …
2606 } 2505 }
2607 2506
2608 fprintf (tempfile, obstr); 2507 fprintf (tempfile, obstr);
2609 fclose (tempfile); 2508 fclose (tempfile);
2610 2509
2611 op = get_object (); 2510 op = object::create ();
2612 2511
2613 object_thawer thawer (filename); 2512 object_thawer thawer (filename);
2614 2513
2615 if (thawer) 2514 if (thawer)
2616 load_object (thawer, op, 0); 2515 load_object (thawer, op, 0);

Diff Legend

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