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.39 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.67 by root, Thu Dec 14 04:30:32 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
37static UUID uuid; 36static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 37const uint64 UUID_SKIP = 1<<19;
39 38
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
42 40
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 43};
… …
106 _exit (1); 104 _exit (1);
107 } 105 }
108 106
109 uuid.seq = uid; 107 uuid.seq = uid;
110 write_uuid (); 108 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112 fclose (fp); 110 fclose (fp);
113} 111}
114 112
115UUID 113UUID
116gen_uuid () 114gen_uuid ()
… …
185 * 183 *
186 * Note that this function appears a lot longer than the macro it 184 * Note that this function appears a lot longer than the macro it
187 * replaces - this is mostly for clarity - a decent compiler should hopefully 185 * replaces - this is mostly for clarity - a decent compiler should hopefully
188 * reduce this to the same efficiency. 186 * reduce this to the same efficiency.
189 * 187 *
190 * Check nrof variable *before* calling CAN_MERGE() 188 * Check nrof variable *before* calling can_merge()
191 * 189 *
192 * Improvements made with merge: Better checking on potion, and also 190 * Improvements made with merge: Better checking on potion, and also
193 * check weight 191 * check weight
194 */ 192 */
195 193
196bool object::can_merge (object *ob1, object *ob2) 194bool object::can_merge_slow (object *ob1, object *ob2)
197{ 195{
198 /* A couple quicksanity checks */ 196 /* A couple quicksanity checks */
199 if ((ob1 == ob2) || (ob1->type != ob2->type)) 197 if (ob1 == ob2
198 || ob1->type != ob2->type
199 || ob1->speed != ob2->speed
200 || ob1->value != ob2->value
201 || ob1->name != ob2->name)
200 return 0; 202 return 0;
201 203
202 if (ob1->speed != ob2->speed) 204 //TODO: this ain't working well, use nicer and correct overflow check
203 return 0;
204
205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206 * value could not be stored in a sint32 (which unfortunately sometimes is 206 * value could not be stored in a sint32 (which unfortunately sometimes is
207 * used to store nrof). 207 * used to store nrof).
208 */ 208 */
209 if (ob1->nrof + ob2->nrof >= 1UL << 31) 209 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
262 /* if one object has inventory but the other doesn't, not equiv */ 262 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0; 264 return 0;
265 265
266 /* Now check to see if the two inventory objects could merge */ 266 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 267 if (!object::can_merge (ob1->inv, ob2->inv))
268 return 0; 268 return 0;
269 269
270 /* inventory ok - still need to check rest of this object to see 270 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 271 * if it is valid.
272 */ 272 */
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 377 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 378 * The result of the dump is stored in the static global errmsg array.
379 */ 379 */
380 380
381void 381char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 382dump_object (object *op)
437{ 383{
438 if (op == NULL) 384 if (!op)
439 { 385 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 386
447void 387 object_freezer freezer;
448dump_all_objects (void) 388 save_object (freezer, op, 3);
449{ 389 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 390}
458 391
459/* 392/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 393 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
… …
481 */ 414 */
482 415
483object * 416object *
484find_object (tag_t i) 417find_object (tag_t i)
485{ 418{
486 object *op; 419 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 420 if (op->count == i)
490 break; 421 return op;
422
491 return op; 423 return 0;
492} 424}
493 425
494/* 426/*
495 * Returns the first object which has a name equal to the argument. 427 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 428 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 433find_object_name (const char *str)
502{ 434{
503 shstr_cmp str_ (str); 435 shstr_cmp str_ (str);
504 object *op; 436 object *op;
505 437
506 for (op = objects; op != NULL; op = op->next) 438 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 439 if (op->name == str_)
508 break; 440 break;
509 441
510 return op; 442 return op;
511} 443}
512 444
513void 445void
514free_all_object_data () 446free_all_object_data ()
515{ 447{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 448 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 449}
539 450
540/* 451/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 453 * skill and experience objects.
… …
612 523
613 /* What is not cleared is next, prev, and count */ 524 /* What is not cleared is next, prev, and count */
614 525
615 expmul = 1.0; 526 expmul = 1.0;
616 face = blank_face; 527 face = blank_face;
617 attacked_by_count = -1;
618 528
619 if (settings.casting_time) 529 if (settings.casting_time)
620 casting_time = -1; 530 casting_time = -1;
621} 531}
622 532
623void object::clone (object *destination)
624{
625 *(object_copy *)destination = *this;
626 *(object_pod *)destination = *this;
627
628 if (self || cb)
629 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
630}
631
632/* 533/*
633 * copy object first frees everything allocated by the second object, 534 * copy_to first frees everything allocated by the dst object,
634 * and then copies the contends of the first object into the second 535 * and then copies the contents of itself into the second
635 * object, allocating what needs to be allocated. Basically, any 536 * object, allocating what needs to be allocated. Basically, any
636 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 537 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
637 * if the first object is freed, the pointers in the new object 538 * if the first object is freed, the pointers in the new object
638 * will point at garbage. 539 * will point at garbage.
639 */ 540 */
640void 541void
641copy_object (object *op2, object *op) 542object::copy_to (object *dst)
642{ 543{
643 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 544 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 545 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645 546
646 op2->clone (op); 547 *(object_copy *)dst = *this;
548 *(object_pod *)dst = *this;
549
550 if (self || cb)
551 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
647 552
648 if (is_freed) 553 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 554 SET_FLAG (dst, FLAG_FREED);
555
650 if (is_removed) 556 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 557 SET_FLAG (dst, FLAG_REMOVED);
652 558
653 if (op2->speed < 0) 559 if (speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 560 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655 561
656 /* Copy over key_values, if any. */ 562 /* Copy over key_values, if any. */
657 if (op2->key_values) 563 if (key_values)
658 { 564 {
659 key_value *tail = 0; 565 key_value *tail = 0;
660 key_value *i; 566 key_value *i;
661 567
662 op->key_values = 0; 568 dst->key_values = 0;
663 569
664 for (i = op2->key_values; i; i = i->next) 570 for (i = key_values; i; i = i->next)
665 { 571 {
666 key_value *new_link = new key_value; 572 key_value *new_link = new key_value;
667 573
668 new_link->next = 0; 574 new_link->next = 0;
669 new_link->key = i->key; 575 new_link->key = i->key;
670 new_link->value = i->value; 576 new_link->value = i->value;
671 577
672 /* Try and be clever here, too. */ 578 /* Try and be clever here, too. */
673 if (!op->key_values) 579 if (!dst->key_values)
674 { 580 {
675 op->key_values = new_link; 581 dst->key_values = new_link;
676 tail = new_link; 582 tail = new_link;
677 } 583 }
678 else 584 else
679 { 585 {
680 tail->next = new_link; 586 tail->next = new_link;
681 tail = new_link; 587 tail = new_link;
682 } 588 }
683 } 589 }
684 } 590 }
685 591
686 update_ob_speed (op); 592 update_ob_speed (dst);
593}
594
595object *
596object::clone ()
597{
598 object *neu = create ();
599 copy_to (neu);
600 return neu;
687} 601}
688 602
689/* 603/*
690 * If an object with the IS_TURNABLE() flag needs to be turned due 604 * If an object with the IS_TURNABLE() flag needs to be turned due
691 * to the closest player being on the other side, this function can 605 * to the closest player being on the other side, this function can
… …
896 update_now = 1; 810 update_now = 1;
897 811
898 if ((move_slow | op->move_slow) != move_slow) 812 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1; 813 update_now = 1;
900 } 814 }
815
901 /* if the object is being removed, we can't make intelligent 816 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 817 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 818 * that is being removed.
904 */ 819 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
917 832
918 if (op->more != NULL) 833 if (op->more != NULL)
919 update_object (op->more, action); 834 update_object (op->more, action);
920} 835}
921 836
922static unordered_vector<object *> mortals; 837object::vector object::mortals;
923static std::vector<object *, slice_allocator <object *> > freed; 838object::vector object::objects; // not yet used
839object *object::first;
924 840
925void object::free_mortals () 841void object::free_mortals ()
926{ 842{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 843 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 844 if ((*i)->refcnt)
929 ++i; // further delay freeing 845 ++i; // further delay freeing
930 else 846 else
931 { 847 {
932 freed.push_back (*i);//D
933 //delete *i; 848 delete *i;
934 mortals.erase (i); 849 mortals.erase (i);
935 } 850 }
936
937 if (mortals.size() && 0)//D
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
939} 851}
940 852
941object::object () 853object::object ()
942{ 854{
943 SET_FLAG (this, FLAG_REMOVED); 855 SET_FLAG (this, FLAG_REMOVED);
944 856
945 expmul = 1.0; 857 expmul = 1.0;
946 face = blank_face; 858 face = blank_face;
947 attacked_by_count = -1;
948} 859}
949 860
950object::~object () 861object::~object ()
951{ 862{
952 free_key_values (this); 863 free_key_values (this);
953} 864}
954 865
955void object::link () 866void object::link ()
956{ 867{
957 count = ++ob_count; 868 count = ++ob_count;
869 uuid = gen_uuid ();
958 870
959 prev = 0; 871 prev = 0;
960 next = objects; 872 next = object::first;
961 873
962 if (objects) 874 if (object::first)
963 objects->prev = this; 875 object::first->prev = this;
964 876
965 objects = this; 877 object::first = this;
966} 878}
967 879
968void object::unlink () 880void object::unlink ()
969{ 881{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 882 if (this == object::first)
974 objects = next; 883 object::first = next;
975 884
976 /* Remove this object from the list of used objects */ 885 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 886 if (prev) prev->next = next;
887 if (next) next->prev = prev;
888
980 prev = 0; 889 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 890 next = 0;
987 }
988} 891}
989 892
990object *object::create () 893object *object::create ()
991{ 894{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 895 object *op = new object;
996 else
997 {
998 // highly annoying, but the only way to get it stable right now
999 op = freed.back ();
1000 freed.pop_back ();
1001 op->~object ();
1002 new ((void *) op) object;
1003 }
1004
1005 op->link (); 896 op->link ();
1006 return op; 897 return op;
1007} 898}
1008 899
1009/* 900/*
… …
1011 * it from the list of used objects, and puts it on the list of 902 * it from the list of used objects, and puts it on the list of
1012 * free objects. The IS_FREED() flag is set in the object. 903 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for 904 * The object must have been removed by remove_ob() first for
1014 * this function to succeed. 905 * this function to succeed.
1015 * 906 *
1016 * If free_inventory is set, free inventory as well. Else drop items in 907 * If destroy_inventory is set, free inventory as well. Else drop items in
1017 * inventory to the ground. 908 * inventory to the ground.
1018 */ 909 */
1019void object::free (bool free_inventory) 910void object::destroy (bool destroy_inventory)
1020{ 911{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 912 if (QUERY_FLAG (this, FLAG_FREED))
1022 return; 913 return;
1023 914
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 915 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1025 remove_friendly_object (this); 916 remove_friendly_object (this);
1026 917
1027 if (!QUERY_FLAG (this, FLAG_REMOVED)) 918 if (!QUERY_FLAG (this, FLAG_REMOVED))
1028 remove_ob (this); 919 remove ();
1029 920
1030 SET_FLAG (this, FLAG_FREED); 921 SET_FLAG (this, FLAG_FREED);
1031 922
1032 if (more) 923 if (more)
1033 { 924 {
1034 more->free (free_inventory); 925 more->destroy (destroy_inventory);
1035 more = 0; 926 more = 0;
1036 } 927 }
1037 928
1038 if (inv) 929 if (inv)
1039 { 930 {
1040 /* Only if the space blocks everything do we not process - 931 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects 932 * if some form of movement is allowed, let objects
1042 * drop on that space. 933 * drop on that space.
1043 */ 934 */
1044 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 935 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1045 { 936 {
1046 object *op = inv; 937 object *op = inv;
1047 938
1048 while (op) 939 while (op)
1049 { 940 {
1050 object *tmp = op->below; 941 object *tmp = op->below;
1051 op->free (free_inventory); 942 op->destroy (destroy_inventory);
1052 op = tmp; 943 op = tmp;
1053 } 944 }
1054 } 945 }
1055 else 946 else
1056 { /* Put objects in inventory onto this space */ 947 { /* Put objects in inventory onto this space */
… …
1058 949
1059 while (op) 950 while (op)
1060 { 951 {
1061 object *tmp = op->below; 952 object *tmp = op->below;
1062 953
1063 remove_ob (op); 954 op->remove ();
1064 955
1065 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 956 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1066 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 957 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1067 free_object (op); 958 op->destroy ();
1068 else 959 else
1069 { 960 {
1070 op->x = x; 961 op->x = x;
1071 op->y = y; 962 op->y = y;
1072 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 963 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1075 op = tmp; 966 op = tmp;
1076 } 967 }
1077 } 968 }
1078 } 969 }
1079 970
971 // hack to ensure that freed objects still have a valid map
972 {
973 static maptile *freed_map; // freed objects are moved here to avoid crashes
974
975 if (!freed_map)
976 {
977 freed_map = new maptile;
978
979 freed_map->name = "/internal/freed_objects_map";
980 freed_map->width = 3;
981 freed_map->height = 3;
982
983 freed_map->allocate ();
984 }
985
986 map = freed_map;
987 x = 1;
988 y = 1;
989 }
990
991 // clear those pointers that likely might have circular references to us
1080 owner = 0; 992 owner = 0;
993 enemy = 0;
994 attacked_by = 0;
995
996 // only relevant for players(?), but make sure of it anyways
997 contr = 0;
1081 998
1082 /* Remove object from the active list */ 999 /* Remove object from the active list */
1083 speed = 0; 1000 speed = 0;
1084 update_ob_speed (this); 1001 update_ob_speed (this);
1085 1002
… …
1090 1007
1091/* 1008/*
1092 * sub_weight() recursively (outwards) subtracts a number from the 1009 * sub_weight() recursively (outwards) subtracts a number from the
1093 * weight of an object (and what is carried by it's environment(s)). 1010 * weight of an object (and what is carried by it's environment(s)).
1094 */ 1011 */
1095
1096void 1012void
1097sub_weight (object *op, signed long weight) 1013sub_weight (object *op, signed long weight)
1098{ 1014{
1099 while (op != NULL) 1015 while (op != NULL)
1100 { 1016 {
1101 if (op->type == CONTAINER) 1017 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1018 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 1019
1105 op->carrying -= weight; 1020 op->carrying -= weight;
1106 op = op->env; 1021 op = op->env;
1107 } 1022 }
1108} 1023}
1109 1024
1110/* remove_ob(op): 1025/* op->remove ():
1111 * This function removes the object op from the linked list of objects 1026 * This function removes the object op from the linked list of objects
1112 * which it is currently tied to. When this function is done, the 1027 * which it is currently tied to. When this function is done, the
1113 * object will have no environment. If the object previously had an 1028 * object will have no environment. If the object previously had an
1114 * environment, the x and y coordinates will be updated to 1029 * environment, the x and y coordinates will be updated to
1115 * the previous environment. 1030 * the previous environment.
1116 * Beware: This function is called from the editor as well! 1031 * Beware: This function is called from the editor as well!
1117 */ 1032 */
1118
1119void 1033void
1120remove_ob (object *op) 1034object::remove ()
1121{ 1035{
1036 object *tmp, *last = 0;
1122 object * 1037 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 1038
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off; 1039 int check_walk_off;
1132 mapstruct *
1133 m;
1134 1040
1135 sint16
1136 x,
1137 y;
1138
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 1041 if (QUERY_FLAG (this, FLAG_REMOVED))
1140 return; 1042 return;
1141 1043
1142 SET_FLAG (op, FLAG_REMOVED); 1044 SET_FLAG (this, FLAG_REMOVED);
1143 1045
1144 if (op->more != NULL) 1046 if (more)
1145 remove_ob (op->more); 1047 more->remove ();
1146 1048
1147 /* 1049 /*
1148 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1149 * inventory. 1051 * inventory.
1150 */ 1052 */
1151 if (op->env != NULL) 1053 if (env)
1152 { 1054 {
1153 if (op->nrof) 1055 if (nrof)
1154 sub_weight (op->env, op->weight * op->nrof); 1056 sub_weight (env, weight * nrof);
1155 else 1057 else
1156 sub_weight (op->env, op->weight + op->carrying); 1058 sub_weight (env, weight + carrying);
1157 1059
1158 /* NO_FIX_PLAYER is set when a great many changes are being 1060 /* NO_FIX_PLAYER is set when a great many changes are being
1159 * made to players inventory. If set, avoiding the call 1061 * made to players inventory. If set, avoiding the call
1160 * to save cpu time. 1062 * to save cpu time.
1161 */ 1063 */
1162 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1064 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163 fix_player (otmp); 1065 fix_player (otmp);
1164 1066
1165 if (op->above != NULL) 1067 if (above != NULL)
1166 op->above->below = op->below; 1068 above->below = below;
1167 else 1069 else
1168 op->env->inv = op->below; 1070 env->inv = below;
1169 1071
1170 if (op->below != NULL) 1072 if (below != NULL)
1171 op->below->above = op->above; 1073 below->above = above;
1172 1074
1173 /* we set up values so that it could be inserted into 1075 /* we set up values so that it could be inserted into
1174 * the map, but we don't actually do that - it is up 1076 * the map, but we don't actually do that - it is up
1175 * to the caller to decide what we want to do. 1077 * to the caller to decide what we want to do.
1176 */ 1078 */
1177 op->x = op->env->x, op->y = op->env->y; 1079 x = env->x, y = env->y;
1178 op->map = op->env->map; 1080 map = env->map;
1179 op->above = NULL, op->below = NULL; 1081 above = 0, below = 0;
1180 op->env = NULL; 1082 env = 0;
1181 } 1083 }
1182 else if (op->map) 1084 else if (map)
1183 { 1085 {
1184 x = op->x;
1185 y = op->y;
1186 m = get_map_from_coord (op->map, &x, &y);
1187
1188 if (!m)
1189 {
1190 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1191 op->map->path, op->x, op->y);
1192 /* in old days, we used to set x and y to 0 and continue.
1193 * it seems if we get into this case, something is probablye
1194 * screwed up and should be fixed.
1195 */
1196 abort ();
1197 }
1198
1199 if (op->map != m)
1200 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1201 op->map->path, m->path, op->x, op->y, x, y);
1202
1203 /* Re did the following section of code - it looks like it had 1086 /* Re did the following section of code - it looks like it had
1204 * lots of logic for things we no longer care about 1087 * lots of logic for things we no longer care about
1205 */ 1088 */
1206 1089
1207 /* link the object above us */ 1090 /* link the object above us */
1208 if (op->above) 1091 if (above)
1209 op->above->below = op->below; 1092 above->below = below;
1210 else 1093 else
1211 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1094 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1212 1095
1213 /* Relink the object below us, if there is one */ 1096 /* Relink the object below us, if there is one */
1214 if (op->below) 1097 if (below)
1215 op->below->above = op->above; 1098 below->above = above;
1216 else 1099 else
1217 { 1100 {
1218 /* Nothing below, which means we need to relink map object for this space 1101 /* Nothing below, which means we need to relink map object for this space
1219 * use translated coordinates in case some oddness with map tiling is 1102 * use translated coordinates in case some oddness with map tiling is
1220 * evident 1103 * evident
1221 */ 1104 */
1222 if (GET_MAP_OB (m, x, y) != op) 1105 if (GET_MAP_OB (map, x, y) != this)
1223 { 1106 {
1224 dump_object (op); 1107 char *dump = dump_object (this);
1225 LOG (llevError, 1108 LOG (llevError,
1226 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1109 "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);
1110 free (dump);
1227 dump_object (GET_MAP_OB (m, x, y)); 1111 dump = dump_object (GET_MAP_OB (map, x, y));
1228 LOG (llevError, "%s\n", errmsg); 1112 LOG (llevError, "%s\n", dump);
1113 free (dump);
1229 } 1114 }
1230 1115
1231 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1116 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1232 } 1117 }
1233 1118
1234 op->above = 0; 1119 above = 0;
1235 op->below = 0; 1120 below = 0;
1236 1121
1237 if (op->map->in_memory == MAP_SAVING) 1122 if (map->in_memory == MAP_SAVING)
1238 return; 1123 return;
1239 1124
1240 tag = op->count;
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1125 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1242 1126
1243 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1127 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1244 { 1128 {
1245 /* No point updating the players look faces if he is the object 1129 /* No point updating the players look faces if he is the object
1246 * being removed. 1130 * being removed.
1247 */ 1131 */
1248 1132
1249 if (tmp->type == PLAYER && tmp != op) 1133 if (tmp->type == PLAYER && tmp != this)
1250 { 1134 {
1251 /* If a container that the player is currently using somehow gets 1135 /* If a container that the player is currently using somehow gets
1252 * removed (most likely destroyed), update the player view 1136 * removed (most likely destroyed), update the player view
1253 * appropriately. 1137 * appropriately.
1254 */ 1138 */
1255 if (tmp->container == op) 1139 if (tmp->container == this)
1256 { 1140 {
1257 CLEAR_FLAG (op, FLAG_APPLIED); 1141 CLEAR_FLAG (this, FLAG_APPLIED);
1258 tmp->container = NULL; 1142 tmp->container = 0;
1259 } 1143 }
1260 1144
1261 tmp->contr->socket.update_look = 1; 1145 tmp->contr->socket->update_look = 1;
1262 } 1146 }
1263 1147
1264 /* See if player moving off should effect something */ 1148 /* See if player moving off should effect something */
1265 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1149 if (check_walk_off
1150 && ((move_type & tmp->move_off)
1151 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1266 { 1152 {
1267 move_apply (tmp, op, NULL); 1153 move_apply (tmp, this, 0);
1268 1154
1269 if (was_destroyed (op, tag)) 1155 if (destroyed ())
1270 {
1271 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1156 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1272 }
1273 } 1157 }
1274 1158
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1159 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1160
1277 if (tmp->above == tmp) 1161 if (tmp->above == tmp)
1278 tmp->above = NULL; 1162 tmp->above = 0;
1279 1163
1280 last = tmp; 1164 last = tmp;
1281 } 1165 }
1282 1166
1283 /* last == NULL of there are no objects on this space */ 1167 /* last == NULL of there are no objects on this space */
1284 if (last == NULL) 1168 if (!last)
1285 { 1169 {
1286 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1171 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288 * those out anyways, and if there are any flags set right now, they won't 1172 * those out anyways, and if there are any flags set right now, they won't
1289 * be correct anyways. 1173 * be correct anyways.
1290 */ 1174 */
1291 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1175 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1292 update_position (op->map, op->x, op->y); 1176 update_position (map, x, y);
1293 } 1177 }
1294 else 1178 else
1295 update_object (last, UP_OBJ_REMOVE); 1179 update_object (last, UP_OBJ_REMOVE);
1296 1180
1297 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1181 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1298 update_all_los (op->map, op->x, op->y); 1182 update_all_los (map, x, y);
1299 } 1183 }
1300} 1184}
1301 1185
1302/* 1186/*
1303 * merge_ob(op,top): 1187 * merge_ob(op,top):
… …
1318 1202
1319 for (; top != NULL; top = top->below) 1203 for (; top != NULL; top = top->below)
1320 { 1204 {
1321 if (top == op) 1205 if (top == op)
1322 continue; 1206 continue;
1323 if (CAN_MERGE (op, top)) 1207
1208 if (object::can_merge (op, top))
1324 { 1209 {
1325 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1326 1211
1327/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1328 op->weight = 0; /* Don't want any adjustements now */ 1213 op->weight = 0; /* Don't want any adjustements now */
1329 remove_ob (op); 1214 op->destroy ();
1330 free_object (op);
1331 return top; 1215 return top;
1332 } 1216 }
1333 } 1217 }
1334 1218
1335 return NULL; 1219 return 0;
1336} 1220}
1337 1221
1338/* 1222/*
1339 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1223 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1340 * job preparing multi-part monsters 1224 * job preparing multi-part monsters
1341 */ 1225 */
1342object * 1226object *
1343insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1227insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1344{ 1228{
1345 object *tmp; 1229 object *tmp;
1346 1230
1347 if (op->head) 1231 if (op->head)
1348 op = op->head; 1232 op = op->head;
… …
1376 * NULL if 'op' was destroyed 1260 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1261 * just 'op' otherwise
1378 */ 1262 */
1379 1263
1380object * 1264object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1265insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1266{
1383 object *tmp, *top, *floor = NULL; 1267 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1268 sint16 x, y;
1385 1269
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1270 if (QUERY_FLAG (op, FLAG_FREED))
… …
1389 return NULL; 1273 return NULL;
1390 } 1274 }
1391 1275
1392 if (m == NULL) 1276 if (m == NULL)
1393 { 1277 {
1394 dump_object (op); 1278 char *dump = dump_object (op);
1395 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1279 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1280 free (dump);
1396 return op; 1281 return op;
1397 } 1282 }
1398 1283
1399 if (out_of_map (m, op->x, op->y)) 1284 if (out_of_map (m, op->x, op->y))
1400 { 1285 {
1401 dump_object (op); 1286 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1287 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403#ifdef MANY_CORES 1288#ifdef MANY_CORES
1404 /* Better to catch this here, as otherwise the next use of this object 1289 /* Better to catch this here, as otherwise the next use of this object
1405 * is likely to cause a crash. Better to find out where it is getting 1290 * is likely to cause a crash. Better to find out where it is getting
1406 * improperly inserted. 1291 * improperly inserted.
1407 */ 1292 */
1408 abort (); 1293 abort ();
1409#endif 1294#endif
1295 free (dump);
1410 return op; 1296 return op;
1411 } 1297 }
1412 1298
1413 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1299 if (!QUERY_FLAG (op, FLAG_REMOVED))
1414 { 1300 {
1415 dump_object (op); 1301 char *dump = dump_object (op);
1416 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1302 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1303 free (dump);
1417 return op; 1304 return op;
1418 } 1305 }
1419 1306
1420 if (op->more != NULL) 1307 if (op->more != NULL)
1421 { 1308 {
… …
1459 1346
1460 /* this has to be done after we translate the coordinates. 1347 /* this has to be done after we translate the coordinates.
1461 */ 1348 */
1462 if (op->nrof && !(flag & INS_NO_MERGE)) 1349 if (op->nrof && !(flag & INS_NO_MERGE))
1463 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1350 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464 if (CAN_MERGE (op, tmp)) 1351 if (object::can_merge (op, tmp))
1465 { 1352 {
1466 op->nrof += tmp->nrof; 1353 op->nrof += tmp->nrof;
1467 remove_ob (tmp); 1354 tmp->destroy ();
1468 free_object (tmp);
1469 } 1355 }
1470 1356
1471 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1357 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1472 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1358 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1473 1359
… …
1601 * it, so save a few ticks and start from there. 1487 * it, so save a few ticks and start from there.
1602 */ 1488 */
1603 if (!(flag & INS_MAP_LOAD)) 1489 if (!(flag & INS_MAP_LOAD))
1604 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1490 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1605 if (tmp->type == PLAYER) 1491 if (tmp->type == PLAYER)
1606 tmp->contr->socket.update_look = 1; 1492 tmp->contr->socket->update_look = 1;
1607 1493
1608 /* If this object glows, it may affect lighting conditions that are 1494 /* If this object glows, it may affect lighting conditions that are
1609 * visible to others on this map. But update_all_los is really 1495 * visible to others on this map. But update_all_los is really
1610 * an inefficient way to do this, as it means los for all players 1496 * an inefficient way to do this, as it means los for all players
1611 * on the map will get recalculated. The players could very well 1497 * on the map will get recalculated. The players could very well
… …
1659 tmp1; 1545 tmp1;
1660 1546
1661 /* first search for itself and remove any old instances */ 1547 /* first search for itself and remove any old instances */
1662 1548
1663 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1549 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1664 {
1665 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1550 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1666 { 1551 tmp->destroy ();
1667 remove_ob (tmp);
1668 free_object (tmp);
1669 }
1670 }
1671 1552
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1553 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1554
1674 tmp1->x = op->x; 1555 tmp1->x = op->x;
1675 tmp1->y = op->y; 1556 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1557 insert_ob_in_map (tmp1, op->map, op, 0);
1677} 1558}
… …
1685 */ 1566 */
1686 1567
1687object * 1568object *
1688get_split_ob (object *orig_ob, uint32 nr) 1569get_split_ob (object *orig_ob, uint32 nr)
1689{ 1570{
1690 object * 1571 object *newob;
1691 newob;
1692 int
1693 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1572 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1694 1573
1695 if (orig_ob->nrof < nr) 1574 if (orig_ob->nrof < nr)
1696 { 1575 {
1697 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1576 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1698 return NULL; 1577 return NULL;
1699 } 1578 }
1700 1579
1701 newob = object_create_clone (orig_ob); 1580 newob = object_create_clone (orig_ob);
1702 1581
1703 if ((orig_ob->nrof -= nr) < 1) 1582 if ((orig_ob->nrof -= nr) < 1)
1704 { 1583 orig_ob->destroy (1);
1705 if (!is_removed)
1706 remove_ob (orig_ob);
1707 free_object2 (orig_ob, 1);
1708 }
1709 else if (!is_removed) 1584 else if (!is_removed)
1710 { 1585 {
1711 if (orig_ob->env != NULL) 1586 if (orig_ob->env != NULL)
1712 sub_weight (orig_ob->env, orig_ob->weight * nr); 1587 sub_weight (orig_ob->env, orig_ob->weight * nr);
1713 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1588 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1777 esrv_send_item (tmp, op); 1652 esrv_send_item (tmp, op);
1778 } 1653 }
1779 } 1654 }
1780 else 1655 else
1781 { 1656 {
1782 remove_ob (op); 1657 op->remove ();
1783 op->nrof = 0; 1658 op->nrof = 0;
1784 if (tmp) 1659 if (tmp)
1785 { 1660 {
1786 esrv_del_item (tmp->contr, op->count); 1661 esrv_del_item (tmp->contr, op->count);
1787 } 1662 }
… …
1793 1668
1794 if (i < op->nrof) 1669 if (i < op->nrof)
1795 op->nrof -= i; 1670 op->nrof -= i;
1796 else 1671 else
1797 { 1672 {
1798 remove_ob (op); 1673 op->remove ();
1799 op->nrof = 0; 1674 op->nrof = 0;
1800 } 1675 }
1801 1676
1802 /* Since we just removed op, op->above is null */ 1677 /* Since we just removed op, op->above is null */
1803 for (tmp = above; tmp != NULL; tmp = tmp->above) 1678 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1812 1687
1813 if (op->nrof) 1688 if (op->nrof)
1814 return op; 1689 return op;
1815 else 1690 else
1816 { 1691 {
1817 free_object (op); 1692 op->destroy ();
1818 return NULL; 1693 return NULL;
1819 } 1694 }
1820} 1695}
1821 1696
1822/* 1697/*
… …
1835 op->carrying += weight; 1710 op->carrying += weight;
1836 op = op->env; 1711 op = op->env;
1837 } 1712 }
1838} 1713}
1839 1714
1715object *
1716insert_ob_in_ob (object *op, object *where)
1717{
1718 if (!where)
1719 {
1720 char *dump = dump_object (op);
1721 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1722 free (dump);
1723 return op;
1724 }
1725
1726 if (where->head)
1727 {
1728 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1729 where = where->head;
1730 }
1731
1732 return where->insert (op);
1733}
1734
1840/* 1735/*
1841 * insert_ob_in_ob(op,environment): 1736 * env->insert (op)
1842 * This function inserts the object op in the linked list 1737 * This function inserts the object op in the linked list
1843 * inside the object environment. 1738 * inside the object environment.
1844 * 1739 *
1845 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1846 * the inventory at the last position or next to other objects of the same
1847 * type.
1848 * Frank: Now sorted by type, archetype and magic!
1849 *
1850 * The function returns now pointer to inserted item, and return value can 1740 * The function returns now pointer to inserted item, and return value can
1851 * be != op, if items are merged. -Tero 1741 * be != op, if items are merged. -Tero
1852 */ 1742 */
1853 1743
1854object * 1744object *
1855insert_ob_in_ob (object *op, object *where) 1745object::insert (object *op)
1856{ 1746{
1857 object * 1747 object *tmp, *otmp;
1858 tmp, *
1859 otmp;
1860 1748
1861 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1749 if (!QUERY_FLAG (op, FLAG_REMOVED))
1862 { 1750 op->remove ();
1863 dump_object (op);
1864 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1865 return op;
1866 }
1867
1868 if (where == NULL)
1869 {
1870 dump_object (op);
1871 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1872 return op;
1873 }
1874
1875 if (where->head)
1876 {
1877 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1878 where = where->head;
1879 }
1880 1751
1881 if (op->more) 1752 if (op->more)
1882 { 1753 {
1883 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1754 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1884 return op; 1755 return op;
… …
1886 1757
1887 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1758 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1888 CLEAR_FLAG (op, FLAG_REMOVED); 1759 CLEAR_FLAG (op, FLAG_REMOVED);
1889 if (op->nrof) 1760 if (op->nrof)
1890 { 1761 {
1891 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1762 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1892 if (CAN_MERGE (tmp, op)) 1763 if (object::can_merge (tmp, op))
1893 { 1764 {
1894 /* return the original object and remove inserted object 1765 /* return the original object and remove inserted object
1895 (client needs the original object) */ 1766 (client needs the original object) */
1896 tmp->nrof += op->nrof; 1767 tmp->nrof += op->nrof;
1897 /* Weight handling gets pretty funky. Since we are adding to 1768 /* Weight handling gets pretty funky. Since we are adding to
1898 * tmp->nrof, we need to increase the weight. 1769 * tmp->nrof, we need to increase the weight.
1899 */ 1770 */
1900 add_weight (where, op->weight * op->nrof); 1771 add_weight (this, op->weight * op->nrof);
1901 SET_FLAG (op, FLAG_REMOVED); 1772 SET_FLAG (op, FLAG_REMOVED);
1902 free_object (op); /* free the inserted object */ 1773 op->destroy (); /* free the inserted object */
1903 op = tmp; 1774 op = tmp;
1904 remove_ob (op); /* and fix old object's links */ 1775 op->remove (); /* and fix old object's links */
1905 CLEAR_FLAG (op, FLAG_REMOVED); 1776 CLEAR_FLAG (op, FLAG_REMOVED);
1906 break; 1777 break;
1907 } 1778 }
1908 1779
1909 /* I assume combined objects have no inventory 1780 /* I assume combined objects have no inventory
1910 * We add the weight - this object could have just been removed 1781 * We add the weight - this object could have just been removed
1911 * (if it was possible to merge). calling remove_ob will subtract 1782 * (if it was possible to merge). calling remove_ob will subtract
1912 * the weight, so we need to add it in again, since we actually do 1783 * the weight, so we need to add it in again, since we actually do
1913 * the linking below 1784 * the linking below
1914 */ 1785 */
1915 add_weight (where, op->weight * op->nrof); 1786 add_weight (this, op->weight * op->nrof);
1916 } 1787 }
1917 else 1788 else
1918 add_weight (where, (op->weight + op->carrying)); 1789 add_weight (this, (op->weight + op->carrying));
1919 1790
1920 otmp = is_player_inv (where); 1791 otmp = is_player_inv (this);
1921 if (otmp && otmp->contr != NULL) 1792 if (otmp && otmp->contr)
1922 {
1923 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1793 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1924 fix_player (otmp); 1794 fix_player (otmp);
1925 }
1926 1795
1927 op->map = NULL; 1796 op->map = NULL;
1928 op->env = where; 1797 op->env = this;
1929 op->above = NULL; 1798 op->above = NULL;
1930 op->below = NULL; 1799 op->below = NULL;
1931 op->x = 0, op->y = 0; 1800 op->x = 0, op->y = 0;
1932 1801
1933 /* reset the light list and los of the players on the map */ 1802 /* reset the light list and los of the players on the map */
1934 if ((op->glow_radius != 0) && where->map) 1803 if ((op->glow_radius != 0) && map)
1935 { 1804 {
1936#ifdef DEBUG_LIGHTS 1805#ifdef DEBUG_LIGHTS
1937 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1806 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1938#endif /* DEBUG_LIGHTS */ 1807#endif /* DEBUG_LIGHTS */
1939 if (MAP_DARKNESS (where->map)) 1808 if (MAP_DARKNESS (map))
1940 update_all_los (where->map, where->x, where->y); 1809 update_all_los (map, x, y);
1941 } 1810 }
1942 1811
1943 /* Client has no idea of ordering so lets not bother ordering it here. 1812 /* Client has no idea of ordering so lets not bother ordering it here.
1944 * It sure simplifies this function... 1813 * It sure simplifies this function...
1945 */ 1814 */
1946 if (where->inv == NULL) 1815 if (!inv)
1947 where->inv = op; 1816 inv = op;
1948 else 1817 else
1949 { 1818 {
1950 op->below = where->inv; 1819 op->below = inv;
1951 op->below->above = op; 1820 op->below->above = op;
1952 where->inv = op; 1821 inv = op;
1953 } 1822 }
1823
1954 return op; 1824 return op;
1955} 1825}
1956 1826
1957/* 1827/*
1958 * Checks if any objects has a move_type that matches objects 1828 * Checks if any objects has a move_type that matches objects
… …
1976 */ 1846 */
1977 1847
1978int 1848int
1979check_move_on (object *op, object *originator) 1849check_move_on (object *op, object *originator)
1980{ 1850{
1981 object * 1851 object *tmp;
1982 tmp; 1852 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1853 int x = op->x, y = op->y;
1989 1854
1990 MoveType 1855 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1856
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1857 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1858 return 0;
1997
1998 tag = op->count;
1999 1859
2000 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1860 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2001 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1861 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2002 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1862 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2003 1863
… …
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1924 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2065 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1925 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2066 { 1926 {
2067 move_apply (tmp, op, originator); 1927 move_apply (tmp, op, originator);
2068 1928
2069 if (was_destroyed (op, tag)) 1929 if (op->destroyed ())
2070 return 1; 1930 return 1;
2071 1931
2072 /* what the person/creature stepped onto has moved the object 1932 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 1933 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 1934 * have a feeling strange problems would result.
… …
2086 * a matching archetype at the given map and coordinates. 1946 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 1947 * The first matching object is returned, or NULL if none.
2088 */ 1948 */
2089 1949
2090object * 1950object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 1951present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 1952{
2093 object * 1953 object *
2094 tmp; 1954 tmp;
2095 1955
2096 if (m == NULL || out_of_map (m, x, y)) 1956 if (m == NULL || out_of_map (m, x, y))
… …
2109 * a matching type variable at the given map and coordinates. 1969 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 1970 * The first matching object is returned, or NULL if none.
2111 */ 1971 */
2112 1972
2113object * 1973object *
2114present (unsigned char type, mapstruct *m, int x, int y) 1974present (unsigned char type, maptile *m, int x, int y)
2115{ 1975{
2116 object * 1976 object *
2117 tmp; 1977 tmp;
2118 1978
2119 if (out_of_map (m, x, y)) 1979 if (out_of_map (m, x, y))
… …
2259 * the archetype because that isn't correct if the monster has been 2119 * the archetype because that isn't correct if the monster has been
2260 * customized, changed states, etc. 2120 * customized, changed states, etc.
2261 */ 2121 */
2262 2122
2263int 2123int
2264find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2124find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2265{ 2125{
2266 int 2126 int
2267 i, 2127 i,
2268 index = 0, flag; 2128 index = 0, flag;
2269 static int 2129 static int
… …
2290 return -1; 2150 return -1;
2291 return altern[RANDOM () % index]; 2151 return altern[RANDOM () % index];
2292} 2152}
2293 2153
2294/* 2154/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2155 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2156 * find_free_spot(), but it will search max number of squares.
2297 * But it will return the first available spot, not a random choice. 2157 * But it will return the first available spot, not a random choice.
2298 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2158 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2299 */ 2159 */
2300 2160
2301int 2161int
2302find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2162find_first_free_spot (const object *ob, maptile *m, int x, int y)
2303{ 2163{
2304 int 2164 int
2305 i; 2165 i;
2306 2166
2307 for (i = 0; i < SIZEOFFREE; i++) 2167 for (i = 0; i < SIZEOFFREE; i++)
… …
2371 * because we have to know what movement the thing looking to move 2231 * because we have to know what movement the thing looking to move
2372 * there is capable of. 2232 * there is capable of.
2373 */ 2233 */
2374 2234
2375int 2235int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2236find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2237{
2378 int 2238 int
2379 i, 2239 i,
2380 max = SIZEOFFREE, mflags; 2240 max = SIZEOFFREE, mflags;
2381 2241
2382 sint16 nx, ny; 2242 sint16 nx, ny;
2383 object * 2243 object *
2384 tmp; 2244 tmp;
2385 mapstruct * 2245 maptile *
2386 mp; 2246 mp;
2387 2247
2388 MoveType blocked, move_type; 2248 MoveType blocked, move_type;
2389 2249
2390 if (exclude && exclude->head) 2250 if (exclude && exclude->head)
… …
2598 * Modified to be map tile aware -.MSW 2458 * Modified to be map tile aware -.MSW
2599 */ 2459 */
2600 2460
2601 2461
2602int 2462int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2463can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2464{
2605 sint16 dx, dy; 2465 sint16 dx, dy;
2606 int 2466 int
2607 mflags; 2467 mflags;
2608 2468
… …
2657 * create clone from object to another 2517 * create clone from object to another
2658 */ 2518 */
2659object * 2519object *
2660object_create_clone (object *asrc) 2520object_create_clone (object *asrc)
2661{ 2521{
2662 object *
2663 dst = NULL, *tmp, *src, *part, *prev, *item; 2522 object *dst = 0, *tmp, *src, *part, *prev, *item;
2664 2523
2665 if (!asrc) 2524 if (!asrc)
2666 return NULL; 2525 return 0;
2526
2667 src = asrc; 2527 src = asrc;
2668 if (src->head) 2528 if (src->head)
2669 src = src->head; 2529 src = src->head;
2670 2530
2671 prev = NULL; 2531 prev = 0;
2672 for (part = src; part; part = part->more) 2532 for (part = src; part; part = part->more)
2673 { 2533 {
2674 tmp = get_object (); 2534 tmp = part->clone ();
2675 copy_object (part, tmp);
2676 tmp->x -= src->x; 2535 tmp->x -= src->x;
2677 tmp->y -= src->y; 2536 tmp->y -= src->y;
2537
2678 if (!part->head) 2538 if (!part->head)
2679 { 2539 {
2680 dst = tmp; 2540 dst = tmp;
2681 tmp->head = NULL; 2541 tmp->head = 0;
2682 } 2542 }
2683 else 2543 else
2684 { 2544 {
2685 tmp->head = dst; 2545 tmp->head = dst;
2686 } 2546 }
2547
2687 tmp->more = NULL; 2548 tmp->more = 0;
2549
2688 if (prev) 2550 if (prev)
2689 prev->more = tmp; 2551 prev->more = tmp;
2552
2690 prev = tmp; 2553 prev = tmp;
2691 } 2554 }
2692 2555
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2556 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2557 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2558
2699 return dst; 2559 return dst;
2700} 2560}
2701 2561
2702/* return true if the object was destroyed, 0 otherwise */
2703int
2704was_destroyed (const object *op, tag_t old_tag)
2705{
2706 /* checking for FLAG_FREED isn't necessary, but makes this function more
2707 * robust */
2708 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709}
2710
2711/* GROS - Creates an object using a string representing its content. */ 2562/* GROS - Creates an object using a string representing its content. */
2712
2713/* Basically, we save the content of the string to a temp file, then call */ 2563/* Basically, we save the content of the string to a temp file, then call */
2714
2715/* load_object on it. I admit it is a highly inefficient way to make things, */ 2564/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717/* but it was simple to make and allows reusing the load_object function. */ 2565/* but it was simple to make and allows reusing the load_object function. */
2718
2719/* Remember not to use load_object_str in a time-critical situation. */ 2566/* Remember not to use load_object_str in a time-critical situation. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2567/* Also remember that multiparts objects are not supported for now. */
2722 2568
2723object * 2569object *
2724load_object_str (const char *obstr) 2570load_object_str (const char *obstr)
2725{ 2571{
2726 object * 2572 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2573 char filename[MAX_BUF];
2730 2574
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2575 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2576
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2577 FILE *tempfile = fopen (filename, "w");
2735 2578
2736 if (tempfile == NULL) 2579 if (tempfile == NULL)
2737 { 2580 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2581 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2582 return NULL;
2740 }; 2583 }
2584
2741 fprintf (tempfile, obstr); 2585 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2586 fclose (tempfile);
2743 2587
2744 op = get_object (); 2588 op = object::create ();
2745 2589
2746 object_thawer thawer (filename); 2590 object_thawer thawer (filename);
2747 2591
2748 if (thawer) 2592 if (thawer)
2749 load_object (thawer, op, 0); 2593 load_object (thawer, op, 0);
… …
2759 * returns NULL if no match. 2603 * returns NULL if no match.
2760 */ 2604 */
2761object * 2605object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2606find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2607{
2764 object * 2608 object *tmp;
2765 tmp;
2766 2609
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2610 for (tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2611 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2612 return tmp;
2770 2613
… …
2778 * do the desired thing. 2621 * do the desired thing.
2779 */ 2622 */
2780key_value * 2623key_value *
2781get_ob_key_link (const object *ob, const char *key) 2624get_ob_key_link (const object *ob, const char *key)
2782{ 2625{
2783 key_value * 2626 key_value *link;
2784 link;
2785 2627
2786 for (link = ob->key_values; link != NULL; link = link->next) 2628 for (link = ob->key_values; link != NULL; link = link->next)
2787 {
2788 if (link->key == key) 2629 if (link->key == key)
2789 {
2790 return link; 2630 return link;
2791 }
2792 }
2793 2631
2794 return NULL; 2632 return NULL;
2795} 2633}
2796 2634
2797/* 2635/*

Diff Legend

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