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

Diff Legend

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