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.41 by root, Thu Sep 14 01:12:28 2006 UTC vs.
Revision 1.64 by root, Tue Dec 12 21:39:56 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 ()
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 375 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 376 * The result of the dump is stored in the static global errmsg array.
379 */ 377 */
380 378
381void 379char *
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) 380dump_object (object *op)
437{ 381{
438 if (op == NULL) 382 if (!op)
439 { 383 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 384
447void 385 object_freezer freezer;
448dump_all_objects (void) 386 save_object (freezer, op, 3);
449{ 387 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} 388}
458 389
459/* 390/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 391 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
481 */ 412 */
482 413
483object * 414object *
484find_object (tag_t i) 415find_object (tag_t i)
485{ 416{
486 object *op; 417 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 418 if (op->count == i)
490 break; 419 return op;
420
491 return op; 421 return 0;
492} 422}
493 423
494/* 424/*
495 * Returns the first object which has a name equal to the argument. 425 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 431find_object_name (const char *str)
502{ 432{
503 shstr_cmp str_ (str); 433 shstr_cmp str_ (str);
504 object *op; 434 object *op;
505 435
506 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 437 if (op->name == str_)
508 break; 438 break;
509 439
510 return op; 440 return op;
511} 441}
512 442
513void 443void
514free_all_object_data () 444free_all_object_data ()
515{ 445{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 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} 447}
539 448
540/* 449/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 450 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 451 * skill and experience objects.
… …
612 521
613 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
614 523
615 expmul = 1.0; 524 expmul = 1.0;
616 face = blank_face; 525 face = blank_face;
617 attacked_by_count = -1;
618 526
619 if (settings.casting_time) 527 if (settings.casting_time)
620 casting_time = -1; 528 casting_time = -1;
621} 529}
622 530
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/* 531/*
633 * copy object first frees everything allocated by the second object, 532 * copy_to first frees everything allocated by the dst object,
634 * and then copies the contends of the first object into the second 533 * and then copies the contents of itself into the second
635 * object, allocating what needs to be allocated. Basically, any 534 * object, allocating what needs to be allocated. Basically, any
636 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 535 * 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 536 * if the first object is freed, the pointers in the new object
638 * will point at garbage. 537 * will point at garbage.
639 */ 538 */
640void 539void
641copy_object (object *op2, object *op) 540object::copy_to (object *dst)
642{ 541{
643 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 542 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 543 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645 544
646 op2->clone (op); 545 *(object_copy *)dst = *this;
546 *(object_pod *)dst = *this;
547
548 if (self || cb)
549 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
647 550
648 if (is_freed) 551 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 552 SET_FLAG (dst, FLAG_FREED);
553
650 if (is_removed) 554 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 555 SET_FLAG (dst, FLAG_REMOVED);
652 556
653 if (op2->speed < 0) 557 if (speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 558 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655 559
656 /* Copy over key_values, if any. */ 560 /* Copy over key_values, if any. */
657 if (op2->key_values) 561 if (key_values)
658 { 562 {
659 key_value *tail = 0; 563 key_value *tail = 0;
660 key_value *i; 564 key_value *i;
661 565
662 op->key_values = 0; 566 dst->key_values = 0;
663 567
664 for (i = op2->key_values; i; i = i->next) 568 for (i = key_values; i; i = i->next)
665 { 569 {
666 key_value *new_link = new key_value; 570 key_value *new_link = new key_value;
667 571
668 new_link->next = 0; 572 new_link->next = 0;
669 new_link->key = i->key; 573 new_link->key = i->key;
670 new_link->value = i->value; 574 new_link->value = i->value;
671 575
672 /* Try and be clever here, too. */ 576 /* Try and be clever here, too. */
673 if (!op->key_values) 577 if (!dst->key_values)
674 { 578 {
675 op->key_values = new_link; 579 dst->key_values = new_link;
676 tail = new_link; 580 tail = new_link;
677 } 581 }
678 else 582 else
679 { 583 {
680 tail->next = new_link; 584 tail->next = new_link;
681 tail = new_link; 585 tail = new_link;
682 } 586 }
683 } 587 }
684 } 588 }
685 589
686 update_ob_speed (op); 590 update_ob_speed (dst);
687} 591}
688 592
689/* 593/*
690 * If an object with the IS_TURNABLE() flag needs to be turned due 594 * 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 595 * to the closest player being on the other side, this function can
… …
896 update_now = 1; 800 update_now = 1;
897 801
898 if ((move_slow | op->move_slow) != move_slow) 802 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1; 803 update_now = 1;
900 } 804 }
805
901 /* if the object is being removed, we can't make intelligent 806 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 807 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 808 * that is being removed.
904 */ 809 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 810 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
917 822
918 if (op->more != NULL) 823 if (op->more != NULL)
919 update_object (op->more, action); 824 update_object (op->more, action);
920} 825}
921 826
922static unordered_vector<object *> mortals; 827object::vector object::mortals;
923static std::vector<object *, slice_allocator <object *> > freed; 828object::vector object::objects; // not yet used
829object *object::first;
924 830
925void object::free_mortals () 831void object::free_mortals ()
926{ 832{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 833 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 834 if ((*i)->refcnt)
929 ++i; // further delay freeing 835 ++i; // further delay freeing
930 else 836 else
931 { 837 {
932 //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D
933 //freed.push_back (*i);//D
934 delete *i; 838 delete *i;
935 mortals.erase (i); 839 mortals.erase (i);
936 } 840 }
937
938 if (mortals.size() && 0)//D
939 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
940} 841}
941 842
942object::object () 843object::object ()
943{ 844{
944 SET_FLAG (this, FLAG_REMOVED); 845 SET_FLAG (this, FLAG_REMOVED);
945 846
946 expmul = 1.0; 847 expmul = 1.0;
947 face = blank_face; 848 face = blank_face;
948 attacked_by_count = -1;
949} 849}
950 850
951object::~object () 851object::~object ()
952{ 852{
953 free_key_values (this); 853 free_key_values (this);
… …
957{ 857{
958 count = ++ob_count; 858 count = ++ob_count;
959 uuid = gen_uuid (); 859 uuid = gen_uuid ();
960 860
961 prev = 0; 861 prev = 0;
962 next = objects; 862 next = object::first;
963 863
964 if (objects) 864 if (object::first)
965 objects->prev = this; 865 object::first->prev = this;
966 866
967 objects = this; 867 object::first = this;
968} 868}
969 869
970void object::unlink () 870void object::unlink ()
971{ 871{
972 //count = 0;//D
973 if (!prev && !next) return;//D
974
975 if (this == objects) 872 if (this == object::first)
976 objects = next; 873 object::first = next;
977 874
978 /* Remove this object from the list of used objects */ 875 /* Remove this object from the list of used objects */
979 if (prev) prev->next = next; 876 if (prev) prev->next = next;
980 if (next) next->prev = prev; 877 if (next) next->prev = prev;
981 878
… …
983 next = 0; 880 next = 0;
984} 881}
985 882
986object *object::create () 883object *object::create ()
987{ 884{
988 object *op;
989
990 if (freed.empty ())
991 op = new object; 885 object *op = new object;
992 else
993 {
994 // highly annoying, but the only way to get it stable right now
995 op = freed.back ();
996 freed.pop_back ();
997 op->~object ();
998 new ((void *) op) object;
999 }
1000
1001 op->link (); 886 op->link ();
1002 return op; 887 return op;
1003} 888}
1004 889
1005/* 890/*
… …
1007 * it from the list of used objects, and puts it on the list of 892 * it from the list of used objects, and puts it on the list of
1008 * free objects. The IS_FREED() flag is set in the object. 893 * free objects. The IS_FREED() flag is set in the object.
1009 * The object must have been removed by remove_ob() first for 894 * The object must have been removed by remove_ob() first for
1010 * this function to succeed. 895 * this function to succeed.
1011 * 896 *
1012 * If free_inventory is set, free inventory as well. Else drop items in 897 * If destroy_inventory is set, free inventory as well. Else drop items in
1013 * inventory to the ground. 898 * inventory to the ground.
1014 */ 899 */
1015void object::free (bool free_inventory) 900void object::destroy (bool destroy_inventory)
1016{ 901{
1017 if (QUERY_FLAG (this, FLAG_FREED)) 902 if (QUERY_FLAG (this, FLAG_FREED))
1018 return; 903 return;
1019 904
1020 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 905 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021 remove_friendly_object (this); 906 remove_friendly_object (this);
1022 907
1023 if (!QUERY_FLAG (this, FLAG_REMOVED)) 908 if (!QUERY_FLAG (this, FLAG_REMOVED))
1024 remove_ob (this); 909 remove ();
1025 910
1026 SET_FLAG (this, FLAG_FREED); 911 SET_FLAG (this, FLAG_FREED);
1027 912
1028 //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
1029
1030 if (more) 913 if (more)
1031 { 914 {
1032 more->free (free_inventory); 915 more->destroy (destroy_inventory);
1033 more = 0; 916 more = 0;
1034 } 917 }
1035 918
1036 if (inv) 919 if (inv)
1037 { 920 {
1038 /* Only if the space blocks everything do we not process - 921 /* Only if the space blocks everything do we not process -
1039 * if some form of movement is allowed, let objects 922 * if some form of movement is allowed, let objects
1040 * drop on that space. 923 * drop on that space.
1041 */ 924 */
1042 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 925 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1043 { 926 {
1044 object *op = inv; 927 object *op = inv;
1045 928
1046 while (op) 929 while (op)
1047 { 930 {
1048 object *tmp = op->below; 931 object *tmp = op->below;
1049 op->free (free_inventory); 932 op->destroy (destroy_inventory);
1050 op = tmp; 933 op = tmp;
1051 } 934 }
1052 } 935 }
1053 else 936 else
1054 { /* Put objects in inventory onto this space */ 937 { /* Put objects in inventory onto this space */
… …
1056 939
1057 while (op) 940 while (op)
1058 { 941 {
1059 object *tmp = op->below; 942 object *tmp = op->below;
1060 943
1061 remove_ob (op); 944 op->remove ();
1062 945
1063 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 946 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1064 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 947 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1065 free_object (op); 948 op->destroy ();
1066 else 949 else
1067 { 950 {
1068 op->x = x; 951 op->x = x;
1069 op->y = y; 952 op->y = y;
1070 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 953 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1073 op = tmp; 956 op = tmp;
1074 } 957 }
1075 } 958 }
1076 } 959 }
1077 960
961 // hack to ensure that freed objects still have a valid map
962 {
963 static maptile *freed_map; // freed objects are moved here to avoid crashes
964
965 if (!freed_map)
966 {
967 freed_map = new maptile;
968
969 freed_map->name = "/internal/freed_objects_map";
970 freed_map->width = 3;
971 freed_map->height = 3;
972
973 freed_map->allocate ();
974 }
975
976 map = freed_map;
977 x = 1;
978 y = 1;
979 }
980
981 // clear those pointers that likely might have circular references to us
1078 owner = 0; 982 owner = 0;
983 enemy = 0;
984 attacked_by = 0;
985
986 // only relevant for players(?), but make sure of it anyways
987 contr = 0;
1079 988
1080 /* Remove object from the active list */ 989 /* Remove object from the active list */
1081 speed = 0; 990 speed = 0;
1082 update_ob_speed (this); 991 update_ob_speed (this);
1083 992
… …
1088 997
1089/* 998/*
1090 * sub_weight() recursively (outwards) subtracts a number from the 999 * sub_weight() recursively (outwards) subtracts a number from the
1091 * weight of an object (and what is carried by it's environment(s)). 1000 * weight of an object (and what is carried by it's environment(s)).
1092 */ 1001 */
1093
1094void 1002void
1095sub_weight (object *op, signed long weight) 1003sub_weight (object *op, signed long weight)
1096{ 1004{
1097 while (op != NULL) 1005 while (op != NULL)
1098 { 1006 {
1099 if (op->type == CONTAINER) 1007 if (op->type == CONTAINER)
1100 {
1101 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1008 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1102 } 1009
1103 op->carrying -= weight; 1010 op->carrying -= weight;
1104 op = op->env; 1011 op = op->env;
1105 } 1012 }
1106} 1013}
1107 1014
1108/* remove_ob(op): 1015/* op->remove ():
1109 * This function removes the object op from the linked list of objects 1016 * This function removes the object op from the linked list of objects
1110 * which it is currently tied to. When this function is done, the 1017 * which it is currently tied to. When this function is done, the
1111 * object will have no environment. If the object previously had an 1018 * object will have no environment. If the object previously had an
1112 * environment, the x and y coordinates will be updated to 1019 * environment, the x and y coordinates will be updated to
1113 * the previous environment. 1020 * the previous environment.
1114 * Beware: This function is called from the editor as well! 1021 * Beware: This function is called from the editor as well!
1115 */ 1022 */
1116
1117void 1023void
1118remove_ob (object *op) 1024object::remove ()
1119{ 1025{
1026 object *tmp, *last = 0;
1120 object * 1027 object *otmp;
1121 tmp, *
1122 last = NULL;
1123 object *
1124 otmp;
1125 1028
1126 tag_t
1127 tag;
1128 int
1129 check_walk_off; 1029 int check_walk_off;
1130 mapstruct *
1131 m;
1132 1030
1133 sint16
1134 x,
1135 y;
1136
1137 if (QUERY_FLAG (op, FLAG_REMOVED)) 1031 if (QUERY_FLAG (this, FLAG_REMOVED))
1138 return; 1032 return;
1139 1033
1140 SET_FLAG (op, FLAG_REMOVED); 1034 SET_FLAG (this, FLAG_REMOVED);
1141 1035
1142 if (op->more != NULL) 1036 if (more)
1143 remove_ob (op->more); 1037 more->remove ();
1144 1038
1145 /* 1039 /*
1146 * In this case, the object to be removed is in someones 1040 * In this case, the object to be removed is in someones
1147 * inventory. 1041 * inventory.
1148 */ 1042 */
1149 if (op->env != NULL) 1043 if (env)
1150 { 1044 {
1151 if (op->nrof) 1045 if (nrof)
1152 sub_weight (op->env, op->weight * op->nrof); 1046 sub_weight (env, weight * nrof);
1153 else 1047 else
1154 sub_weight (op->env, op->weight + op->carrying); 1048 sub_weight (env, weight + carrying);
1155 1049
1156 /* NO_FIX_PLAYER is set when a great many changes are being 1050 /* NO_FIX_PLAYER is set when a great many changes are being
1157 * made to players inventory. If set, avoiding the call 1051 * made to players inventory. If set, avoiding the call
1158 * to save cpu time. 1052 * to save cpu time.
1159 */ 1053 */
1160 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1054 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1161 fix_player (otmp); 1055 fix_player (otmp);
1162 1056
1163 if (op->above != NULL) 1057 if (above != NULL)
1164 op->above->below = op->below; 1058 above->below = below;
1165 else 1059 else
1166 op->env->inv = op->below; 1060 env->inv = below;
1167 1061
1168 if (op->below != NULL) 1062 if (below != NULL)
1169 op->below->above = op->above; 1063 below->above = above;
1170 1064
1171 /* we set up values so that it could be inserted into 1065 /* we set up values so that it could be inserted into
1172 * the map, but we don't actually do that - it is up 1066 * the map, but we don't actually do that - it is up
1173 * to the caller to decide what we want to do. 1067 * to the caller to decide what we want to do.
1174 */ 1068 */
1175 op->x = op->env->x, op->y = op->env->y; 1069 x = env->x, y = env->y;
1176 op->map = op->env->map; 1070 map = env->map;
1177 op->above = NULL, op->below = NULL; 1071 above = 0, below = 0;
1178 op->env = NULL; 1072 env = 0;
1179 } 1073 }
1180 else if (op->map) 1074 else if (map)
1181 { 1075 {
1182 x = op->x;
1183 y = op->y;
1184 m = get_map_from_coord (op->map, &x, &y);
1185
1186 if (!m)
1187 {
1188 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1189 op->map->path, op->x, op->y);
1190 /* in old days, we used to set x and y to 0 and continue.
1191 * it seems if we get into this case, something is probablye
1192 * screwed up and should be fixed.
1193 */
1194 abort ();
1195 }
1196
1197 if (op->map != m)
1198 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1199 op->map->path, m->path, op->x, op->y, x, y);
1200
1201 /* Re did the following section of code - it looks like it had 1076 /* Re did the following section of code - it looks like it had
1202 * lots of logic for things we no longer care about 1077 * lots of logic for things we no longer care about
1203 */ 1078 */
1204 1079
1205 /* link the object above us */ 1080 /* link the object above us */
1206 if (op->above) 1081 if (above)
1207 op->above->below = op->below; 1082 above->below = below;
1208 else 1083 else
1209 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1084 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1210 1085
1211 /* Relink the object below us, if there is one */ 1086 /* Relink the object below us, if there is one */
1212 if (op->below) 1087 if (below)
1213 op->below->above = op->above; 1088 below->above = above;
1214 else 1089 else
1215 { 1090 {
1216 /* Nothing below, which means we need to relink map object for this space 1091 /* Nothing below, which means we need to relink map object for this space
1217 * use translated coordinates in case some oddness with map tiling is 1092 * use translated coordinates in case some oddness with map tiling is
1218 * evident 1093 * evident
1219 */ 1094 */
1220 if (GET_MAP_OB (m, x, y) != op) 1095 if (GET_MAP_OB (map, x, y) != this)
1221 { 1096 {
1222 dump_object (op); 1097 char *dump = dump_object (this);
1223 LOG (llevError, 1098 LOG (llevError,
1224 "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); 1099 "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);
1100 free (dump);
1225 dump_object (GET_MAP_OB (m, x, y)); 1101 dump = dump_object (GET_MAP_OB (map, x, y));
1226 LOG (llevError, "%s\n", errmsg); 1102 LOG (llevError, "%s\n", dump);
1103 free (dump);
1227 } 1104 }
1228 1105
1229 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1106 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1230 } 1107 }
1231 1108
1232 op->above = 0; 1109 above = 0;
1233 op->below = 0; 1110 below = 0;
1234 1111
1235 if (op->map->in_memory == MAP_SAVING) 1112 if (map->in_memory == MAP_SAVING)
1236 return; 1113 return;
1237 1114
1238 tag = op->count;
1239 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1115 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1240 1116
1241 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1117 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1242 { 1118 {
1243 /* No point updating the players look faces if he is the object 1119 /* No point updating the players look faces if he is the object
1244 * being removed. 1120 * being removed.
1245 */ 1121 */
1246 1122
1247 if (tmp->type == PLAYER && tmp != op) 1123 if (tmp->type == PLAYER && tmp != this)
1248 { 1124 {
1249 /* If a container that the player is currently using somehow gets 1125 /* If a container that the player is currently using somehow gets
1250 * removed (most likely destroyed), update the player view 1126 * removed (most likely destroyed), update the player view
1251 * appropriately. 1127 * appropriately.
1252 */ 1128 */
1253 if (tmp->container == op) 1129 if (tmp->container == this)
1254 { 1130 {
1255 CLEAR_FLAG (op, FLAG_APPLIED); 1131 CLEAR_FLAG (this, FLAG_APPLIED);
1256 tmp->container = NULL; 1132 tmp->container = 0;
1257 } 1133 }
1258 1134
1259 tmp->contr->socket.update_look = 1; 1135 tmp->contr->socket.update_look = 1;
1260 } 1136 }
1261 1137
1262 /* See if player moving off should effect something */ 1138 /* See if player moving off should effect something */
1263 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1139 if (check_walk_off
1140 && ((move_type & tmp->move_off)
1141 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1264 { 1142 {
1265 move_apply (tmp, op, NULL); 1143 move_apply (tmp, this, 0);
1266 1144
1267 if (was_destroyed (op, tag)) 1145 if (destroyed ())
1268 {
1269 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1146 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1270 }
1271 } 1147 }
1272 1148
1273 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1149 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1274 1150
1275 if (tmp->above == tmp) 1151 if (tmp->above == tmp)
1276 tmp->above = NULL; 1152 tmp->above = 0;
1277 1153
1278 last = tmp; 1154 last = tmp;
1279 } 1155 }
1280 1156
1281 /* last == NULL of there are no objects on this space */ 1157 /* last == NULL of there are no objects on this space */
1282 if (last == NULL) 1158 if (!last)
1283 { 1159 {
1284 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1160 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1285 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1161 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1286 * those out anyways, and if there are any flags set right now, they won't 1162 * those out anyways, and if there are any flags set right now, they won't
1287 * be correct anyways. 1163 * be correct anyways.
1288 */ 1164 */
1289 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1165 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1290 update_position (op->map, op->x, op->y); 1166 update_position (map, x, y);
1291 } 1167 }
1292 else 1168 else
1293 update_object (last, UP_OBJ_REMOVE); 1169 update_object (last, UP_OBJ_REMOVE);
1294 1170
1295 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1171 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1296 update_all_los (op->map, op->x, op->y); 1172 update_all_los (map, x, y);
1297 } 1173 }
1298} 1174}
1299 1175
1300/* 1176/*
1301 * merge_ob(op,top): 1177 * merge_ob(op,top):
… …
1322 { 1198 {
1323 top->nrof += op->nrof; 1199 top->nrof += op->nrof;
1324 1200
1325/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1201/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1326 op->weight = 0; /* Don't want any adjustements now */ 1202 op->weight = 0; /* Don't want any adjustements now */
1327 remove_ob (op); 1203 op->destroy ();
1328 free_object (op);
1329 return top; 1204 return top;
1330 } 1205 }
1331 } 1206 }
1332 1207
1333 return NULL; 1208 return 0;
1334} 1209}
1335 1210
1336/* 1211/*
1337 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1212 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1338 * job preparing multi-part monsters 1213 * job preparing multi-part monsters
1339 */ 1214 */
1340object * 1215object *
1341insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1216insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342{ 1217{
1343 object *tmp; 1218 object *tmp;
1344 1219
1345 if (op->head) 1220 if (op->head)
1346 op = op->head; 1221 op = op->head;
… …
1374 * NULL if 'op' was destroyed 1249 * NULL if 'op' was destroyed
1375 * just 'op' otherwise 1250 * just 'op' otherwise
1376 */ 1251 */
1377 1252
1378object * 1253object *
1379insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1254insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1380{ 1255{
1381 object *tmp, *top, *floor = NULL; 1256 object *tmp, *top, *floor = NULL;
1382 sint16 x, y; 1257 sint16 x, y;
1383 1258
1384 if (QUERY_FLAG (op, FLAG_FREED)) 1259 if (QUERY_FLAG (op, FLAG_FREED))
… …
1387 return NULL; 1262 return NULL;
1388 } 1263 }
1389 1264
1390 if (m == NULL) 1265 if (m == NULL)
1391 { 1266 {
1392 dump_object (op); 1267 char *dump = dump_object (op);
1393 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1268 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1269 free (dump);
1394 return op; 1270 return op;
1395 } 1271 }
1396 1272
1397 if (out_of_map (m, op->x, op->y)) 1273 if (out_of_map (m, op->x, op->y))
1398 { 1274 {
1399 dump_object (op); 1275 char *dump = dump_object (op);
1400 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1276 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1401#ifdef MANY_CORES 1277#ifdef MANY_CORES
1402 /* Better to catch this here, as otherwise the next use of this object 1278 /* Better to catch this here, as otherwise the next use of this object
1403 * is likely to cause a crash. Better to find out where it is getting 1279 * is likely to cause a crash. Better to find out where it is getting
1404 * improperly inserted. 1280 * improperly inserted.
1405 */ 1281 */
1406 abort (); 1282 abort ();
1407#endif 1283#endif
1284 free (dump);
1408 return op; 1285 return op;
1409 } 1286 }
1410 1287
1411 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1288 if (!QUERY_FLAG (op, FLAG_REMOVED))
1412 { 1289 {
1413 dump_object (op); 1290 char *dump = dump_object (op);
1414 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1291 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1292 free (dump);
1415 return op; 1293 return op;
1416 } 1294 }
1417 1295
1418 if (op->more != NULL) 1296 if (op->more != NULL)
1419 { 1297 {
… …
1460 if (op->nrof && !(flag & INS_NO_MERGE)) 1338 if (op->nrof && !(flag & INS_NO_MERGE))
1461 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1339 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1462 if (CAN_MERGE (op, tmp)) 1340 if (CAN_MERGE (op, tmp))
1463 { 1341 {
1464 op->nrof += tmp->nrof; 1342 op->nrof += tmp->nrof;
1465 remove_ob (tmp); 1343 tmp->destroy ();
1466 free_object (tmp);
1467 } 1344 }
1468 1345
1469 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1346 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1470 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1347 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1471 1348
… …
1657 tmp1; 1534 tmp1;
1658 1535
1659 /* first search for itself and remove any old instances */ 1536 /* first search for itself and remove any old instances */
1660 1537
1661 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1538 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1662 {
1663 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1539 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1664 { 1540 tmp->destroy ();
1665 remove_ob (tmp);
1666 free_object (tmp);
1667 }
1668 }
1669 1541
1670 tmp1 = arch_to_object (find_archetype (arch_string)); 1542 tmp1 = arch_to_object (archetype::find (arch_string));
1671 1543
1672 tmp1->x = op->x; 1544 tmp1->x = op->x;
1673 tmp1->y = op->y; 1545 tmp1->y = op->y;
1674 insert_ob_in_map (tmp1, op->map, op, 0); 1546 insert_ob_in_map (tmp1, op->map, op, 0);
1675} 1547}
… …
1683 */ 1555 */
1684 1556
1685object * 1557object *
1686get_split_ob (object *orig_ob, uint32 nr) 1558get_split_ob (object *orig_ob, uint32 nr)
1687{ 1559{
1688 object * 1560 object *newob;
1689 newob;
1690 int
1691 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1561 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1692 1562
1693 if (orig_ob->nrof < nr) 1563 if (orig_ob->nrof < nr)
1694 { 1564 {
1695 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1565 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1696 return NULL; 1566 return NULL;
1697 } 1567 }
1698 1568
1699 newob = object_create_clone (orig_ob); 1569 newob = object_create_clone (orig_ob);
1700 1570
1701 if ((orig_ob->nrof -= nr) < 1) 1571 if ((orig_ob->nrof -= nr) < 1)
1702 { 1572 orig_ob->destroy (1);
1703 if (!is_removed)
1704 remove_ob (orig_ob);
1705 free_object2 (orig_ob, 1);
1706 }
1707 else if (!is_removed) 1573 else if (!is_removed)
1708 { 1574 {
1709 if (orig_ob->env != NULL) 1575 if (orig_ob->env != NULL)
1710 sub_weight (orig_ob->env, orig_ob->weight * nr); 1576 sub_weight (orig_ob->env, orig_ob->weight * nr);
1711 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1577 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1775 esrv_send_item (tmp, op); 1641 esrv_send_item (tmp, op);
1776 } 1642 }
1777 } 1643 }
1778 else 1644 else
1779 { 1645 {
1780 remove_ob (op); 1646 op->remove ();
1781 op->nrof = 0; 1647 op->nrof = 0;
1782 if (tmp) 1648 if (tmp)
1783 { 1649 {
1784 esrv_del_item (tmp->contr, op->count); 1650 esrv_del_item (tmp->contr, op->count);
1785 } 1651 }
… …
1791 1657
1792 if (i < op->nrof) 1658 if (i < op->nrof)
1793 op->nrof -= i; 1659 op->nrof -= i;
1794 else 1660 else
1795 { 1661 {
1796 remove_ob (op); 1662 op->remove ();
1797 op->nrof = 0; 1663 op->nrof = 0;
1798 } 1664 }
1799 1665
1800 /* Since we just removed op, op->above is null */ 1666 /* Since we just removed op, op->above is null */
1801 for (tmp = above; tmp != NULL; tmp = tmp->above) 1667 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1810 1676
1811 if (op->nrof) 1677 if (op->nrof)
1812 return op; 1678 return op;
1813 else 1679 else
1814 { 1680 {
1815 free_object (op); 1681 op->destroy ();
1816 return NULL; 1682 return NULL;
1817 } 1683 }
1818} 1684}
1819 1685
1820/* 1686/*
… …
1833 op->carrying += weight; 1699 op->carrying += weight;
1834 op = op->env; 1700 op = op->env;
1835 } 1701 }
1836} 1702}
1837 1703
1704object *
1705insert_ob_in_ob (object *op, object *where)
1706{
1707 if (!where)
1708 {
1709 char *dump = dump_object (op);
1710 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1711 free (dump);
1712 return op;
1713 }
1714
1715 if (where->head)
1716 {
1717 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1718 where = where->head;
1719 }
1720
1721 return where->insert (op);
1722}
1723
1838/* 1724/*
1839 * insert_ob_in_ob(op,environment): 1725 * env->insert (op)
1840 * This function inserts the object op in the linked list 1726 * This function inserts the object op in the linked list
1841 * inside the object environment. 1727 * inside the object environment.
1842 * 1728 *
1843 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1844 * the inventory at the last position or next to other objects of the same
1845 * type.
1846 * Frank: Now sorted by type, archetype and magic!
1847 *
1848 * The function returns now pointer to inserted item, and return value can 1729 * The function returns now pointer to inserted item, and return value can
1849 * be != op, if items are merged. -Tero 1730 * be != op, if items are merged. -Tero
1850 */ 1731 */
1851 1732
1852object * 1733object *
1853insert_ob_in_ob (object *op, object *where) 1734object::insert (object *op)
1854{ 1735{
1855 object * 1736 object *tmp, *otmp;
1856 tmp, *
1857 otmp;
1858 1737
1859 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1738 if (!QUERY_FLAG (op, FLAG_REMOVED))
1860 { 1739 op->remove ();
1861 dump_object (op);
1862 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1863 return op;
1864 }
1865
1866 if (where == NULL)
1867 {
1868 dump_object (op);
1869 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870 return op;
1871 }
1872
1873 if (where->head)
1874 {
1875 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1876 where = where->head;
1877 }
1878 1740
1879 if (op->more) 1741 if (op->more)
1880 { 1742 {
1881 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1743 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1882 return op; 1744 return op;
… …
1884 1746
1885 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1747 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1886 CLEAR_FLAG (op, FLAG_REMOVED); 1748 CLEAR_FLAG (op, FLAG_REMOVED);
1887 if (op->nrof) 1749 if (op->nrof)
1888 { 1750 {
1889 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1751 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1890 if (CAN_MERGE (tmp, op)) 1752 if (CAN_MERGE (tmp, op))
1891 { 1753 {
1892 /* return the original object and remove inserted object 1754 /* return the original object and remove inserted object
1893 (client needs the original object) */ 1755 (client needs the original object) */
1894 tmp->nrof += op->nrof; 1756 tmp->nrof += op->nrof;
1895 /* Weight handling gets pretty funky. Since we are adding to 1757 /* Weight handling gets pretty funky. Since we are adding to
1896 * tmp->nrof, we need to increase the weight. 1758 * tmp->nrof, we need to increase the weight.
1897 */ 1759 */
1898 add_weight (where, op->weight * op->nrof); 1760 add_weight (this, op->weight * op->nrof);
1899 SET_FLAG (op, FLAG_REMOVED); 1761 SET_FLAG (op, FLAG_REMOVED);
1900 free_object (op); /* free the inserted object */ 1762 op->destroy (); /* free the inserted object */
1901 op = tmp; 1763 op = tmp;
1902 remove_ob (op); /* and fix old object's links */ 1764 op->remove (); /* and fix old object's links */
1903 CLEAR_FLAG (op, FLAG_REMOVED); 1765 CLEAR_FLAG (op, FLAG_REMOVED);
1904 break; 1766 break;
1905 } 1767 }
1906 1768
1907 /* I assume combined objects have no inventory 1769 /* I assume combined objects have no inventory
1908 * We add the weight - this object could have just been removed 1770 * We add the weight - this object could have just been removed
1909 * (if it was possible to merge). calling remove_ob will subtract 1771 * (if it was possible to merge). calling remove_ob will subtract
1910 * the weight, so we need to add it in again, since we actually do 1772 * the weight, so we need to add it in again, since we actually do
1911 * the linking below 1773 * the linking below
1912 */ 1774 */
1913 add_weight (where, op->weight * op->nrof); 1775 add_weight (this, op->weight * op->nrof);
1914 } 1776 }
1915 else 1777 else
1916 add_weight (where, (op->weight + op->carrying)); 1778 add_weight (this, (op->weight + op->carrying));
1917 1779
1918 otmp = is_player_inv (where); 1780 otmp = is_player_inv (this);
1919 if (otmp && otmp->contr != NULL) 1781 if (otmp && otmp->contr)
1920 {
1921 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1782 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1922 fix_player (otmp); 1783 fix_player (otmp);
1923 }
1924 1784
1925 op->map = NULL; 1785 op->map = NULL;
1926 op->env = where; 1786 op->env = this;
1927 op->above = NULL; 1787 op->above = NULL;
1928 op->below = NULL; 1788 op->below = NULL;
1929 op->x = 0, op->y = 0; 1789 op->x = 0, op->y = 0;
1930 1790
1931 /* reset the light list and los of the players on the map */ 1791 /* reset the light list and los of the players on the map */
1932 if ((op->glow_radius != 0) && where->map) 1792 if ((op->glow_radius != 0) && map)
1933 { 1793 {
1934#ifdef DEBUG_LIGHTS 1794#ifdef DEBUG_LIGHTS
1935 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1795 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1936#endif /* DEBUG_LIGHTS */ 1796#endif /* DEBUG_LIGHTS */
1937 if (MAP_DARKNESS (where->map)) 1797 if (MAP_DARKNESS (map))
1938 update_all_los (where->map, where->x, where->y); 1798 update_all_los (map, x, y);
1939 } 1799 }
1940 1800
1941 /* Client has no idea of ordering so lets not bother ordering it here. 1801 /* Client has no idea of ordering so lets not bother ordering it here.
1942 * It sure simplifies this function... 1802 * It sure simplifies this function...
1943 */ 1803 */
1944 if (where->inv == NULL) 1804 if (!inv)
1945 where->inv = op; 1805 inv = op;
1946 else 1806 else
1947 { 1807 {
1948 op->below = where->inv; 1808 op->below = inv;
1949 op->below->above = op; 1809 op->below->above = op;
1950 where->inv = op; 1810 inv = op;
1951 } 1811 }
1812
1952 return op; 1813 return op;
1953} 1814}
1954 1815
1955/* 1816/*
1956 * Checks if any objects has a move_type that matches objects 1817 * Checks if any objects has a move_type that matches objects
… …
1974 */ 1835 */
1975 1836
1976int 1837int
1977check_move_on (object *op, object *originator) 1838check_move_on (object *op, object *originator)
1978{ 1839{
1979 object * 1840 object *tmp;
1980 tmp; 1841 maptile *m = op->map;
1981 tag_t
1982 tag;
1983 mapstruct *
1984 m = op->map;
1985 int
1986 x = op->x, y = op->y; 1842 int x = op->x, y = op->y;
1987 1843
1988 MoveType 1844 MoveType move_on, move_slow, move_block;
1989 move_on,
1990 move_slow,
1991 move_block;
1992 1845
1993 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1846 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1994 return 0; 1847 return 0;
1995
1996 tag = op->count;
1997 1848
1998 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1849 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1999 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1850 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2000 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1851 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2001 1852
… …
2062 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1913 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2063 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1914 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2064 { 1915 {
2065 move_apply (tmp, op, originator); 1916 move_apply (tmp, op, originator);
2066 1917
2067 if (was_destroyed (op, tag)) 1918 if (op->destroyed ())
2068 return 1; 1919 return 1;
2069 1920
2070 /* what the person/creature stepped onto has moved the object 1921 /* what the person/creature stepped onto has moved the object
2071 * someplace new. Don't process any further - if we did, 1922 * someplace new. Don't process any further - if we did,
2072 * have a feeling strange problems would result. 1923 * have a feeling strange problems would result.
… …
2084 * a matching archetype at the given map and coordinates. 1935 * a matching archetype at the given map and coordinates.
2085 * The first matching object is returned, or NULL if none. 1936 * The first matching object is returned, or NULL if none.
2086 */ 1937 */
2087 1938
2088object * 1939object *
2089present_arch (const archetype *at, mapstruct *m, int x, int y) 1940present_arch (const archetype *at, maptile *m, int x, int y)
2090{ 1941{
2091 object * 1942 object *
2092 tmp; 1943 tmp;
2093 1944
2094 if (m == NULL || out_of_map (m, x, y)) 1945 if (m == NULL || out_of_map (m, x, y))
… …
2107 * a matching type variable at the given map and coordinates. 1958 * a matching type variable at the given map and coordinates.
2108 * The first matching object is returned, or NULL if none. 1959 * The first matching object is returned, or NULL if none.
2109 */ 1960 */
2110 1961
2111object * 1962object *
2112present (unsigned char type, mapstruct *m, int x, int y) 1963present (unsigned char type, maptile *m, int x, int y)
2113{ 1964{
2114 object * 1965 object *
2115 tmp; 1966 tmp;
2116 1967
2117 if (out_of_map (m, x, y)) 1968 if (out_of_map (m, x, y))
… …
2257 * the archetype because that isn't correct if the monster has been 2108 * the archetype because that isn't correct if the monster has been
2258 * customized, changed states, etc. 2109 * customized, changed states, etc.
2259 */ 2110 */
2260 2111
2261int 2112int
2262find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2113find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2263{ 2114{
2264 int 2115 int
2265 i, 2116 i,
2266 index = 0, flag; 2117 index = 0, flag;
2267 static int 2118 static int
… …
2288 return -1; 2139 return -1;
2289 return altern[RANDOM () % index]; 2140 return altern[RANDOM () % index];
2290} 2141}
2291 2142
2292/* 2143/*
2293 * find_first_free_spot(archetype, mapstruct, x, y) works like 2144 * find_first_free_spot(archetype, maptile, x, y) works like
2294 * find_free_spot(), but it will search max number of squares. 2145 * find_free_spot(), but it will search max number of squares.
2295 * But it will return the first available spot, not a random choice. 2146 * But it will return the first available spot, not a random choice.
2296 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2147 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2297 */ 2148 */
2298 2149
2299int 2150int
2300find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2151find_first_free_spot (const object *ob, maptile *m, int x, int y)
2301{ 2152{
2302 int 2153 int
2303 i; 2154 i;
2304 2155
2305 for (i = 0; i < SIZEOFFREE; i++) 2156 for (i = 0; i < SIZEOFFREE; i++)
… …
2369 * because we have to know what movement the thing looking to move 2220 * because we have to know what movement the thing looking to move
2370 * there is capable of. 2221 * there is capable of.
2371 */ 2222 */
2372 2223
2373int 2224int
2374find_dir (mapstruct *m, int x, int y, object *exclude) 2225find_dir (maptile *m, int x, int y, object *exclude)
2375{ 2226{
2376 int 2227 int
2377 i, 2228 i,
2378 max = SIZEOFFREE, mflags; 2229 max = SIZEOFFREE, mflags;
2379 2230
2380 sint16 nx, ny; 2231 sint16 nx, ny;
2381 object * 2232 object *
2382 tmp; 2233 tmp;
2383 mapstruct * 2234 maptile *
2384 mp; 2235 mp;
2385 2236
2386 MoveType blocked, move_type; 2237 MoveType blocked, move_type;
2387 2238
2388 if (exclude && exclude->head) 2239 if (exclude && exclude->head)
… …
2596 * Modified to be map tile aware -.MSW 2447 * Modified to be map tile aware -.MSW
2597 */ 2448 */
2598 2449
2599 2450
2600int 2451int
2601can_see_monsterP (mapstruct *m, int x, int y, int dir) 2452can_see_monsterP (maptile *m, int x, int y, int dir)
2602{ 2453{
2603 sint16 dx, dy; 2454 sint16 dx, dy;
2604 int 2455 int
2605 mflags; 2456 mflags;
2606 2457
… …
2655 * create clone from object to another 2506 * create clone from object to another
2656 */ 2507 */
2657object * 2508object *
2658object_create_clone (object *asrc) 2509object_create_clone (object *asrc)
2659{ 2510{
2660 object *
2661 dst = NULL, *tmp, *src, *part, *prev, *item; 2511 object *dst = 0, *tmp, *src, *part, *prev, *item;
2662 2512
2663 if (!asrc) 2513 if (!asrc)
2664 return NULL; 2514 return 0;
2515
2665 src = asrc; 2516 src = asrc;
2666 if (src->head) 2517 if (src->head)
2667 src = src->head; 2518 src = src->head;
2668 2519
2669 prev = NULL; 2520 prev = 0;
2670 for (part = src; part; part = part->more) 2521 for (part = src; part; part = part->more)
2671 { 2522 {
2672 tmp = get_object (); 2523 tmp = object::create ();
2673 copy_object (part, tmp); 2524 part->copy_to (tmp);
2674 tmp->x -= src->x; 2525 tmp->x -= src->x;
2675 tmp->y -= src->y; 2526 tmp->y -= src->y;
2527
2676 if (!part->head) 2528 if (!part->head)
2677 { 2529 {
2678 dst = tmp; 2530 dst = tmp;
2679 tmp->head = NULL; 2531 tmp->head = 0;
2680 } 2532 }
2681 else 2533 else
2682 { 2534 {
2683 tmp->head = dst; 2535 tmp->head = dst;
2684 } 2536 }
2537
2685 tmp->more = NULL; 2538 tmp->more = 0;
2539
2686 if (prev) 2540 if (prev)
2687 prev->more = tmp; 2541 prev->more = tmp;
2542
2688 prev = tmp; 2543 prev = tmp;
2689 } 2544 }
2690 2545
2691 /*** copy inventory ***/
2692 for (item = src->inv; item; item = item->below) 2546 for (item = src->inv; item; item = item->below)
2693 {
2694 (void) insert_ob_in_ob (object_create_clone (item), dst); 2547 insert_ob_in_ob (object_create_clone (item), dst);
2695 }
2696 2548
2697 return dst; 2549 return dst;
2698} 2550}
2699 2551
2700/* return true if the object was destroyed, 0 otherwise */
2701int
2702was_destroyed (const object *op, tag_t old_tag)
2703{
2704 /* checking for FLAG_FREED isn't necessary, but makes this function more
2705 * robust */
2706 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2707}
2708
2709/* GROS - Creates an object using a string representing its content. */ 2552/* GROS - Creates an object using a string representing its content. */
2710
2711/* Basically, we save the content of the string to a temp file, then call */ 2553/* Basically, we save the content of the string to a temp file, then call */
2712
2713/* load_object on it. I admit it is a highly inefficient way to make things, */ 2554/* load_object on it. I admit it is a highly inefficient way to make things, */
2714
2715/* but it was simple to make and allows reusing the load_object function. */ 2555/* but it was simple to make and allows reusing the load_object function. */
2716
2717/* Remember not to use load_object_str in a time-critical situation. */ 2556/* Remember not to use load_object_str in a time-critical situation. */
2718
2719/* Also remember that multiparts objects are not supported for now. */ 2557/* Also remember that multiparts objects are not supported for now. */
2720 2558
2721object * 2559object *
2722load_object_str (const char *obstr) 2560load_object_str (const char *obstr)
2723{ 2561{
2724 object * 2562 object *op;
2725 op;
2726 char
2727 filename[MAX_BUF]; 2563 char filename[MAX_BUF];
2728 2564
2729 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2565 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2730 2566
2731 FILE *
2732 tempfile = fopen (filename, "w"); 2567 FILE *tempfile = fopen (filename, "w");
2733 2568
2734 if (tempfile == NULL) 2569 if (tempfile == NULL)
2735 { 2570 {
2736 LOG (llevError, "Error - Unable to access load object temp file\n"); 2571 LOG (llevError, "Error - Unable to access load object temp file\n");
2737 return NULL; 2572 return NULL;
2738 } 2573 }
2739 2574
2740 fprintf (tempfile, obstr); 2575 fprintf (tempfile, obstr);
2741 fclose (tempfile); 2576 fclose (tempfile);
2742 2577
2743 op = get_object (); 2578 op = object::create ();
2744 2579
2745 object_thawer thawer (filename); 2580 object_thawer thawer (filename);
2746 2581
2747 if (thawer) 2582 if (thawer)
2748 load_object (thawer, op, 0); 2583 load_object (thawer, op, 0);
… …
2758 * returns NULL if no match. 2593 * returns NULL if no match.
2759 */ 2594 */
2760object * 2595object *
2761find_obj_by_type_subtype (const object *who, int type, int subtype) 2596find_obj_by_type_subtype (const object *who, int type, int subtype)
2762{ 2597{
2763 object * 2598 object *tmp;
2764 tmp;
2765 2599
2766 for (tmp = who->inv; tmp; tmp = tmp->below) 2600 for (tmp = who->inv; tmp; tmp = tmp->below)
2767 if (tmp->type == type && tmp->subtype == subtype) 2601 if (tmp->type == type && tmp->subtype == subtype)
2768 return tmp; 2602 return tmp;
2769 2603
… …
2777 * do the desired thing. 2611 * do the desired thing.
2778 */ 2612 */
2779key_value * 2613key_value *
2780get_ob_key_link (const object *ob, const char *key) 2614get_ob_key_link (const object *ob, const char *key)
2781{ 2615{
2782 key_value * 2616 key_value *link;
2783 link;
2784 2617
2785 for (link = ob->key_values; link != NULL; link = link->next) 2618 for (link = ob->key_values; link != NULL; link = link->next)
2786 {
2787 if (link->key == key) 2619 if (link->key == key)
2788 {
2789 return link; 2620 return link;
2790 }
2791 }
2792 2621
2793 return NULL; 2622 return NULL;
2794} 2623}
2795 2624
2796/* 2625/*

Diff Legend

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