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.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 freed.push_back (*i);//D
933 //delete *i; 838 delete *i;
934 mortals.erase (i); 839 mortals.erase (i);
935 } 840 }
936
937 if (mortals.size() && 0)//D
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
939} 841}
940 842
941object::object () 843object::object ()
942{ 844{
943 SET_FLAG (this, FLAG_REMOVED); 845 SET_FLAG (this, FLAG_REMOVED);
944 846
945 expmul = 1.0; 847 expmul = 1.0;
946 face = blank_face; 848 face = blank_face;
947 attacked_by_count = -1;
948} 849}
949 850
950object::~object () 851object::~object ()
951{ 852{
952 free_key_values (this); 853 free_key_values (this);
953} 854}
954 855
955void object::link () 856void object::link ()
956{ 857{
957 count = ++ob_count; 858 count = ++ob_count;
859 uuid = gen_uuid ();
958 860
959 prev = 0; 861 prev = 0;
960 next = objects; 862 next = object::first;
961 863
962 if (objects) 864 if (object::first)
963 objects->prev = this; 865 object::first->prev = this;
964 866
965 objects = this; 867 object::first = this;
966} 868}
967 869
968void object::unlink () 870void object::unlink ()
969{ 871{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 872 if (this == object::first)
974 objects = next; 873 object::first = next;
975 874
976 /* Remove this object from the list of used objects */ 875 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 876 if (prev) prev->next = next;
877 if (next) next->prev = prev;
878
980 prev = 0; 879 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 880 next = 0;
987 }
988} 881}
989 882
990object *object::create () 883object *object::create ()
991{ 884{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 885 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 (); 886 op->link ();
1006 return op; 887 return op;
1007} 888}
1008 889
1009/* 890/*
… …
1011 * 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
1012 * free objects. The IS_FREED() flag is set in the object. 893 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for 894 * The object must have been removed by remove_ob() first for
1014 * this function to succeed. 895 * this function to succeed.
1015 * 896 *
1016 * 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
1017 * inventory to the ground. 898 * inventory to the ground.
1018 */ 899 */
1019void object::free (bool free_inventory) 900void object::destroy (bool destroy_inventory)
1020{ 901{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 902 if (QUERY_FLAG (this, FLAG_FREED))
1022 return; 903 return;
1023 904
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 905 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1025 remove_friendly_object (this); 906 remove_friendly_object (this);
1026 907
1027 if (!QUERY_FLAG (this, FLAG_REMOVED)) 908 if (!QUERY_FLAG (this, FLAG_REMOVED))
1028 remove_ob (this); 909 remove ();
1029 910
1030 SET_FLAG (this, FLAG_FREED); 911 SET_FLAG (this, FLAG_FREED);
1031 912
1032 if (more) 913 if (more)
1033 { 914 {
1034 more->free (free_inventory); 915 more->destroy (destroy_inventory);
1035 more = 0; 916 more = 0;
1036 } 917 }
1037 918
1038 if (inv) 919 if (inv)
1039 { 920 {
1040 /* Only if the space blocks everything do we not process - 921 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects 922 * if some form of movement is allowed, let objects
1042 * drop on that space. 923 * drop on that space.
1043 */ 924 */
1044 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)
1045 { 926 {
1046 object *op = inv; 927 object *op = inv;
1047 928
1048 while (op) 929 while (op)
1049 { 930 {
1050 object *tmp = op->below; 931 object *tmp = op->below;
1051 op->free (free_inventory); 932 op->destroy (destroy_inventory);
1052 op = tmp; 933 op = tmp;
1053 } 934 }
1054 } 935 }
1055 else 936 else
1056 { /* Put objects in inventory onto this space */ 937 { /* Put objects in inventory onto this space */
… …
1058 939
1059 while (op) 940 while (op)
1060 { 941 {
1061 object *tmp = op->below; 942 object *tmp = op->below;
1062 943
1063 remove_ob (op); 944 op->remove ();
1064 945
1065 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 946 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)) 947 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1067 free_object (op); 948 op->destroy ();
1068 else 949 else
1069 { 950 {
1070 op->x = x; 951 op->x = x;
1071 op->y = y; 952 op->y = y;
1072 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 */
… …
1075 op = tmp; 956 op = tmp;
1076 } 957 }
1077 } 958 }
1078 } 959 }
1079 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
1080 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;
1081 988
1082 /* Remove object from the active list */ 989 /* Remove object from the active list */
1083 speed = 0; 990 speed = 0;
1084 update_ob_speed (this); 991 update_ob_speed (this);
1085 992
… …
1090 997
1091/* 998/*
1092 * sub_weight() recursively (outwards) subtracts a number from the 999 * sub_weight() recursively (outwards) subtracts a number from the
1093 * 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)).
1094 */ 1001 */
1095
1096void 1002void
1097sub_weight (object *op, signed long weight) 1003sub_weight (object *op, signed long weight)
1098{ 1004{
1099 while (op != NULL) 1005 while (op != NULL)
1100 { 1006 {
1101 if (op->type == CONTAINER) 1007 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1008 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 1009
1105 op->carrying -= weight; 1010 op->carrying -= weight;
1106 op = op->env; 1011 op = op->env;
1107 } 1012 }
1108} 1013}
1109 1014
1110/* remove_ob(op): 1015/* op->remove ():
1111 * 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
1112 * 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
1113 * object will have no environment. If the object previously had an 1018 * object will have no environment. If the object previously had an
1114 * environment, the x and y coordinates will be updated to 1019 * environment, the x and y coordinates will be updated to
1115 * the previous environment. 1020 * the previous environment.
1116 * Beware: This function is called from the editor as well! 1021 * Beware: This function is called from the editor as well!
1117 */ 1022 */
1118
1119void 1023void
1120remove_ob (object *op) 1024object::remove ()
1121{ 1025{
1026 object *tmp, *last = 0;
1122 object * 1027 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 1028
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off; 1029 int check_walk_off;
1132 mapstruct *
1133 m;
1134 1030
1135 sint16
1136 x,
1137 y;
1138
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 1031 if (QUERY_FLAG (this, FLAG_REMOVED))
1140 return; 1032 return;
1141 1033
1142 SET_FLAG (op, FLAG_REMOVED); 1034 SET_FLAG (this, FLAG_REMOVED);
1143 1035
1144 if (op->more != NULL) 1036 if (more)
1145 remove_ob (op->more); 1037 more->remove ();
1146 1038
1147 /* 1039 /*
1148 * In this case, the object to be removed is in someones 1040 * In this case, the object to be removed is in someones
1149 * inventory. 1041 * inventory.
1150 */ 1042 */
1151 if (op->env != NULL) 1043 if (env)
1152 { 1044 {
1153 if (op->nrof) 1045 if (nrof)
1154 sub_weight (op->env, op->weight * op->nrof); 1046 sub_weight (env, weight * nrof);
1155 else 1047 else
1156 sub_weight (op->env, op->weight + op->carrying); 1048 sub_weight (env, weight + carrying);
1157 1049
1158 /* 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
1159 * made to players inventory. If set, avoiding the call 1051 * made to players inventory. If set, avoiding the call
1160 * to save cpu time. 1052 * to save cpu time.
1161 */ 1053 */
1162 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))
1163 fix_player (otmp); 1055 fix_player (otmp);
1164 1056
1165 if (op->above != NULL) 1057 if (above != NULL)
1166 op->above->below = op->below; 1058 above->below = below;
1167 else 1059 else
1168 op->env->inv = op->below; 1060 env->inv = below;
1169 1061
1170 if (op->below != NULL) 1062 if (below != NULL)
1171 op->below->above = op->above; 1063 below->above = above;
1172 1064
1173 /* we set up values so that it could be inserted into 1065 /* we set up values so that it could be inserted into
1174 * 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
1175 * to the caller to decide what we want to do. 1067 * to the caller to decide what we want to do.
1176 */ 1068 */
1177 op->x = op->env->x, op->y = op->env->y; 1069 x = env->x, y = env->y;
1178 op->map = op->env->map; 1070 map = env->map;
1179 op->above = NULL, op->below = NULL; 1071 above = 0, below = 0;
1180 op->env = NULL; 1072 env = 0;
1181 } 1073 }
1182 else if (op->map) 1074 else if (map)
1183 { 1075 {
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 1076 /* Re did the following section of code - it looks like it had
1204 * lots of logic for things we no longer care about 1077 * lots of logic for things we no longer care about
1205 */ 1078 */
1206 1079
1207 /* link the object above us */ 1080 /* link the object above us */
1208 if (op->above) 1081 if (above)
1209 op->above->below = op->below; 1082 above->below = below;
1210 else 1083 else
1211 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 */
1212 1085
1213 /* Relink the object below us, if there is one */ 1086 /* Relink the object below us, if there is one */
1214 if (op->below) 1087 if (below)
1215 op->below->above = op->above; 1088 below->above = above;
1216 else 1089 else
1217 { 1090 {
1218 /* 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
1219 * use translated coordinates in case some oddness with map tiling is 1092 * use translated coordinates in case some oddness with map tiling is
1220 * evident 1093 * evident
1221 */ 1094 */
1222 if (GET_MAP_OB (m, x, y) != op) 1095 if (GET_MAP_OB (map, x, y) != this)
1223 { 1096 {
1224 dump_object (op); 1097 char *dump = dump_object (this);
1225 LOG (llevError, 1098 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); 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);
1227 dump_object (GET_MAP_OB (m, x, y)); 1101 dump = dump_object (GET_MAP_OB (map, x, y));
1228 LOG (llevError, "%s\n", errmsg); 1102 LOG (llevError, "%s\n", dump);
1103 free (dump);
1229 } 1104 }
1230 1105
1231 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1106 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1232 } 1107 }
1233 1108
1234 op->above = 0; 1109 above = 0;
1235 op->below = 0; 1110 below = 0;
1236 1111
1237 if (op->map->in_memory == MAP_SAVING) 1112 if (map->in_memory == MAP_SAVING)
1238 return; 1113 return;
1239 1114
1240 tag = op->count;
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1115 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1242 1116
1243 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)
1244 { 1118 {
1245 /* 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
1246 * being removed. 1120 * being removed.
1247 */ 1121 */
1248 1122
1249 if (tmp->type == PLAYER && tmp != op) 1123 if (tmp->type == PLAYER && tmp != this)
1250 { 1124 {
1251 /* If a container that the player is currently using somehow gets 1125 /* If a container that the player is currently using somehow gets
1252 * removed (most likely destroyed), update the player view 1126 * removed (most likely destroyed), update the player view
1253 * appropriately. 1127 * appropriately.
1254 */ 1128 */
1255 if (tmp->container == op) 1129 if (tmp->container == this)
1256 { 1130 {
1257 CLEAR_FLAG (op, FLAG_APPLIED); 1131 CLEAR_FLAG (this, FLAG_APPLIED);
1258 tmp->container = NULL; 1132 tmp->container = 0;
1259 } 1133 }
1260 1134
1261 tmp->contr->socket.update_look = 1; 1135 tmp->contr->socket.update_look = 1;
1262 } 1136 }
1263 1137
1264 /* See if player moving off should effect something */ 1138 /* 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)) 1139 if (check_walk_off
1140 && ((move_type & tmp->move_off)
1141 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1266 { 1142 {
1267 move_apply (tmp, op, NULL); 1143 move_apply (tmp, this, 0);
1268 1144
1269 if (was_destroyed (op, tag)) 1145 if (destroyed ())
1270 {
1271 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 ());
1272 }
1273 } 1147 }
1274 1148
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1149 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1150
1277 if (tmp->above == tmp) 1151 if (tmp->above == tmp)
1278 tmp->above = NULL; 1152 tmp->above = 0;
1279 1153
1280 last = tmp; 1154 last = tmp;
1281 } 1155 }
1282 1156
1283 /* last == NULL of there are no objects on this space */ 1157 /* last == NULL of there are no objects on this space */
1284 if (last == NULL) 1158 if (!last)
1285 { 1159 {
1286 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1160 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287 * 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
1288 * 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
1289 * be correct anyways. 1163 * be correct anyways.
1290 */ 1164 */
1291 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1165 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1292 update_position (op->map, op->x, op->y); 1166 update_position (map, x, y);
1293 } 1167 }
1294 else 1168 else
1295 update_object (last, UP_OBJ_REMOVE); 1169 update_object (last, UP_OBJ_REMOVE);
1296 1170
1297 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1171 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1298 update_all_los (op->map, op->x, op->y); 1172 update_all_los (map, x, y);
1299 } 1173 }
1300} 1174}
1301 1175
1302/* 1176/*
1303 * merge_ob(op,top): 1177 * merge_ob(op,top):
… …
1324 { 1198 {
1325 top->nrof += op->nrof; 1199 top->nrof += op->nrof;
1326 1200
1327/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1201/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1328 op->weight = 0; /* Don't want any adjustements now */ 1202 op->weight = 0; /* Don't want any adjustements now */
1329 remove_ob (op); 1203 op->destroy ();
1330 free_object (op);
1331 return top; 1204 return top;
1332 } 1205 }
1333 } 1206 }
1334 1207
1335 return NULL; 1208 return 0;
1336} 1209}
1337 1210
1338/* 1211/*
1339 * 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
1340 * job preparing multi-part monsters 1213 * job preparing multi-part monsters
1341 */ 1214 */
1342object * 1215object *
1343insert_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)
1344{ 1217{
1345 object *tmp; 1218 object *tmp;
1346 1219
1347 if (op->head) 1220 if (op->head)
1348 op = op->head; 1221 op = op->head;
… …
1376 * NULL if 'op' was destroyed 1249 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1250 * just 'op' otherwise
1378 */ 1251 */
1379 1252
1380object * 1253object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1254insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1255{
1383 object *tmp, *top, *floor = NULL; 1256 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1257 sint16 x, y;
1385 1258
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1259 if (QUERY_FLAG (op, FLAG_FREED))
… …
1389 return NULL; 1262 return NULL;
1390 } 1263 }
1391 1264
1392 if (m == NULL) 1265 if (m == NULL)
1393 { 1266 {
1394 dump_object (op); 1267 char *dump = dump_object (op);
1395 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);
1396 return op; 1270 return op;
1397 } 1271 }
1398 1272
1399 if (out_of_map (m, op->x, op->y)) 1273 if (out_of_map (m, op->x, op->y))
1400 { 1274 {
1401 dump_object (op); 1275 char *dump = dump_object (op);
1402 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);
1403#ifdef MANY_CORES 1277#ifdef MANY_CORES
1404 /* 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
1405 * 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
1406 * improperly inserted. 1280 * improperly inserted.
1407 */ 1281 */
1408 abort (); 1282 abort ();
1409#endif 1283#endif
1284 free (dump);
1410 return op; 1285 return op;
1411 } 1286 }
1412 1287
1413 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1288 if (!QUERY_FLAG (op, FLAG_REMOVED))
1414 { 1289 {
1415 dump_object (op); 1290 char *dump = dump_object (op);
1416 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);
1417 return op; 1293 return op;
1418 } 1294 }
1419 1295
1420 if (op->more != NULL) 1296 if (op->more != NULL)
1421 { 1297 {
… …
1462 if (op->nrof && !(flag & INS_NO_MERGE)) 1338 if (op->nrof && !(flag & INS_NO_MERGE))
1463 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)
1464 if (CAN_MERGE (op, tmp)) 1340 if (CAN_MERGE (op, tmp))
1465 { 1341 {
1466 op->nrof += tmp->nrof; 1342 op->nrof += tmp->nrof;
1467 remove_ob (tmp); 1343 tmp->destroy ();
1468 free_object (tmp);
1469 } 1344 }
1470 1345
1471 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 */
1472 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1347 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1473 1348
… …
1659 tmp1; 1534 tmp1;
1660 1535
1661 /* first search for itself and remove any old instances */ 1536 /* first search for itself and remove any old instances */
1662 1537
1663 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)
1664 {
1665 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1539 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1666 { 1540 tmp->destroy ();
1667 remove_ob (tmp);
1668 free_object (tmp);
1669 }
1670 }
1671 1541
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1542 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1543
1674 tmp1->x = op->x; 1544 tmp1->x = op->x;
1675 tmp1->y = op->y; 1545 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1546 insert_ob_in_map (tmp1, op->map, op, 0);
1677} 1547}
… …
1685 */ 1555 */
1686 1556
1687object * 1557object *
1688get_split_ob (object *orig_ob, uint32 nr) 1558get_split_ob (object *orig_ob, uint32 nr)
1689{ 1559{
1690 object * 1560 object *newob;
1691 newob;
1692 int
1693 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1561 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1694 1562
1695 if (orig_ob->nrof < nr) 1563 if (orig_ob->nrof < nr)
1696 { 1564 {
1697 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);
1698 return NULL; 1566 return NULL;
1699 } 1567 }
1700 1568
1701 newob = object_create_clone (orig_ob); 1569 newob = object_create_clone (orig_ob);
1702 1570
1703 if ((orig_ob->nrof -= nr) < 1) 1571 if ((orig_ob->nrof -= nr) < 1)
1704 { 1572 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) 1573 else if (!is_removed)
1710 { 1574 {
1711 if (orig_ob->env != NULL) 1575 if (orig_ob->env != NULL)
1712 sub_weight (orig_ob->env, orig_ob->weight * nr); 1576 sub_weight (orig_ob->env, orig_ob->weight * nr);
1713 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)
… …
1777 esrv_send_item (tmp, op); 1641 esrv_send_item (tmp, op);
1778 } 1642 }
1779 } 1643 }
1780 else 1644 else
1781 { 1645 {
1782 remove_ob (op); 1646 op->remove ();
1783 op->nrof = 0; 1647 op->nrof = 0;
1784 if (tmp) 1648 if (tmp)
1785 { 1649 {
1786 esrv_del_item (tmp->contr, op->count); 1650 esrv_del_item (tmp->contr, op->count);
1787 } 1651 }
… …
1793 1657
1794 if (i < op->nrof) 1658 if (i < op->nrof)
1795 op->nrof -= i; 1659 op->nrof -= i;
1796 else 1660 else
1797 { 1661 {
1798 remove_ob (op); 1662 op->remove ();
1799 op->nrof = 0; 1663 op->nrof = 0;
1800 } 1664 }
1801 1665
1802 /* Since we just removed op, op->above is null */ 1666 /* Since we just removed op, op->above is null */
1803 for (tmp = above; tmp != NULL; tmp = tmp->above) 1667 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1812 1676
1813 if (op->nrof) 1677 if (op->nrof)
1814 return op; 1678 return op;
1815 else 1679 else
1816 { 1680 {
1817 free_object (op); 1681 op->destroy ();
1818 return NULL; 1682 return NULL;
1819 } 1683 }
1820} 1684}
1821 1685
1822/* 1686/*
… …
1835 op->carrying += weight; 1699 op->carrying += weight;
1836 op = op->env; 1700 op = op->env;
1837 } 1701 }
1838} 1702}
1839 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
1840/* 1724/*
1841 * insert_ob_in_ob(op,environment): 1725 * env->insert (op)
1842 * This function inserts the object op in the linked list 1726 * This function inserts the object op in the linked list
1843 * inside the object environment. 1727 * inside the object environment.
1844 * 1728 *
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 1729 * The function returns now pointer to inserted item, and return value can
1851 * be != op, if items are merged. -Tero 1730 * be != op, if items are merged. -Tero
1852 */ 1731 */
1853 1732
1854object * 1733object *
1855insert_ob_in_ob (object *op, object *where) 1734object::insert (object *op)
1856{ 1735{
1857 object * 1736 object *tmp, *otmp;
1858 tmp, *
1859 otmp;
1860 1737
1861 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1738 if (!QUERY_FLAG (op, FLAG_REMOVED))
1862 { 1739 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 1740
1881 if (op->more) 1741 if (op->more)
1882 { 1742 {
1883 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);
1884 return op; 1744 return op;
… …
1886 1746
1887 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1747 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1888 CLEAR_FLAG (op, FLAG_REMOVED); 1748 CLEAR_FLAG (op, FLAG_REMOVED);
1889 if (op->nrof) 1749 if (op->nrof)
1890 { 1750 {
1891 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1751 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1892 if (CAN_MERGE (tmp, op)) 1752 if (CAN_MERGE (tmp, op))
1893 { 1753 {
1894 /* return the original object and remove inserted object 1754 /* return the original object and remove inserted object
1895 (client needs the original object) */ 1755 (client needs the original object) */
1896 tmp->nrof += op->nrof; 1756 tmp->nrof += op->nrof;
1897 /* Weight handling gets pretty funky. Since we are adding to 1757 /* Weight handling gets pretty funky. Since we are adding to
1898 * tmp->nrof, we need to increase the weight. 1758 * tmp->nrof, we need to increase the weight.
1899 */ 1759 */
1900 add_weight (where, op->weight * op->nrof); 1760 add_weight (this, op->weight * op->nrof);
1901 SET_FLAG (op, FLAG_REMOVED); 1761 SET_FLAG (op, FLAG_REMOVED);
1902 free_object (op); /* free the inserted object */ 1762 op->destroy (); /* free the inserted object */
1903 op = tmp; 1763 op = tmp;
1904 remove_ob (op); /* and fix old object's links */ 1764 op->remove (); /* and fix old object's links */
1905 CLEAR_FLAG (op, FLAG_REMOVED); 1765 CLEAR_FLAG (op, FLAG_REMOVED);
1906 break; 1766 break;
1907 } 1767 }
1908 1768
1909 /* I assume combined objects have no inventory 1769 /* I assume combined objects have no inventory
1910 * We add the weight - this object could have just been removed 1770 * We add the weight - this object could have just been removed
1911 * (if it was possible to merge). calling remove_ob will subtract 1771 * (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 1772 * the weight, so we need to add it in again, since we actually do
1913 * the linking below 1773 * the linking below
1914 */ 1774 */
1915 add_weight (where, op->weight * op->nrof); 1775 add_weight (this, op->weight * op->nrof);
1916 } 1776 }
1917 else 1777 else
1918 add_weight (where, (op->weight + op->carrying)); 1778 add_weight (this, (op->weight + op->carrying));
1919 1779
1920 otmp = is_player_inv (where); 1780 otmp = is_player_inv (this);
1921 if (otmp && otmp->contr != NULL) 1781 if (otmp && otmp->contr)
1922 {
1923 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1782 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1924 fix_player (otmp); 1783 fix_player (otmp);
1925 }
1926 1784
1927 op->map = NULL; 1785 op->map = NULL;
1928 op->env = where; 1786 op->env = this;
1929 op->above = NULL; 1787 op->above = NULL;
1930 op->below = NULL; 1788 op->below = NULL;
1931 op->x = 0, op->y = 0; 1789 op->x = 0, op->y = 0;
1932 1790
1933 /* 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 */
1934 if ((op->glow_radius != 0) && where->map) 1792 if ((op->glow_radius != 0) && map)
1935 { 1793 {
1936#ifdef DEBUG_LIGHTS 1794#ifdef DEBUG_LIGHTS
1937 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);
1938#endif /* DEBUG_LIGHTS */ 1796#endif /* DEBUG_LIGHTS */
1939 if (MAP_DARKNESS (where->map)) 1797 if (MAP_DARKNESS (map))
1940 update_all_los (where->map, where->x, where->y); 1798 update_all_los (map, x, y);
1941 } 1799 }
1942 1800
1943 /* 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.
1944 * It sure simplifies this function... 1802 * It sure simplifies this function...
1945 */ 1803 */
1946 if (where->inv == NULL) 1804 if (!inv)
1947 where->inv = op; 1805 inv = op;
1948 else 1806 else
1949 { 1807 {
1950 op->below = where->inv; 1808 op->below = inv;
1951 op->below->above = op; 1809 op->below->above = op;
1952 where->inv = op; 1810 inv = op;
1953 } 1811 }
1812
1954 return op; 1813 return op;
1955} 1814}
1956 1815
1957/* 1816/*
1958 * Checks if any objects has a move_type that matches objects 1817 * Checks if any objects has a move_type that matches objects
… …
1976 */ 1835 */
1977 1836
1978int 1837int
1979check_move_on (object *op, object *originator) 1838check_move_on (object *op, object *originator)
1980{ 1839{
1981 object * 1840 object *tmp;
1982 tmp; 1841 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1842 int x = op->x, y = op->y;
1989 1843
1990 MoveType 1844 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1845
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1846 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1847 return 0;
1997
1998 tag = op->count;
1999 1848
2000 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);
2001 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);
2002 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);
2003 1852
… …
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1913 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)) 1914 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2066 { 1915 {
2067 move_apply (tmp, op, originator); 1916 move_apply (tmp, op, originator);
2068 1917
2069 if (was_destroyed (op, tag)) 1918 if (op->destroyed ())
2070 return 1; 1919 return 1;
2071 1920
2072 /* what the person/creature stepped onto has moved the object 1921 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 1922 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 1923 * have a feeling strange problems would result.
… …
2086 * a matching archetype at the given map and coordinates. 1935 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 1936 * The first matching object is returned, or NULL if none.
2088 */ 1937 */
2089 1938
2090object * 1939object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 1940present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 1941{
2093 object * 1942 object *
2094 tmp; 1943 tmp;
2095 1944
2096 if (m == NULL || out_of_map (m, x, y)) 1945 if (m == NULL || out_of_map (m, x, y))
… …
2109 * a matching type variable at the given map and coordinates. 1958 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 1959 * The first matching object is returned, or NULL if none.
2111 */ 1960 */
2112 1961
2113object * 1962object *
2114present (unsigned char type, mapstruct *m, int x, int y) 1963present (unsigned char type, maptile *m, int x, int y)
2115{ 1964{
2116 object * 1965 object *
2117 tmp; 1966 tmp;
2118 1967
2119 if (out_of_map (m, x, y)) 1968 if (out_of_map (m, x, y))
… …
2259 * 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
2260 * customized, changed states, etc. 2109 * customized, changed states, etc.
2261 */ 2110 */
2262 2111
2263int 2112int
2264find_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)
2265{ 2114{
2266 int 2115 int
2267 i, 2116 i,
2268 index = 0, flag; 2117 index = 0, flag;
2269 static int 2118 static int
… …
2290 return -1; 2139 return -1;
2291 return altern[RANDOM () % index]; 2140 return altern[RANDOM () % index];
2292} 2141}
2293 2142
2294/* 2143/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2144 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2145 * find_free_spot(), but it will search max number of squares.
2297 * 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.
2298 * 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.
2299 */ 2148 */
2300 2149
2301int 2150int
2302find_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)
2303{ 2152{
2304 int 2153 int
2305 i; 2154 i;
2306 2155
2307 for (i = 0; i < SIZEOFFREE; i++) 2156 for (i = 0; i < SIZEOFFREE; i++)
… …
2371 * 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
2372 * there is capable of. 2221 * there is capable of.
2373 */ 2222 */
2374 2223
2375int 2224int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2225find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2226{
2378 int 2227 int
2379 i, 2228 i,
2380 max = SIZEOFFREE, mflags; 2229 max = SIZEOFFREE, mflags;
2381 2230
2382 sint16 nx, ny; 2231 sint16 nx, ny;
2383 object * 2232 object *
2384 tmp; 2233 tmp;
2385 mapstruct * 2234 maptile *
2386 mp; 2235 mp;
2387 2236
2388 MoveType blocked, move_type; 2237 MoveType blocked, move_type;
2389 2238
2390 if (exclude && exclude->head) 2239 if (exclude && exclude->head)
… …
2598 * Modified to be map tile aware -.MSW 2447 * Modified to be map tile aware -.MSW
2599 */ 2448 */
2600 2449
2601 2450
2602int 2451int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2452can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2453{
2605 sint16 dx, dy; 2454 sint16 dx, dy;
2606 int 2455 int
2607 mflags; 2456 mflags;
2608 2457
… …
2657 * create clone from object to another 2506 * create clone from object to another
2658 */ 2507 */
2659object * 2508object *
2660object_create_clone (object *asrc) 2509object_create_clone (object *asrc)
2661{ 2510{
2662 object *
2663 dst = NULL, *tmp, *src, *part, *prev, *item; 2511 object *dst = 0, *tmp, *src, *part, *prev, *item;
2664 2512
2665 if (!asrc) 2513 if (!asrc)
2666 return NULL; 2514 return 0;
2515
2667 src = asrc; 2516 src = asrc;
2668 if (src->head) 2517 if (src->head)
2669 src = src->head; 2518 src = src->head;
2670 2519
2671 prev = NULL; 2520 prev = 0;
2672 for (part = src; part; part = part->more) 2521 for (part = src; part; part = part->more)
2673 { 2522 {
2674 tmp = get_object (); 2523 tmp = object::create ();
2675 copy_object (part, tmp); 2524 part->copy_to (tmp);
2676 tmp->x -= src->x; 2525 tmp->x -= src->x;
2677 tmp->y -= src->y; 2526 tmp->y -= src->y;
2527
2678 if (!part->head) 2528 if (!part->head)
2679 { 2529 {
2680 dst = tmp; 2530 dst = tmp;
2681 tmp->head = NULL; 2531 tmp->head = 0;
2682 } 2532 }
2683 else 2533 else
2684 { 2534 {
2685 tmp->head = dst; 2535 tmp->head = dst;
2686 } 2536 }
2537
2687 tmp->more = NULL; 2538 tmp->more = 0;
2539
2688 if (prev) 2540 if (prev)
2689 prev->more = tmp; 2541 prev->more = tmp;
2542
2690 prev = tmp; 2543 prev = tmp;
2691 } 2544 }
2692 2545
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2546 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2547 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2548
2699 return dst; 2549 return dst;
2700} 2550}
2701 2551
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. */ 2552/* 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 */ 2553/* 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, */ 2554/* 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. */ 2555/* 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. */ 2556/* Remember not to use load_object_str in a time-critical situation. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2557/* Also remember that multiparts objects are not supported for now. */
2722 2558
2723object * 2559object *
2724load_object_str (const char *obstr) 2560load_object_str (const char *obstr)
2725{ 2561{
2726 object * 2562 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2563 char filename[MAX_BUF];
2730 2564
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2565 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2566
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2567 FILE *tempfile = fopen (filename, "w");
2735 2568
2736 if (tempfile == NULL) 2569 if (tempfile == NULL)
2737 { 2570 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2571 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2572 return NULL;
2740 }; 2573 }
2574
2741 fprintf (tempfile, obstr); 2575 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2576 fclose (tempfile);
2743 2577
2744 op = get_object (); 2578 op = object::create ();
2745 2579
2746 object_thawer thawer (filename); 2580 object_thawer thawer (filename);
2747 2581
2748 if (thawer) 2582 if (thawer)
2749 load_object (thawer, op, 0); 2583 load_object (thawer, op, 0);
… …
2759 * returns NULL if no match. 2593 * returns NULL if no match.
2760 */ 2594 */
2761object * 2595object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2596find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2597{
2764 object * 2598 object *tmp;
2765 tmp;
2766 2599
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2600 for (tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2601 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2602 return tmp;
2770 2603
… …
2778 * do the desired thing. 2611 * do the desired thing.
2779 */ 2612 */
2780key_value * 2613key_value *
2781get_ob_key_link (const object *ob, const char *key) 2614get_ob_key_link (const object *ob, const char *key)
2782{ 2615{
2783 key_value * 2616 key_value *link;
2784 link;
2785 2617
2786 for (link = ob->key_values; link != NULL; link = link->next) 2618 for (link = ob->key_values; link != NULL; link = link->next)
2787 {
2788 if (link->key == key) 2619 if (link->key == key)
2789 {
2790 return link; 2620 return link;
2791 }
2792 }
2793 2621
2794 return NULL; 2622 return NULL;
2795} 2623}
2796 2624
2797/* 2625/*

Diff Legend

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