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.42 by root, Thu Sep 14 01:19:47 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;
828object::vector object::objects; // not yet used
829object *object::first;
923 830
924void object::free_mortals () 831void object::free_mortals ()
925{ 832{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 833 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 834 if ((*i)->refcnt)
928 ++i; // further delay freeing 835 ++i; // further delay freeing
929 else 836 else
930 { 837 {
931 delete *i; 838 delete *i;
932 mortals.erase (i); 839 mortals.erase (i);
933 } 840 }
934
935 static int lastmortals = 0;//D
936
937 if (mortals.size() != lastmortals)//D
938 {
939 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 }
942} 841}
943 842
944object::object () 843object::object ()
945{ 844{
946 SET_FLAG (this, FLAG_REMOVED); 845 SET_FLAG (this, FLAG_REMOVED);
947 846
948 expmul = 1.0; 847 expmul = 1.0;
949 face = blank_face; 848 face = blank_face;
950 attacked_by_count = -1;
951} 849}
952 850
953object::~object () 851object::~object ()
954{ 852{
955 free_key_values (this); 853 free_key_values (this);
… …
959{ 857{
960 count = ++ob_count; 858 count = ++ob_count;
961 uuid = gen_uuid (); 859 uuid = gen_uuid ();
962 860
963 prev = 0; 861 prev = 0;
964 next = objects; 862 next = object::first;
965 863
966 if (objects) 864 if (object::first)
967 objects->prev = this; 865 object::first->prev = this;
968 866
969 objects = this; 867 object::first = this;
970} 868}
971 869
972void object::unlink () 870void object::unlink ()
973{ 871{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 872 if (this == object::first)
978 objects = next; 873 object::first = next;
979 874
980 /* Remove this object from the list of used objects */ 875 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 876 if (prev) prev->next = next;
982 if (next) next->prev = prev; 877 if (next) next->prev = prev;
983 878
… …
997 * 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
998 * free objects. The IS_FREED() flag is set in the object. 893 * free objects. The IS_FREED() flag is set in the object.
999 * The object must have been removed by remove_ob() first for 894 * The object must have been removed by remove_ob() first for
1000 * this function to succeed. 895 * this function to succeed.
1001 * 896 *
1002 * 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
1003 * inventory to the ground. 898 * inventory to the ground.
1004 */ 899 */
1005void object::free (bool free_inventory) 900void object::destroy (bool destroy_inventory)
1006{ 901{
1007 if (QUERY_FLAG (this, FLAG_FREED)) 902 if (QUERY_FLAG (this, FLAG_FREED))
1008 return; 903 return;
1009 904
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 905 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011 remove_friendly_object (this); 906 remove_friendly_object (this);
1012 907
1013 if (!QUERY_FLAG (this, FLAG_REMOVED)) 908 if (!QUERY_FLAG (this, FLAG_REMOVED))
1014 remove_ob (this); 909 remove ();
1015 910
1016 SET_FLAG (this, FLAG_FREED); 911 SET_FLAG (this, FLAG_FREED);
1017 912
1018 if (more) 913 if (more)
1019 { 914 {
1020 more->free (free_inventory); 915 more->destroy (destroy_inventory);
1021 more = 0; 916 more = 0;
1022 } 917 }
1023 918
1024 if (inv) 919 if (inv)
1025 { 920 {
1026 /* Only if the space blocks everything do we not process - 921 /* Only if the space blocks everything do we not process -
1027 * if some form of movement is allowed, let objects 922 * if some form of movement is allowed, let objects
1028 * drop on that space. 923 * drop on that space.
1029 */ 924 */
1030 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)
1031 { 926 {
1032 object *op = inv; 927 object *op = inv;
1033 928
1034 while (op) 929 while (op)
1035 { 930 {
1036 object *tmp = op->below; 931 object *tmp = op->below;
1037 op->free (free_inventory); 932 op->destroy (destroy_inventory);
1038 op = tmp; 933 op = tmp;
1039 } 934 }
1040 } 935 }
1041 else 936 else
1042 { /* Put objects in inventory onto this space */ 937 { /* Put objects in inventory onto this space */
… …
1044 939
1045 while (op) 940 while (op)
1046 { 941 {
1047 object *tmp = op->below; 942 object *tmp = op->below;
1048 943
1049 remove_ob (op); 944 op->remove ();
1050 945
1051 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 946 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1052 || 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))
1053 free_object (op); 948 op->destroy ();
1054 else 949 else
1055 { 950 {
1056 op->x = x; 951 op->x = x;
1057 op->y = y; 952 op->y = y;
1058 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 */
… …
1061 op = tmp; 956 op = tmp;
1062 } 957 }
1063 } 958 }
1064 } 959 }
1065 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
1066 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;
1067 988
1068 /* Remove object from the active list */ 989 /* Remove object from the active list */
1069 speed = 0; 990 speed = 0;
1070 update_ob_speed (this); 991 update_ob_speed (this);
1071 992
… …
1076 997
1077/* 998/*
1078 * sub_weight() recursively (outwards) subtracts a number from the 999 * sub_weight() recursively (outwards) subtracts a number from the
1079 * 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)).
1080 */ 1001 */
1081
1082void 1002void
1083sub_weight (object *op, signed long weight) 1003sub_weight (object *op, signed long weight)
1084{ 1004{
1085 while (op != NULL) 1005 while (op != NULL)
1086 { 1006 {
1087 if (op->type == CONTAINER) 1007 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1008 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1009
1091 op->carrying -= weight; 1010 op->carrying -= weight;
1092 op = op->env; 1011 op = op->env;
1093 } 1012 }
1094} 1013}
1095 1014
1096/* remove_ob(op): 1015/* op->remove ():
1097 * 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
1098 * 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
1099 * object will have no environment. If the object previously had an 1018 * object will have no environment. If the object previously had an
1100 * environment, the x and y coordinates will be updated to 1019 * environment, the x and y coordinates will be updated to
1101 * the previous environment. 1020 * the previous environment.
1102 * Beware: This function is called from the editor as well! 1021 * Beware: This function is called from the editor as well!
1103 */ 1022 */
1104
1105void 1023void
1106remove_ob (object *op) 1024object::remove ()
1107{ 1025{
1026 object *tmp, *last = 0;
1108 object * 1027 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1028
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1029 int check_walk_off;
1118 mapstruct *
1119 m;
1120 1030
1121 sint16
1122 x,
1123 y;
1124
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1031 if (QUERY_FLAG (this, FLAG_REMOVED))
1126 return; 1032 return;
1127 1033
1128 SET_FLAG (op, FLAG_REMOVED); 1034 SET_FLAG (this, FLAG_REMOVED);
1129 1035
1130 if (op->more != NULL) 1036 if (more)
1131 remove_ob (op->more); 1037 more->remove ();
1132 1038
1133 /* 1039 /*
1134 * In this case, the object to be removed is in someones 1040 * In this case, the object to be removed is in someones
1135 * inventory. 1041 * inventory.
1136 */ 1042 */
1137 if (op->env != NULL) 1043 if (env)
1138 { 1044 {
1139 if (op->nrof) 1045 if (nrof)
1140 sub_weight (op->env, op->weight * op->nrof); 1046 sub_weight (env, weight * nrof);
1141 else 1047 else
1142 sub_weight (op->env, op->weight + op->carrying); 1048 sub_weight (env, weight + carrying);
1143 1049
1144 /* 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
1145 * made to players inventory. If set, avoiding the call 1051 * made to players inventory. If set, avoiding the call
1146 * to save cpu time. 1052 * to save cpu time.
1147 */ 1053 */
1148 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))
1149 fix_player (otmp); 1055 fix_player (otmp);
1150 1056
1151 if (op->above != NULL) 1057 if (above != NULL)
1152 op->above->below = op->below; 1058 above->below = below;
1153 else 1059 else
1154 op->env->inv = op->below; 1060 env->inv = below;
1155 1061
1156 if (op->below != NULL) 1062 if (below != NULL)
1157 op->below->above = op->above; 1063 below->above = above;
1158 1064
1159 /* we set up values so that it could be inserted into 1065 /* we set up values so that it could be inserted into
1160 * 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
1161 * to the caller to decide what we want to do. 1067 * to the caller to decide what we want to do.
1162 */ 1068 */
1163 op->x = op->env->x, op->y = op->env->y; 1069 x = env->x, y = env->y;
1164 op->map = op->env->map; 1070 map = env->map;
1165 op->above = NULL, op->below = NULL; 1071 above = 0, below = 0;
1166 op->env = NULL; 1072 env = 0;
1167 } 1073 }
1168 else if (op->map) 1074 else if (map)
1169 { 1075 {
1170 x = op->x;
1171 y = op->y;
1172 m = get_map_from_coord (op->map, &x, &y);
1173
1174 if (!m)
1175 {
1176 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177 op->map->path, op->x, op->y);
1178 /* in old days, we used to set x and y to 0 and continue.
1179 * it seems if we get into this case, something is probablye
1180 * screwed up and should be fixed.
1181 */
1182 abort ();
1183 }
1184
1185 if (op->map != m)
1186 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187 op->map->path, m->path, op->x, op->y, x, y);
1188
1189 /* 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
1190 * lots of logic for things we no longer care about 1077 * lots of logic for things we no longer care about
1191 */ 1078 */
1192 1079
1193 /* link the object above us */ 1080 /* link the object above us */
1194 if (op->above) 1081 if (above)
1195 op->above->below = op->below; 1082 above->below = below;
1196 else 1083 else
1197 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 */
1198 1085
1199 /* Relink the object below us, if there is one */ 1086 /* Relink the object below us, if there is one */
1200 if (op->below) 1087 if (below)
1201 op->below->above = op->above; 1088 below->above = above;
1202 else 1089 else
1203 { 1090 {
1204 /* 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
1205 * use translated coordinates in case some oddness with map tiling is 1092 * use translated coordinates in case some oddness with map tiling is
1206 * evident 1093 * evident
1207 */ 1094 */
1208 if (GET_MAP_OB (m, x, y) != op) 1095 if (GET_MAP_OB (map, x, y) != this)
1209 { 1096 {
1210 dump_object (op); 1097 char *dump = dump_object (this);
1211 LOG (llevError, 1098 LOG (llevError,
1212 "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);
1213 dump_object (GET_MAP_OB (m, x, y)); 1101 dump = dump_object (GET_MAP_OB (map, x, y));
1214 LOG (llevError, "%s\n", errmsg); 1102 LOG (llevError, "%s\n", dump);
1103 free (dump);
1215 } 1104 }
1216 1105
1217 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1106 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1218 } 1107 }
1219 1108
1220 op->above = 0; 1109 above = 0;
1221 op->below = 0; 1110 below = 0;
1222 1111
1223 if (op->map->in_memory == MAP_SAVING) 1112 if (map->in_memory == MAP_SAVING)
1224 return; 1113 return;
1225 1114
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1115 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228 1116
1229 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)
1230 { 1118 {
1231 /* 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
1232 * being removed. 1120 * being removed.
1233 */ 1121 */
1234 1122
1235 if (tmp->type == PLAYER && tmp != op) 1123 if (tmp->type == PLAYER && tmp != this)
1236 { 1124 {
1237 /* If a container that the player is currently using somehow gets 1125 /* If a container that the player is currently using somehow gets
1238 * removed (most likely destroyed), update the player view 1126 * removed (most likely destroyed), update the player view
1239 * appropriately. 1127 * appropriately.
1240 */ 1128 */
1241 if (tmp->container == op) 1129 if (tmp->container == this)
1242 { 1130 {
1243 CLEAR_FLAG (op, FLAG_APPLIED); 1131 CLEAR_FLAG (this, FLAG_APPLIED);
1244 tmp->container = NULL; 1132 tmp->container = 0;
1245 } 1133 }
1246 1134
1247 tmp->contr->socket.update_look = 1; 1135 tmp->contr->socket.update_look = 1;
1248 } 1136 }
1249 1137
1250 /* See if player moving off should effect something */ 1138 /* See if player moving off should effect something */
1251 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))
1252 { 1142 {
1253 move_apply (tmp, op, NULL); 1143 move_apply (tmp, this, 0);
1254 1144
1255 if (was_destroyed (op, tag)) 1145 if (destroyed ())
1256 {
1257 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 ());
1258 }
1259 } 1147 }
1260 1148
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1149 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1150
1263 if (tmp->above == tmp) 1151 if (tmp->above == tmp)
1264 tmp->above = NULL; 1152 tmp->above = 0;
1265 1153
1266 last = tmp; 1154 last = tmp;
1267 } 1155 }
1268 1156
1269 /* last == NULL of there are no objects on this space */ 1157 /* last == NULL of there are no objects on this space */
1270 if (last == NULL) 1158 if (!last)
1271 { 1159 {
1272 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1160 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273 * 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
1274 * 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
1275 * be correct anyways. 1163 * be correct anyways.
1276 */ 1164 */
1277 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1165 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1278 update_position (op->map, op->x, op->y); 1166 update_position (map, x, y);
1279 } 1167 }
1280 else 1168 else
1281 update_object (last, UP_OBJ_REMOVE); 1169 update_object (last, UP_OBJ_REMOVE);
1282 1170
1283 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1171 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284 update_all_los (op->map, op->x, op->y); 1172 update_all_los (map, x, y);
1285 } 1173 }
1286} 1174}
1287 1175
1288/* 1176/*
1289 * merge_ob(op,top): 1177 * merge_ob(op,top):
… …
1310 { 1198 {
1311 top->nrof += op->nrof; 1199 top->nrof += op->nrof;
1312 1200
1313/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1201/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1314 op->weight = 0; /* Don't want any adjustements now */ 1202 op->weight = 0; /* Don't want any adjustements now */
1315 remove_ob (op); 1203 op->destroy ();
1316 free_object (op);
1317 return top; 1204 return top;
1318 } 1205 }
1319 } 1206 }
1320 1207
1321 return NULL; 1208 return 0;
1322} 1209}
1323 1210
1324/* 1211/*
1325 * 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
1326 * job preparing multi-part monsters 1213 * job preparing multi-part monsters
1327 */ 1214 */
1328object * 1215object *
1329insert_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)
1330{ 1217{
1331 object *tmp; 1218 object *tmp;
1332 1219
1333 if (op->head) 1220 if (op->head)
1334 op = op->head; 1221 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1249 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1250 * just 'op' otherwise
1364 */ 1251 */
1365 1252
1366object * 1253object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1254insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1255{
1369 object *tmp, *top, *floor = NULL; 1256 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1257 sint16 x, y;
1371 1258
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1259 if (QUERY_FLAG (op, FLAG_FREED))
… …
1375 return NULL; 1262 return NULL;
1376 } 1263 }
1377 1264
1378 if (m == NULL) 1265 if (m == NULL)
1379 { 1266 {
1380 dump_object (op); 1267 char *dump = dump_object (op);
1381 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);
1382 return op; 1270 return op;
1383 } 1271 }
1384 1272
1385 if (out_of_map (m, op->x, op->y)) 1273 if (out_of_map (m, op->x, op->y))
1386 { 1274 {
1387 dump_object (op); 1275 char *dump = dump_object (op);
1388 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);
1389#ifdef MANY_CORES 1277#ifdef MANY_CORES
1390 /* 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
1391 * 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
1392 * improperly inserted. 1280 * improperly inserted.
1393 */ 1281 */
1394 abort (); 1282 abort ();
1395#endif 1283#endif
1284 free (dump);
1396 return op; 1285 return op;
1397 } 1286 }
1398 1287
1399 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1288 if (!QUERY_FLAG (op, FLAG_REMOVED))
1400 { 1289 {
1401 dump_object (op); 1290 char *dump = dump_object (op);
1402 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);
1403 return op; 1293 return op;
1404 } 1294 }
1405 1295
1406 if (op->more != NULL) 1296 if (op->more != NULL)
1407 { 1297 {
… …
1448 if (op->nrof && !(flag & INS_NO_MERGE)) 1338 if (op->nrof && !(flag & INS_NO_MERGE))
1449 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)
1450 if (CAN_MERGE (op, tmp)) 1340 if (CAN_MERGE (op, tmp))
1451 { 1341 {
1452 op->nrof += tmp->nrof; 1342 op->nrof += tmp->nrof;
1453 remove_ob (tmp); 1343 tmp->destroy ();
1454 free_object (tmp);
1455 } 1344 }
1456 1345
1457 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 */
1458 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1347 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1459 1348
… …
1645 tmp1; 1534 tmp1;
1646 1535
1647 /* first search for itself and remove any old instances */ 1536 /* first search for itself and remove any old instances */
1648 1537
1649 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)
1650 {
1651 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1539 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1652 { 1540 tmp->destroy ();
1653 remove_ob (tmp);
1654 free_object (tmp);
1655 }
1656 }
1657 1541
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1542 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1543
1660 tmp1->x = op->x; 1544 tmp1->x = op->x;
1661 tmp1->y = op->y; 1545 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1546 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1547}
… …
1671 */ 1555 */
1672 1556
1673object * 1557object *
1674get_split_ob (object *orig_ob, uint32 nr) 1558get_split_ob (object *orig_ob, uint32 nr)
1675{ 1559{
1676 object * 1560 object *newob;
1677 newob;
1678 int
1679 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1561 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1680 1562
1681 if (orig_ob->nrof < nr) 1563 if (orig_ob->nrof < nr)
1682 { 1564 {
1683 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);
1684 return NULL; 1566 return NULL;
1685 } 1567 }
1686 1568
1687 newob = object_create_clone (orig_ob); 1569 newob = object_create_clone (orig_ob);
1688 1570
1689 if ((orig_ob->nrof -= nr) < 1) 1571 if ((orig_ob->nrof -= nr) < 1)
1690 { 1572 orig_ob->destroy (1);
1691 if (!is_removed)
1692 remove_ob (orig_ob);
1693 free_object2 (orig_ob, 1);
1694 }
1695 else if (!is_removed) 1573 else if (!is_removed)
1696 { 1574 {
1697 if (orig_ob->env != NULL) 1575 if (orig_ob->env != NULL)
1698 sub_weight (orig_ob->env, orig_ob->weight * nr); 1576 sub_weight (orig_ob->env, orig_ob->weight * nr);
1699 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)
… …
1763 esrv_send_item (tmp, op); 1641 esrv_send_item (tmp, op);
1764 } 1642 }
1765 } 1643 }
1766 else 1644 else
1767 { 1645 {
1768 remove_ob (op); 1646 op->remove ();
1769 op->nrof = 0; 1647 op->nrof = 0;
1770 if (tmp) 1648 if (tmp)
1771 { 1649 {
1772 esrv_del_item (tmp->contr, op->count); 1650 esrv_del_item (tmp->contr, op->count);
1773 } 1651 }
… …
1779 1657
1780 if (i < op->nrof) 1658 if (i < op->nrof)
1781 op->nrof -= i; 1659 op->nrof -= i;
1782 else 1660 else
1783 { 1661 {
1784 remove_ob (op); 1662 op->remove ();
1785 op->nrof = 0; 1663 op->nrof = 0;
1786 } 1664 }
1787 1665
1788 /* Since we just removed op, op->above is null */ 1666 /* Since we just removed op, op->above is null */
1789 for (tmp = above; tmp != NULL; tmp = tmp->above) 1667 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1798 1676
1799 if (op->nrof) 1677 if (op->nrof)
1800 return op; 1678 return op;
1801 else 1679 else
1802 { 1680 {
1803 free_object (op); 1681 op->destroy ();
1804 return NULL; 1682 return NULL;
1805 } 1683 }
1806} 1684}
1807 1685
1808/* 1686/*
… …
1821 op->carrying += weight; 1699 op->carrying += weight;
1822 op = op->env; 1700 op = op->env;
1823 } 1701 }
1824} 1702}
1825 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
1826/* 1724/*
1827 * insert_ob_in_ob(op,environment): 1725 * env->insert (op)
1828 * This function inserts the object op in the linked list 1726 * This function inserts the object op in the linked list
1829 * inside the object environment. 1727 * inside the object environment.
1830 * 1728 *
1831 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832 * the inventory at the last position or next to other objects of the same
1833 * type.
1834 * Frank: Now sorted by type, archetype and magic!
1835 *
1836 * 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
1837 * be != op, if items are merged. -Tero 1730 * be != op, if items are merged. -Tero
1838 */ 1731 */
1839 1732
1840object * 1733object *
1841insert_ob_in_ob (object *op, object *where) 1734object::insert (object *op)
1842{ 1735{
1843 object * 1736 object *tmp, *otmp;
1844 tmp, *
1845 otmp;
1846 1737
1847 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1738 if (!QUERY_FLAG (op, FLAG_REMOVED))
1848 { 1739 op->remove ();
1849 dump_object (op);
1850 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851 return op;
1852 }
1853
1854 if (where == NULL)
1855 {
1856 dump_object (op);
1857 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858 return op;
1859 }
1860
1861 if (where->head)
1862 {
1863 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864 where = where->head;
1865 }
1866 1740
1867 if (op->more) 1741 if (op->more)
1868 { 1742 {
1869 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);
1870 return op; 1744 return op;
… …
1872 1746
1873 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1747 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874 CLEAR_FLAG (op, FLAG_REMOVED); 1748 CLEAR_FLAG (op, FLAG_REMOVED);
1875 if (op->nrof) 1749 if (op->nrof)
1876 { 1750 {
1877 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1751 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878 if (CAN_MERGE (tmp, op)) 1752 if (CAN_MERGE (tmp, op))
1879 { 1753 {
1880 /* return the original object and remove inserted object 1754 /* return the original object and remove inserted object
1881 (client needs the original object) */ 1755 (client needs the original object) */
1882 tmp->nrof += op->nrof; 1756 tmp->nrof += op->nrof;
1883 /* Weight handling gets pretty funky. Since we are adding to 1757 /* Weight handling gets pretty funky. Since we are adding to
1884 * tmp->nrof, we need to increase the weight. 1758 * tmp->nrof, we need to increase the weight.
1885 */ 1759 */
1886 add_weight (where, op->weight * op->nrof); 1760 add_weight (this, op->weight * op->nrof);
1887 SET_FLAG (op, FLAG_REMOVED); 1761 SET_FLAG (op, FLAG_REMOVED);
1888 free_object (op); /* free the inserted object */ 1762 op->destroy (); /* free the inserted object */
1889 op = tmp; 1763 op = tmp;
1890 remove_ob (op); /* and fix old object's links */ 1764 op->remove (); /* and fix old object's links */
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1765 CLEAR_FLAG (op, FLAG_REMOVED);
1892 break; 1766 break;
1893 } 1767 }
1894 1768
1895 /* I assume combined objects have no inventory 1769 /* I assume combined objects have no inventory
1896 * We add the weight - this object could have just been removed 1770 * We add the weight - this object could have just been removed
1897 * (if it was possible to merge). calling remove_ob will subtract 1771 * (if it was possible to merge). calling remove_ob will subtract
1898 * 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
1899 * the linking below 1773 * the linking below
1900 */ 1774 */
1901 add_weight (where, op->weight * op->nrof); 1775 add_weight (this, op->weight * op->nrof);
1902 } 1776 }
1903 else 1777 else
1904 add_weight (where, (op->weight + op->carrying)); 1778 add_weight (this, (op->weight + op->carrying));
1905 1779
1906 otmp = is_player_inv (where); 1780 otmp = is_player_inv (this);
1907 if (otmp && otmp->contr != NULL) 1781 if (otmp && otmp->contr)
1908 {
1909 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1782 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910 fix_player (otmp); 1783 fix_player (otmp);
1911 }
1912 1784
1913 op->map = NULL; 1785 op->map = NULL;
1914 op->env = where; 1786 op->env = this;
1915 op->above = NULL; 1787 op->above = NULL;
1916 op->below = NULL; 1788 op->below = NULL;
1917 op->x = 0, op->y = 0; 1789 op->x = 0, op->y = 0;
1918 1790
1919 /* 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 */
1920 if ((op->glow_radius != 0) && where->map) 1792 if ((op->glow_radius != 0) && map)
1921 { 1793 {
1922#ifdef DEBUG_LIGHTS 1794#ifdef DEBUG_LIGHTS
1923 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);
1924#endif /* DEBUG_LIGHTS */ 1796#endif /* DEBUG_LIGHTS */
1925 if (MAP_DARKNESS (where->map)) 1797 if (MAP_DARKNESS (map))
1926 update_all_los (where->map, where->x, where->y); 1798 update_all_los (map, x, y);
1927 } 1799 }
1928 1800
1929 /* 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.
1930 * It sure simplifies this function... 1802 * It sure simplifies this function...
1931 */ 1803 */
1932 if (where->inv == NULL) 1804 if (!inv)
1933 where->inv = op; 1805 inv = op;
1934 else 1806 else
1935 { 1807 {
1936 op->below = where->inv; 1808 op->below = inv;
1937 op->below->above = op; 1809 op->below->above = op;
1938 where->inv = op; 1810 inv = op;
1939 } 1811 }
1812
1940 return op; 1813 return op;
1941} 1814}
1942 1815
1943/* 1816/*
1944 * Checks if any objects has a move_type that matches objects 1817 * Checks if any objects has a move_type that matches objects
… …
1962 */ 1835 */
1963 1836
1964int 1837int
1965check_move_on (object *op, object *originator) 1838check_move_on (object *op, object *originator)
1966{ 1839{
1967 object * 1840 object *tmp;
1968 tmp; 1841 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1842 int x = op->x, y = op->y;
1975 1843
1976 MoveType 1844 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1845
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1846 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1847 return 0;
1983
1984 tag = op->count;
1985 1848
1986 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);
1987 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);
1988 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);
1989 1852
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1913 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((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))
2052 { 1915 {
2053 move_apply (tmp, op, originator); 1916 move_apply (tmp, op, originator);
2054 1917
2055 if (was_destroyed (op, tag)) 1918 if (op->destroyed ())
2056 return 1; 1919 return 1;
2057 1920
2058 /* what the person/creature stepped onto has moved the object 1921 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 1922 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 1923 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 1935 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1936 * The first matching object is returned, or NULL if none.
2074 */ 1937 */
2075 1938
2076object * 1939object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 1940present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 1941{
2079 object * 1942 object *
2080 tmp; 1943 tmp;
2081 1944
2082 if (m == NULL || out_of_map (m, x, y)) 1945 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 1958 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 1959 * The first matching object is returned, or NULL if none.
2097 */ 1960 */
2098 1961
2099object * 1962object *
2100present (unsigned char type, mapstruct *m, int x, int y) 1963present (unsigned char type, maptile *m, int x, int y)
2101{ 1964{
2102 object * 1965 object *
2103 tmp; 1966 tmp;
2104 1967
2105 if (out_of_map (m, x, y)) 1968 if (out_of_map (m, x, y))
… …
2245 * 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
2246 * customized, changed states, etc. 2109 * customized, changed states, etc.
2247 */ 2110 */
2248 2111
2249int 2112int
2250find_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)
2251{ 2114{
2252 int 2115 int
2253 i, 2116 i,
2254 index = 0, flag; 2117 index = 0, flag;
2255 static int 2118 static int
… …
2276 return -1; 2139 return -1;
2277 return altern[RANDOM () % index]; 2140 return altern[RANDOM () % index];
2278} 2141}
2279 2142
2280/* 2143/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2144 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2145 * find_free_spot(), but it will search max number of squares.
2283 * 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.
2284 * 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.
2285 */ 2148 */
2286 2149
2287int 2150int
2288find_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)
2289{ 2152{
2290 int 2153 int
2291 i; 2154 i;
2292 2155
2293 for (i = 0; i < SIZEOFFREE; i++) 2156 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * 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
2358 * there is capable of. 2221 * there is capable of.
2359 */ 2222 */
2360 2223
2361int 2224int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2225find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2226{
2364 int 2227 int
2365 i, 2228 i,
2366 max = SIZEOFFREE, mflags; 2229 max = SIZEOFFREE, mflags;
2367 2230
2368 sint16 nx, ny; 2231 sint16 nx, ny;
2369 object * 2232 object *
2370 tmp; 2233 tmp;
2371 mapstruct * 2234 maptile *
2372 mp; 2235 mp;
2373 2236
2374 MoveType blocked, move_type; 2237 MoveType blocked, move_type;
2375 2238
2376 if (exclude && exclude->head) 2239 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2447 * Modified to be map tile aware -.MSW
2585 */ 2448 */
2586 2449
2587 2450
2588int 2451int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2452can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2453{
2591 sint16 dx, dy; 2454 sint16 dx, dy;
2592 int 2455 int
2593 mflags; 2456 mflags;
2594 2457
… …
2643 * create clone from object to another 2506 * create clone from object to another
2644 */ 2507 */
2645object * 2508object *
2646object_create_clone (object *asrc) 2509object_create_clone (object *asrc)
2647{ 2510{
2648 object *
2649 dst = NULL, *tmp, *src, *part, *prev, *item; 2511 object *dst = 0, *tmp, *src, *part, *prev, *item;
2650 2512
2651 if (!asrc) 2513 if (!asrc)
2652 return NULL; 2514 return 0;
2515
2653 src = asrc; 2516 src = asrc;
2654 if (src->head) 2517 if (src->head)
2655 src = src->head; 2518 src = src->head;
2656 2519
2657 prev = NULL; 2520 prev = 0;
2658 for (part = src; part; part = part->more) 2521 for (part = src; part; part = part->more)
2659 { 2522 {
2660 tmp = get_object (); 2523 tmp = object::create ();
2661 copy_object (part, tmp); 2524 part->copy_to (tmp);
2662 tmp->x -= src->x; 2525 tmp->x -= src->x;
2663 tmp->y -= src->y; 2526 tmp->y -= src->y;
2527
2664 if (!part->head) 2528 if (!part->head)
2665 { 2529 {
2666 dst = tmp; 2530 dst = tmp;
2667 tmp->head = NULL; 2531 tmp->head = 0;
2668 } 2532 }
2669 else 2533 else
2670 { 2534 {
2671 tmp->head = dst; 2535 tmp->head = dst;
2672 } 2536 }
2537
2673 tmp->more = NULL; 2538 tmp->more = 0;
2539
2674 if (prev) 2540 if (prev)
2675 prev->more = tmp; 2541 prev->more = tmp;
2542
2676 prev = tmp; 2543 prev = tmp;
2677 } 2544 }
2678 2545
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2546 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2547 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2548
2685 return dst; 2549 return dst;
2686} 2550}
2687 2551
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2552/* GROS - Creates an object using a string representing its content. */
2698
2699/* 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 */
2700
2701/* 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, */
2702
2703/* 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. */
2704
2705/* 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. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2557/* Also remember that multiparts objects are not supported for now. */
2708 2558
2709object * 2559object *
2710load_object_str (const char *obstr) 2560load_object_str (const char *obstr)
2711{ 2561{
2712 object * 2562 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2563 char filename[MAX_BUF];
2716 2564
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2565 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2566
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2567 FILE *tempfile = fopen (filename, "w");
2721 2568
2722 if (tempfile == NULL) 2569 if (tempfile == NULL)
2723 { 2570 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2571 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2572 return NULL;
2726 } 2573 }
2727 2574
2728 fprintf (tempfile, obstr); 2575 fprintf (tempfile, obstr);
2729 fclose (tempfile); 2576 fclose (tempfile);
2730 2577
2731 op = get_object (); 2578 op = object::create ();
2732 2579
2733 object_thawer thawer (filename); 2580 object_thawer thawer (filename);
2734 2581
2735 if (thawer) 2582 if (thawer)
2736 load_object (thawer, op, 0); 2583 load_object (thawer, op, 0);
… …
2746 * returns NULL if no match. 2593 * returns NULL if no match.
2747 */ 2594 */
2748object * 2595object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2596find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2597{
2751 object * 2598 object *tmp;
2752 tmp;
2753 2599
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2600 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2601 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2602 return tmp;
2757 2603
… …
2765 * do the desired thing. 2611 * do the desired thing.
2766 */ 2612 */
2767key_value * 2613key_value *
2768get_ob_key_link (const object *ob, const char *key) 2614get_ob_key_link (const object *ob, const char *key)
2769{ 2615{
2770 key_value * 2616 key_value *link;
2771 link;
2772 2617
2773 for (link = ob->key_values; link != NULL; link = link->next) 2618 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2619 if (link->key == key)
2776 {
2777 return link; 2620 return link;
2778 }
2779 }
2780 2621
2781 return NULL; 2622 return NULL;
2782} 2623}
2783 2624
2784/* 2625/*

Diff Legend

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