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.44 by root, Thu Sep 14 17:29:27 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}
… …
596 526
597 if (settings.casting_time) 527 if (settings.casting_time)
598 casting_time = -1; 528 casting_time = -1;
599} 529}
600 530
601void object::clone (object *destination)
602{
603 *(object_copy *)destination = *this;
604 *(object_pod *)destination = *this;
605
606 if (self || cb)
607 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
608}
609
610/* 531/*
611 * copy object first frees everything allocated by the second object, 532 * copy_to first frees everything allocated by the dst object,
612 * and then copies the contends of the first object into the second 533 * and then copies the contents of itself into the second
613 * object, allocating what needs to be allocated. Basically, any 534 * object, allocating what needs to be allocated. Basically, any
614 * 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,
615 * 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
616 * will point at garbage. 537 * will point at garbage.
617 */ 538 */
618void 539void
619copy_object (object *op2, object *op) 540object::copy_to (object *dst)
620{ 541{
621 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 542 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
622 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 543 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
623 544
624 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));
625 550
626 if (is_freed) 551 if (is_freed)
627 SET_FLAG (op, FLAG_FREED); 552 SET_FLAG (dst, FLAG_FREED);
553
628 if (is_removed) 554 if (is_removed)
629 SET_FLAG (op, FLAG_REMOVED); 555 SET_FLAG (dst, FLAG_REMOVED);
630 556
631 if (op2->speed < 0) 557 if (speed < 0)
632 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 558 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
633 559
634 /* Copy over key_values, if any. */ 560 /* Copy over key_values, if any. */
635 if (op2->key_values) 561 if (key_values)
636 { 562 {
637 key_value *tail = 0; 563 key_value *tail = 0;
638 key_value *i; 564 key_value *i;
639 565
640 op->key_values = 0; 566 dst->key_values = 0;
641 567
642 for (i = op2->key_values; i; i = i->next) 568 for (i = key_values; i; i = i->next)
643 { 569 {
644 key_value *new_link = new key_value; 570 key_value *new_link = new key_value;
645 571
646 new_link->next = 0; 572 new_link->next = 0;
647 new_link->key = i->key; 573 new_link->key = i->key;
648 new_link->value = i->value; 574 new_link->value = i->value;
649 575
650 /* Try and be clever here, too. */ 576 /* Try and be clever here, too. */
651 if (!op->key_values) 577 if (!dst->key_values)
652 { 578 {
653 op->key_values = new_link; 579 dst->key_values = new_link;
654 tail = new_link; 580 tail = new_link;
655 } 581 }
656 else 582 else
657 { 583 {
658 tail->next = new_link; 584 tail->next = new_link;
659 tail = new_link; 585 tail = new_link;
660 } 586 }
661 } 587 }
662 } 588 }
663 589
664 update_ob_speed (op); 590 update_ob_speed (dst);
665} 591}
666 592
667/* 593/*
668 * 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
669 * 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
… …
874 update_now = 1; 800 update_now = 1;
875 801
876 if ((move_slow | op->move_slow) != move_slow) 802 if ((move_slow | op->move_slow) != move_slow)
877 update_now = 1; 803 update_now = 1;
878 } 804 }
805
879 /* if the object is being removed, we can't make intelligent 806 /* if the object is being removed, we can't make intelligent
880 * decisions, because remove_ob can't really pass the object 807 * decisions, because remove_ob can't really pass the object
881 * that is being removed. 808 * that is being removed.
882 */ 809 */
883 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 810 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
895 822
896 if (op->more != NULL) 823 if (op->more != NULL)
897 update_object (op->more, action); 824 update_object (op->more, action);
898} 825}
899 826
900static unordered_vector<object *> mortals; 827object::vector object::mortals;
828object::vector object::objects; // not yet used
829object *object::first;
901 830
902void object::free_mortals () 831void object::free_mortals ()
903{ 832{
904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 833 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905 if ((*i)->refcnt) 834 if ((*i)->refcnt)
906 ++i; // further delay freeing 835 ++i; // further delay freeing
907 else 836 else
908 { 837 {
909 delete *i; 838 delete *i;
910 mortals.erase (i); 839 mortals.erase (i);
911 } 840 }
912
913 static int lastmortals = 0;//D
914
915 if (mortals.size() != lastmortals)//D
916 {
917 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 }
920} 841}
921 842
922object::object () 843object::object ()
923{ 844{
924 SET_FLAG (this, FLAG_REMOVED); 845 SET_FLAG (this, FLAG_REMOVED);
… …
936{ 857{
937 count = ++ob_count; 858 count = ++ob_count;
938 uuid = gen_uuid (); 859 uuid = gen_uuid ();
939 860
940 prev = 0; 861 prev = 0;
941 next = objects; 862 next = object::first;
942 863
943 if (objects) 864 if (object::first)
944 objects->prev = this; 865 object::first->prev = this;
945 866
946 objects = this; 867 object::first = this;
947} 868}
948 869
949void object::unlink () 870void object::unlink ()
950{ 871{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == objects) 872 if (this == object::first)
955 objects = next; 873 object::first = next;
956 874
957 /* Remove this object from the list of used objects */ 875 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 876 if (prev) prev->next = next;
959 if (next) next->prev = prev; 877 if (next) next->prev = prev;
960 878
… …
974 * 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
975 * free objects. The IS_FREED() flag is set in the object. 893 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 894 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 895 * this function to succeed.
978 * 896 *
979 * 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
980 * inventory to the ground. 898 * inventory to the ground.
981 */ 899 */
982void object::free (bool free_inventory) 900void object::destroy (bool destroy_inventory)
983{ 901{
984 if (QUERY_FLAG (this, FLAG_FREED)) 902 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 903 return;
986 904
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 905 if (QUERY_FLAG (this, FLAG_FRIENDLY))
988 remove_friendly_object (this); 906 remove_friendly_object (this);
989 907
990 if (!QUERY_FLAG (this, FLAG_REMOVED)) 908 if (!QUERY_FLAG (this, FLAG_REMOVED))
991 remove_ob (this); 909 remove ();
992 910
993 SET_FLAG (this, FLAG_FREED); 911 SET_FLAG (this, FLAG_FREED);
994 912
995 if (more) 913 if (more)
996 { 914 {
997 more->free (free_inventory); 915 more->destroy (destroy_inventory);
998 more = 0; 916 more = 0;
999 } 917 }
1000 918
1001 if (inv) 919 if (inv)
1002 { 920 {
1003 /* Only if the space blocks everything do we not process - 921 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 922 * if some form of movement is allowed, let objects
1005 * drop on that space. 923 * drop on that space.
1006 */ 924 */
1007 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)
1008 { 926 {
1009 object *op = inv; 927 object *op = inv;
1010 928
1011 while (op) 929 while (op)
1012 { 930 {
1013 object *tmp = op->below; 931 object *tmp = op->below;
1014 op->free (free_inventory); 932 op->destroy (destroy_inventory);
1015 op = tmp; 933 op = tmp;
1016 } 934 }
1017 } 935 }
1018 else 936 else
1019 { /* Put objects in inventory onto this space */ 937 { /* Put objects in inventory onto this space */
… …
1021 939
1022 while (op) 940 while (op)
1023 { 941 {
1024 object *tmp = op->below; 942 object *tmp = op->below;
1025 943
1026 remove_ob (op); 944 op->remove ();
1027 945
1028 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 946 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1029 || 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))
1030 free_object (op); 948 op->destroy ();
1031 else 949 else
1032 { 950 {
1033 op->x = x; 951 op->x = x;
1034 op->y = y; 952 op->y = y;
1035 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 */
… …
1038 op = tmp; 956 op = tmp;
1039 } 957 }
1040 } 958 }
1041 } 959 }
1042 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
1043 // clear those pointers that likely might have circular references to us 981 // clear those pointers that likely might have circular references to us
1044 owner = 0; 982 owner = 0;
1045 enemy = 0; 983 enemy = 0;
1046 attacked_by = 0; 984 attacked_by = 0;
1047 985
986 // only relevant for players(?), but make sure of it anyways
987 contr = 0;
988
1048 /* Remove object from the active list */ 989 /* Remove object from the active list */
1049 speed = 0; 990 speed = 0;
1050 update_ob_speed (this); 991 update_ob_speed (this);
1051 992
1052 unlink (); 993 unlink ();
… …
1056 997
1057/* 998/*
1058 * sub_weight() recursively (outwards) subtracts a number from the 999 * sub_weight() recursively (outwards) subtracts a number from the
1059 * 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)).
1060 */ 1001 */
1061
1062void 1002void
1063sub_weight (object *op, signed long weight) 1003sub_weight (object *op, signed long weight)
1064{ 1004{
1065 while (op != NULL) 1005 while (op != NULL)
1066 { 1006 {
1067 if (op->type == CONTAINER) 1007 if (op->type == CONTAINER)
1068 {
1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1008 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070 } 1009
1071 op->carrying -= weight; 1010 op->carrying -= weight;
1072 op = op->env; 1011 op = op->env;
1073 } 1012 }
1074} 1013}
1075 1014
1076/* remove_ob(op): 1015/* op->remove ():
1077 * 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
1078 * 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
1079 * object will have no environment. If the object previously had an 1018 * object will have no environment. If the object previously had an
1080 * environment, the x and y coordinates will be updated to 1019 * environment, the x and y coordinates will be updated to
1081 * the previous environment. 1020 * the previous environment.
1082 * Beware: This function is called from the editor as well! 1021 * Beware: This function is called from the editor as well!
1083 */ 1022 */
1084
1085void 1023void
1086remove_ob (object *op) 1024object::remove ()
1087{ 1025{
1026 object *tmp, *last = 0;
1088 object * 1027 object *otmp;
1089 tmp, *
1090 last = NULL;
1091 object *
1092 otmp;
1093 1028
1094 tag_t
1095 tag;
1096 int
1097 check_walk_off; 1029 int check_walk_off;
1098 mapstruct *
1099 m;
1100 1030
1101 sint16
1102 x,
1103 y;
1104
1105 if (QUERY_FLAG (op, FLAG_REMOVED)) 1031 if (QUERY_FLAG (this, FLAG_REMOVED))
1106 return; 1032 return;
1107 1033
1108 SET_FLAG (op, FLAG_REMOVED); 1034 SET_FLAG (this, FLAG_REMOVED);
1109 1035
1110 if (op->more != NULL) 1036 if (more)
1111 remove_ob (op->more); 1037 more->remove ();
1112 1038
1113 /* 1039 /*
1114 * In this case, the object to be removed is in someones 1040 * In this case, the object to be removed is in someones
1115 * inventory. 1041 * inventory.
1116 */ 1042 */
1117 if (op->env != NULL) 1043 if (env)
1118 { 1044 {
1119 if (op->nrof) 1045 if (nrof)
1120 sub_weight (op->env, op->weight * op->nrof); 1046 sub_weight (env, weight * nrof);
1121 else 1047 else
1122 sub_weight (op->env, op->weight + op->carrying); 1048 sub_weight (env, weight + carrying);
1123 1049
1124 /* 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
1125 * made to players inventory. If set, avoiding the call 1051 * made to players inventory. If set, avoiding the call
1126 * to save cpu time. 1052 * to save cpu time.
1127 */ 1053 */
1128 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))
1129 fix_player (otmp); 1055 fix_player (otmp);
1130 1056
1131 if (op->above != NULL) 1057 if (above != NULL)
1132 op->above->below = op->below; 1058 above->below = below;
1133 else 1059 else
1134 op->env->inv = op->below; 1060 env->inv = below;
1135 1061
1136 if (op->below != NULL) 1062 if (below != NULL)
1137 op->below->above = op->above; 1063 below->above = above;
1138 1064
1139 /* we set up values so that it could be inserted into 1065 /* we set up values so that it could be inserted into
1140 * 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
1141 * to the caller to decide what we want to do. 1067 * to the caller to decide what we want to do.
1142 */ 1068 */
1143 op->x = op->env->x, op->y = op->env->y; 1069 x = env->x, y = env->y;
1144 op->map = op->env->map; 1070 map = env->map;
1145 op->above = NULL, op->below = NULL; 1071 above = 0, below = 0;
1146 op->env = NULL; 1072 env = 0;
1147 } 1073 }
1148 else if (op->map) 1074 else if (map)
1149 { 1075 {
1150 x = op->x;
1151 y = op->y;
1152 m = get_map_from_coord (op->map, &x, &y);
1153
1154 if (!m)
1155 {
1156 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1157 op->map->path, op->x, op->y);
1158 /* in old days, we used to set x and y to 0 and continue.
1159 * it seems if we get into this case, something is probablye
1160 * screwed up and should be fixed.
1161 */
1162 abort ();
1163 }
1164
1165 if (op->map != m)
1166 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1167 op->map->path, m->path, op->x, op->y, x, y);
1168
1169 /* 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
1170 * lots of logic for things we no longer care about 1077 * lots of logic for things we no longer care about
1171 */ 1078 */
1172 1079
1173 /* link the object above us */ 1080 /* link the object above us */
1174 if (op->above) 1081 if (above)
1175 op->above->below = op->below; 1082 above->below = below;
1176 else 1083 else
1177 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 */
1178 1085
1179 /* Relink the object below us, if there is one */ 1086 /* Relink the object below us, if there is one */
1180 if (op->below) 1087 if (below)
1181 op->below->above = op->above; 1088 below->above = above;
1182 else 1089 else
1183 { 1090 {
1184 /* 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
1185 * use translated coordinates in case some oddness with map tiling is 1092 * use translated coordinates in case some oddness with map tiling is
1186 * evident 1093 * evident
1187 */ 1094 */
1188 if (GET_MAP_OB (m, x, y) != op) 1095 if (GET_MAP_OB (map, x, y) != this)
1189 { 1096 {
1190 dump_object (op); 1097 char *dump = dump_object (this);
1191 LOG (llevError, 1098 LOG (llevError,
1192 "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);
1193 dump_object (GET_MAP_OB (m, x, y)); 1101 dump = dump_object (GET_MAP_OB (map, x, y));
1194 LOG (llevError, "%s\n", errmsg); 1102 LOG (llevError, "%s\n", dump);
1103 free (dump);
1195 } 1104 }
1196 1105
1197 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1106 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1198 } 1107 }
1199 1108
1200 op->above = 0; 1109 above = 0;
1201 op->below = 0; 1110 below = 0;
1202 1111
1203 if (op->map->in_memory == MAP_SAVING) 1112 if (map->in_memory == MAP_SAVING)
1204 return; 1113 return;
1205 1114
1206 tag = op->count;
1207 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1115 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1208 1116
1209 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)
1210 { 1118 {
1211 /* 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
1212 * being removed. 1120 * being removed.
1213 */ 1121 */
1214 1122
1215 if (tmp->type == PLAYER && tmp != op) 1123 if (tmp->type == PLAYER && tmp != this)
1216 { 1124 {
1217 /* If a container that the player is currently using somehow gets 1125 /* If a container that the player is currently using somehow gets
1218 * removed (most likely destroyed), update the player view 1126 * removed (most likely destroyed), update the player view
1219 * appropriately. 1127 * appropriately.
1220 */ 1128 */
1221 if (tmp->container == op) 1129 if (tmp->container == this)
1222 { 1130 {
1223 CLEAR_FLAG (op, FLAG_APPLIED); 1131 CLEAR_FLAG (this, FLAG_APPLIED);
1224 tmp->container = NULL; 1132 tmp->container = 0;
1225 } 1133 }
1226 1134
1227 tmp->contr->socket.update_look = 1; 1135 tmp->contr->socket.update_look = 1;
1228 } 1136 }
1229 1137
1230 /* See if player moving off should effect something */ 1138 /* See if player moving off should effect something */
1231 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))
1232 { 1142 {
1233 move_apply (tmp, op, NULL); 1143 move_apply (tmp, this, 0);
1234 1144
1235 if (was_destroyed (op, tag)) 1145 if (destroyed ())
1236 {
1237 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 ());
1238 }
1239 } 1147 }
1240 1148
1241 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1149 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242 1150
1243 if (tmp->above == tmp) 1151 if (tmp->above == tmp)
1244 tmp->above = NULL; 1152 tmp->above = 0;
1245 1153
1246 last = tmp; 1154 last = tmp;
1247 } 1155 }
1248 1156
1249 /* last == NULL of there are no objects on this space */ 1157 /* last == NULL of there are no objects on this space */
1250 if (last == NULL) 1158 if (!last)
1251 { 1159 {
1252 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1160 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1253 * 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
1254 * 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
1255 * be correct anyways. 1163 * be correct anyways.
1256 */ 1164 */
1257 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1165 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1258 update_position (op->map, op->x, op->y); 1166 update_position (map, x, y);
1259 } 1167 }
1260 else 1168 else
1261 update_object (last, UP_OBJ_REMOVE); 1169 update_object (last, UP_OBJ_REMOVE);
1262 1170
1263 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1171 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1264 update_all_los (op->map, op->x, op->y); 1172 update_all_los (map, x, y);
1265 } 1173 }
1266} 1174}
1267 1175
1268/* 1176/*
1269 * merge_ob(op,top): 1177 * merge_ob(op,top):
… …
1290 { 1198 {
1291 top->nrof += op->nrof; 1199 top->nrof += op->nrof;
1292 1200
1293/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1201/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1294 op->weight = 0; /* Don't want any adjustements now */ 1202 op->weight = 0; /* Don't want any adjustements now */
1295 remove_ob (op); 1203 op->destroy ();
1296 free_object (op);
1297 return top; 1204 return top;
1298 } 1205 }
1299 } 1206 }
1300 1207
1301 return NULL; 1208 return 0;
1302} 1209}
1303 1210
1304/* 1211/*
1305 * 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
1306 * job preparing multi-part monsters 1213 * job preparing multi-part monsters
1307 */ 1214 */
1308object * 1215object *
1309insert_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)
1310{ 1217{
1311 object *tmp; 1218 object *tmp;
1312 1219
1313 if (op->head) 1220 if (op->head)
1314 op = op->head; 1221 op = op->head;
… …
1342 * NULL if 'op' was destroyed 1249 * NULL if 'op' was destroyed
1343 * just 'op' otherwise 1250 * just 'op' otherwise
1344 */ 1251 */
1345 1252
1346object * 1253object *
1347insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1254insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1348{ 1255{
1349 object *tmp, *top, *floor = NULL; 1256 object *tmp, *top, *floor = NULL;
1350 sint16 x, y; 1257 sint16 x, y;
1351 1258
1352 if (QUERY_FLAG (op, FLAG_FREED)) 1259 if (QUERY_FLAG (op, FLAG_FREED))
… …
1355 return NULL; 1262 return NULL;
1356 } 1263 }
1357 1264
1358 if (m == NULL) 1265 if (m == NULL)
1359 { 1266 {
1360 dump_object (op); 1267 char *dump = dump_object (op);
1361 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);
1362 return op; 1270 return op;
1363 } 1271 }
1364 1272
1365 if (out_of_map (m, op->x, op->y)) 1273 if (out_of_map (m, op->x, op->y))
1366 { 1274 {
1367 dump_object (op); 1275 char *dump = dump_object (op);
1368 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);
1369#ifdef MANY_CORES 1277#ifdef MANY_CORES
1370 /* 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
1371 * 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
1372 * improperly inserted. 1280 * improperly inserted.
1373 */ 1281 */
1374 abort (); 1282 abort ();
1375#endif 1283#endif
1284 free (dump);
1376 return op; 1285 return op;
1377 } 1286 }
1378 1287
1379 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1288 if (!QUERY_FLAG (op, FLAG_REMOVED))
1380 { 1289 {
1381 dump_object (op); 1290 char *dump = dump_object (op);
1382 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);
1383 return op; 1293 return op;
1384 } 1294 }
1385 1295
1386 if (op->more != NULL) 1296 if (op->more != NULL)
1387 { 1297 {
… …
1428 if (op->nrof && !(flag & INS_NO_MERGE)) 1338 if (op->nrof && !(flag & INS_NO_MERGE))
1429 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)
1430 if (CAN_MERGE (op, tmp)) 1340 if (CAN_MERGE (op, tmp))
1431 { 1341 {
1432 op->nrof += tmp->nrof; 1342 op->nrof += tmp->nrof;
1433 remove_ob (tmp); 1343 tmp->destroy ();
1434 free_object (tmp);
1435 } 1344 }
1436 1345
1437 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 */
1438 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1347 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1439 1348
… …
1625 tmp1; 1534 tmp1;
1626 1535
1627 /* first search for itself and remove any old instances */ 1536 /* first search for itself and remove any old instances */
1628 1537
1629 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)
1630 {
1631 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1539 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1632 { 1540 tmp->destroy ();
1633 remove_ob (tmp);
1634 free_object (tmp);
1635 }
1636 }
1637 1541
1638 tmp1 = arch_to_object (find_archetype (arch_string)); 1542 tmp1 = arch_to_object (archetype::find (arch_string));
1639 1543
1640 tmp1->x = op->x; 1544 tmp1->x = op->x;
1641 tmp1->y = op->y; 1545 tmp1->y = op->y;
1642 insert_ob_in_map (tmp1, op->map, op, 0); 1546 insert_ob_in_map (tmp1, op->map, op, 0);
1643} 1547}
… …
1651 */ 1555 */
1652 1556
1653object * 1557object *
1654get_split_ob (object *orig_ob, uint32 nr) 1558get_split_ob (object *orig_ob, uint32 nr)
1655{ 1559{
1656 object * 1560 object *newob;
1657 newob;
1658 int
1659 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1561 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1660 1562
1661 if (orig_ob->nrof < nr) 1563 if (orig_ob->nrof < nr)
1662 { 1564 {
1663 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);
1664 return NULL; 1566 return NULL;
1665 } 1567 }
1666 1568
1667 newob = object_create_clone (orig_ob); 1569 newob = object_create_clone (orig_ob);
1668 1570
1669 if ((orig_ob->nrof -= nr) < 1) 1571 if ((orig_ob->nrof -= nr) < 1)
1670 { 1572 orig_ob->destroy (1);
1671 if (!is_removed)
1672 remove_ob (orig_ob);
1673 free_object2 (orig_ob, 1);
1674 }
1675 else if (!is_removed) 1573 else if (!is_removed)
1676 { 1574 {
1677 if (orig_ob->env != NULL) 1575 if (orig_ob->env != NULL)
1678 sub_weight (orig_ob->env, orig_ob->weight * nr); 1576 sub_weight (orig_ob->env, orig_ob->weight * nr);
1679 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)
… …
1743 esrv_send_item (tmp, op); 1641 esrv_send_item (tmp, op);
1744 } 1642 }
1745 } 1643 }
1746 else 1644 else
1747 { 1645 {
1748 remove_ob (op); 1646 op->remove ();
1749 op->nrof = 0; 1647 op->nrof = 0;
1750 if (tmp) 1648 if (tmp)
1751 { 1649 {
1752 esrv_del_item (tmp->contr, op->count); 1650 esrv_del_item (tmp->contr, op->count);
1753 } 1651 }
… …
1759 1657
1760 if (i < op->nrof) 1658 if (i < op->nrof)
1761 op->nrof -= i; 1659 op->nrof -= i;
1762 else 1660 else
1763 { 1661 {
1764 remove_ob (op); 1662 op->remove ();
1765 op->nrof = 0; 1663 op->nrof = 0;
1766 } 1664 }
1767 1665
1768 /* Since we just removed op, op->above is null */ 1666 /* Since we just removed op, op->above is null */
1769 for (tmp = above; tmp != NULL; tmp = tmp->above) 1667 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1778 1676
1779 if (op->nrof) 1677 if (op->nrof)
1780 return op; 1678 return op;
1781 else 1679 else
1782 { 1680 {
1783 free_object (op); 1681 op->destroy ();
1784 return NULL; 1682 return NULL;
1785 } 1683 }
1786} 1684}
1787 1685
1788/* 1686/*
… …
1801 op->carrying += weight; 1699 op->carrying += weight;
1802 op = op->env; 1700 op = op->env;
1803 } 1701 }
1804} 1702}
1805 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
1806/* 1724/*
1807 * insert_ob_in_ob(op,environment): 1725 * env->insert (op)
1808 * This function inserts the object op in the linked list 1726 * This function inserts the object op in the linked list
1809 * inside the object environment. 1727 * inside the object environment.
1810 * 1728 *
1811 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1812 * the inventory at the last position or next to other objects of the same
1813 * type.
1814 * Frank: Now sorted by type, archetype and magic!
1815 *
1816 * 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
1817 * be != op, if items are merged. -Tero 1730 * be != op, if items are merged. -Tero
1818 */ 1731 */
1819 1732
1820object * 1733object *
1821insert_ob_in_ob (object *op, object *where) 1734object::insert (object *op)
1822{ 1735{
1823 object * 1736 object *tmp, *otmp;
1824 tmp, *
1825 otmp;
1826 1737
1827 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1738 if (!QUERY_FLAG (op, FLAG_REMOVED))
1828 { 1739 op->remove ();
1829 dump_object (op);
1830 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1831 return op;
1832 }
1833
1834 if (where == NULL)
1835 {
1836 dump_object (op);
1837 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1838 return op;
1839 }
1840
1841 if (where->head)
1842 {
1843 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1844 where = where->head;
1845 }
1846 1740
1847 if (op->more) 1741 if (op->more)
1848 { 1742 {
1849 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);
1850 return op; 1744 return op;
… …
1852 1746
1853 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1747 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1854 CLEAR_FLAG (op, FLAG_REMOVED); 1748 CLEAR_FLAG (op, FLAG_REMOVED);
1855 if (op->nrof) 1749 if (op->nrof)
1856 { 1750 {
1857 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1751 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1858 if (CAN_MERGE (tmp, op)) 1752 if (CAN_MERGE (tmp, op))
1859 { 1753 {
1860 /* return the original object and remove inserted object 1754 /* return the original object and remove inserted object
1861 (client needs the original object) */ 1755 (client needs the original object) */
1862 tmp->nrof += op->nrof; 1756 tmp->nrof += op->nrof;
1863 /* Weight handling gets pretty funky. Since we are adding to 1757 /* Weight handling gets pretty funky. Since we are adding to
1864 * tmp->nrof, we need to increase the weight. 1758 * tmp->nrof, we need to increase the weight.
1865 */ 1759 */
1866 add_weight (where, op->weight * op->nrof); 1760 add_weight (this, op->weight * op->nrof);
1867 SET_FLAG (op, FLAG_REMOVED); 1761 SET_FLAG (op, FLAG_REMOVED);
1868 free_object (op); /* free the inserted object */ 1762 op->destroy (); /* free the inserted object */
1869 op = tmp; 1763 op = tmp;
1870 remove_ob (op); /* and fix old object's links */ 1764 op->remove (); /* and fix old object's links */
1871 CLEAR_FLAG (op, FLAG_REMOVED); 1765 CLEAR_FLAG (op, FLAG_REMOVED);
1872 break; 1766 break;
1873 } 1767 }
1874 1768
1875 /* I assume combined objects have no inventory 1769 /* I assume combined objects have no inventory
1876 * We add the weight - this object could have just been removed 1770 * We add the weight - this object could have just been removed
1877 * (if it was possible to merge). calling remove_ob will subtract 1771 * (if it was possible to merge). calling remove_ob will subtract
1878 * 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
1879 * the linking below 1773 * the linking below
1880 */ 1774 */
1881 add_weight (where, op->weight * op->nrof); 1775 add_weight (this, op->weight * op->nrof);
1882 } 1776 }
1883 else 1777 else
1884 add_weight (where, (op->weight + op->carrying)); 1778 add_weight (this, (op->weight + op->carrying));
1885 1779
1886 otmp = is_player_inv (where); 1780 otmp = is_player_inv (this);
1887 if (otmp && otmp->contr != NULL) 1781 if (otmp && otmp->contr)
1888 {
1889 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1782 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1890 fix_player (otmp); 1783 fix_player (otmp);
1891 }
1892 1784
1893 op->map = NULL; 1785 op->map = NULL;
1894 op->env = where; 1786 op->env = this;
1895 op->above = NULL; 1787 op->above = NULL;
1896 op->below = NULL; 1788 op->below = NULL;
1897 op->x = 0, op->y = 0; 1789 op->x = 0, op->y = 0;
1898 1790
1899 /* 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 */
1900 if ((op->glow_radius != 0) && where->map) 1792 if ((op->glow_radius != 0) && map)
1901 { 1793 {
1902#ifdef DEBUG_LIGHTS 1794#ifdef DEBUG_LIGHTS
1903 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);
1904#endif /* DEBUG_LIGHTS */ 1796#endif /* DEBUG_LIGHTS */
1905 if (MAP_DARKNESS (where->map)) 1797 if (MAP_DARKNESS (map))
1906 update_all_los (where->map, where->x, where->y); 1798 update_all_los (map, x, y);
1907 } 1799 }
1908 1800
1909 /* 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.
1910 * It sure simplifies this function... 1802 * It sure simplifies this function...
1911 */ 1803 */
1912 if (where->inv == NULL) 1804 if (!inv)
1913 where->inv = op; 1805 inv = op;
1914 else 1806 else
1915 { 1807 {
1916 op->below = where->inv; 1808 op->below = inv;
1917 op->below->above = op; 1809 op->below->above = op;
1918 where->inv = op; 1810 inv = op;
1919 } 1811 }
1812
1920 return op; 1813 return op;
1921} 1814}
1922 1815
1923/* 1816/*
1924 * Checks if any objects has a move_type that matches objects 1817 * Checks if any objects has a move_type that matches objects
… …
1942 */ 1835 */
1943 1836
1944int 1837int
1945check_move_on (object *op, object *originator) 1838check_move_on (object *op, object *originator)
1946{ 1839{
1947 object * 1840 object *tmp;
1948 tmp; 1841 maptile *m = op->map;
1949 tag_t
1950 tag;
1951 mapstruct *
1952 m = op->map;
1953 int
1954 x = op->x, y = op->y; 1842 int x = op->x, y = op->y;
1955 1843
1956 MoveType 1844 MoveType move_on, move_slow, move_block;
1957 move_on,
1958 move_slow,
1959 move_block;
1960 1845
1961 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1846 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962 return 0; 1847 return 0;
1963
1964 tag = op->count;
1965 1848
1966 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);
1967 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);
1968 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);
1969 1852
… …
2030 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1913 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2031 ((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))
2032 { 1915 {
2033 move_apply (tmp, op, originator); 1916 move_apply (tmp, op, originator);
2034 1917
2035 if (was_destroyed (op, tag)) 1918 if (op->destroyed ())
2036 return 1; 1919 return 1;
2037 1920
2038 /* what the person/creature stepped onto has moved the object 1921 /* what the person/creature stepped onto has moved the object
2039 * someplace new. Don't process any further - if we did, 1922 * someplace new. Don't process any further - if we did,
2040 * have a feeling strange problems would result. 1923 * have a feeling strange problems would result.
… …
2052 * a matching archetype at the given map and coordinates. 1935 * a matching archetype at the given map and coordinates.
2053 * The first matching object is returned, or NULL if none. 1936 * The first matching object is returned, or NULL if none.
2054 */ 1937 */
2055 1938
2056object * 1939object *
2057present_arch (const archetype *at, mapstruct *m, int x, int y) 1940present_arch (const archetype *at, maptile *m, int x, int y)
2058{ 1941{
2059 object * 1942 object *
2060 tmp; 1943 tmp;
2061 1944
2062 if (m == NULL || out_of_map (m, x, y)) 1945 if (m == NULL || out_of_map (m, x, y))
… …
2075 * a matching type variable at the given map and coordinates. 1958 * a matching type variable at the given map and coordinates.
2076 * The first matching object is returned, or NULL if none. 1959 * The first matching object is returned, or NULL if none.
2077 */ 1960 */
2078 1961
2079object * 1962object *
2080present (unsigned char type, mapstruct *m, int x, int y) 1963present (unsigned char type, maptile *m, int x, int y)
2081{ 1964{
2082 object * 1965 object *
2083 tmp; 1966 tmp;
2084 1967
2085 if (out_of_map (m, x, y)) 1968 if (out_of_map (m, x, y))
… …
2225 * 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
2226 * customized, changed states, etc. 2109 * customized, changed states, etc.
2227 */ 2110 */
2228 2111
2229int 2112int
2230find_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)
2231{ 2114{
2232 int 2115 int
2233 i, 2116 i,
2234 index = 0, flag; 2117 index = 0, flag;
2235 static int 2118 static int
… …
2256 return -1; 2139 return -1;
2257 return altern[RANDOM () % index]; 2140 return altern[RANDOM () % index];
2258} 2141}
2259 2142
2260/* 2143/*
2261 * find_first_free_spot(archetype, mapstruct, x, y) works like 2144 * find_first_free_spot(archetype, maptile, x, y) works like
2262 * find_free_spot(), but it will search max number of squares. 2145 * find_free_spot(), but it will search max number of squares.
2263 * 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.
2264 * 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.
2265 */ 2148 */
2266 2149
2267int 2150int
2268find_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)
2269{ 2152{
2270 int 2153 int
2271 i; 2154 i;
2272 2155
2273 for (i = 0; i < SIZEOFFREE; i++) 2156 for (i = 0; i < SIZEOFFREE; i++)
… …
2337 * 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
2338 * there is capable of. 2221 * there is capable of.
2339 */ 2222 */
2340 2223
2341int 2224int
2342find_dir (mapstruct *m, int x, int y, object *exclude) 2225find_dir (maptile *m, int x, int y, object *exclude)
2343{ 2226{
2344 int 2227 int
2345 i, 2228 i,
2346 max = SIZEOFFREE, mflags; 2229 max = SIZEOFFREE, mflags;
2347 2230
2348 sint16 nx, ny; 2231 sint16 nx, ny;
2349 object * 2232 object *
2350 tmp; 2233 tmp;
2351 mapstruct * 2234 maptile *
2352 mp; 2235 mp;
2353 2236
2354 MoveType blocked, move_type; 2237 MoveType blocked, move_type;
2355 2238
2356 if (exclude && exclude->head) 2239 if (exclude && exclude->head)
… …
2564 * Modified to be map tile aware -.MSW 2447 * Modified to be map tile aware -.MSW
2565 */ 2448 */
2566 2449
2567 2450
2568int 2451int
2569can_see_monsterP (mapstruct *m, int x, int y, int dir) 2452can_see_monsterP (maptile *m, int x, int y, int dir)
2570{ 2453{
2571 sint16 dx, dy; 2454 sint16 dx, dy;
2572 int 2455 int
2573 mflags; 2456 mflags;
2574 2457
… …
2623 * create clone from object to another 2506 * create clone from object to another
2624 */ 2507 */
2625object * 2508object *
2626object_create_clone (object *asrc) 2509object_create_clone (object *asrc)
2627{ 2510{
2628 object *
2629 dst = NULL, *tmp, *src, *part, *prev, *item; 2511 object *dst = 0, *tmp, *src, *part, *prev, *item;
2630 2512
2631 if (!asrc) 2513 if (!asrc)
2632 return NULL; 2514 return 0;
2515
2633 src = asrc; 2516 src = asrc;
2634 if (src->head) 2517 if (src->head)
2635 src = src->head; 2518 src = src->head;
2636 2519
2637 prev = NULL; 2520 prev = 0;
2638 for (part = src; part; part = part->more) 2521 for (part = src; part; part = part->more)
2639 { 2522 {
2640 tmp = get_object (); 2523 tmp = object::create ();
2641 copy_object (part, tmp); 2524 part->copy_to (tmp);
2642 tmp->x -= src->x; 2525 tmp->x -= src->x;
2643 tmp->y -= src->y; 2526 tmp->y -= src->y;
2527
2644 if (!part->head) 2528 if (!part->head)
2645 { 2529 {
2646 dst = tmp; 2530 dst = tmp;
2647 tmp->head = NULL; 2531 tmp->head = 0;
2648 } 2532 }
2649 else 2533 else
2650 { 2534 {
2651 tmp->head = dst; 2535 tmp->head = dst;
2652 } 2536 }
2537
2653 tmp->more = NULL; 2538 tmp->more = 0;
2539
2654 if (prev) 2540 if (prev)
2655 prev->more = tmp; 2541 prev->more = tmp;
2542
2656 prev = tmp; 2543 prev = tmp;
2657 } 2544 }
2658 2545
2659 /*** copy inventory ***/
2660 for (item = src->inv; item; item = item->below) 2546 for (item = src->inv; item; item = item->below)
2661 {
2662 (void) insert_ob_in_ob (object_create_clone (item), dst); 2547 insert_ob_in_ob (object_create_clone (item), dst);
2663 }
2664 2548
2665 return dst; 2549 return dst;
2666} 2550}
2667 2551
2668/* return true if the object was destroyed, 0 otherwise */
2669int
2670was_destroyed (const object *op, tag_t old_tag)
2671{
2672 /* checking for FLAG_FREED isn't necessary, but makes this function more
2673 * robust */
2674 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2675}
2676
2677/* GROS - Creates an object using a string representing its content. */ 2552/* GROS - Creates an object using a string representing its content. */
2678
2679/* 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 */
2680
2681/* 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, */
2682
2683/* 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. */
2684
2685/* 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. */
2686
2687/* Also remember that multiparts objects are not supported for now. */ 2557/* Also remember that multiparts objects are not supported for now. */
2688 2558
2689object * 2559object *
2690load_object_str (const char *obstr) 2560load_object_str (const char *obstr)
2691{ 2561{
2692 object * 2562 object *op;
2693 op;
2694 char
2695 filename[MAX_BUF]; 2563 char filename[MAX_BUF];
2696 2564
2697 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2565 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698 2566
2699 FILE *
2700 tempfile = fopen (filename, "w"); 2567 FILE *tempfile = fopen (filename, "w");
2701 2568
2702 if (tempfile == NULL) 2569 if (tempfile == NULL)
2703 { 2570 {
2704 LOG (llevError, "Error - Unable to access load object temp file\n"); 2571 LOG (llevError, "Error - Unable to access load object temp file\n");
2705 return NULL; 2572 return NULL;
2706 } 2573 }
2707 2574
2708 fprintf (tempfile, obstr); 2575 fprintf (tempfile, obstr);
2709 fclose (tempfile); 2576 fclose (tempfile);
2710 2577
2711 op = get_object (); 2578 op = object::create ();
2712 2579
2713 object_thawer thawer (filename); 2580 object_thawer thawer (filename);
2714 2581
2715 if (thawer) 2582 if (thawer)
2716 load_object (thawer, op, 0); 2583 load_object (thawer, op, 0);
… …
2726 * returns NULL if no match. 2593 * returns NULL if no match.
2727 */ 2594 */
2728object * 2595object *
2729find_obj_by_type_subtype (const object *who, int type, int subtype) 2596find_obj_by_type_subtype (const object *who, int type, int subtype)
2730{ 2597{
2731 object * 2598 object *tmp;
2732 tmp;
2733 2599
2734 for (tmp = who->inv; tmp; tmp = tmp->below) 2600 for (tmp = who->inv; tmp; tmp = tmp->below)
2735 if (tmp->type == type && tmp->subtype == subtype) 2601 if (tmp->type == type && tmp->subtype == subtype)
2736 return tmp; 2602 return tmp;
2737 2603
… …
2745 * do the desired thing. 2611 * do the desired thing.
2746 */ 2612 */
2747key_value * 2613key_value *
2748get_ob_key_link (const object *ob, const char *key) 2614get_ob_key_link (const object *ob, const char *key)
2749{ 2615{
2750 key_value * 2616 key_value *link;
2751 link;
2752 2617
2753 for (link = ob->key_values; link != NULL; link = link->next) 2618 for (link = ob->key_values; link != NULL; link = link->next)
2754 {
2755 if (link->key == key) 2619 if (link->key == key)
2756 {
2757 return link; 2620 return link;
2758 }
2759 }
2760 2621
2761 return NULL; 2622 return NULL;
2762} 2623}
2763 2624
2764/* 2625/*

Diff Legend

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