… | |
… | |
412 | */ |
412 | */ |
413 | |
413 | |
414 | object * |
414 | object * |
415 | find_object (tag_t i) |
415 | find_object (tag_t i) |
416 | { |
416 | { |
417 | object *op; |
|
|
418 | |
|
|
419 | for (op = object::first; op != NULL; op = op->next) |
417 | for (object *op = object::first; op; op = op->next) |
420 | if (op->count == i) |
418 | if (op->count == i) |
421 | break; |
419 | return op; |
422 | |
420 | |
423 | return op; |
421 | return 0; |
424 | } |
422 | } |
425 | |
423 | |
426 | /* |
424 | /* |
427 | * 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. |
428 | * Used only by the patch command, but not all that useful. |
426 | * Used only by the patch command, but not all that useful. |
… | |
… | |
555 | |
553 | |
556 | op2->clone (op); |
554 | op2->clone (op); |
557 | |
555 | |
558 | if (is_freed) |
556 | if (is_freed) |
559 | SET_FLAG (op, FLAG_FREED); |
557 | SET_FLAG (op, FLAG_FREED); |
|
|
558 | |
560 | if (is_removed) |
559 | if (is_removed) |
561 | SET_FLAG (op, FLAG_REMOVED); |
560 | SET_FLAG (op, FLAG_REMOVED); |
562 | |
561 | |
563 | if (op2->speed < 0) |
562 | if (op2->speed < 0) |
564 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
563 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
… | |
… | |
806 | update_now = 1; |
805 | update_now = 1; |
807 | |
806 | |
808 | if ((move_slow | op->move_slow) != move_slow) |
807 | if ((move_slow | op->move_slow) != move_slow) |
809 | update_now = 1; |
808 | update_now = 1; |
810 | } |
809 | } |
|
|
810 | |
811 | /* if the object is being removed, we can't make intelligent |
811 | /* if the object is being removed, we can't make intelligent |
812 | * decisions, because remove_ob can't really pass the object |
812 | * decisions, because remove_ob can't really pass the object |
813 | * that is being removed. |
813 | * that is being removed. |
814 | */ |
814 | */ |
815 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
815 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
841 | else |
841 | else |
842 | { |
842 | { |
843 | delete *i; |
843 | delete *i; |
844 | mortals.erase (i); |
844 | mortals.erase (i); |
845 | } |
845 | } |
846 | |
|
|
847 | static int lastmortals = 0;//D |
|
|
848 | |
|
|
849 | if (mortals.size() != lastmortals && lastmortals > 100)//D |
|
|
850 | { |
|
|
851 | lastmortals = mortals.size ();//D |
|
|
852 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
853 | } |
|
|
854 | } |
846 | } |
855 | |
847 | |
856 | object::object () |
848 | object::object () |
857 | { |
849 | { |
858 | SET_FLAG (this, FLAG_REMOVED); |
850 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
969 | op = tmp; |
961 | op = tmp; |
970 | } |
962 | } |
971 | } |
963 | } |
972 | } |
964 | } |
973 | |
965 | |
|
|
966 | // hack to ensure that freed objects still have a valid map |
|
|
967 | { |
|
|
968 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
969 | |
|
|
970 | if (!freed_map) |
|
|
971 | { |
|
|
972 | freed_map = new maptile; |
|
|
973 | |
|
|
974 | freed_map->name = "/internal/freed_objects_map"; |
|
|
975 | freed_map->width = 3; |
|
|
976 | freed_map->height = 3; |
|
|
977 | |
|
|
978 | freed_map->allocate (); |
|
|
979 | } |
|
|
980 | |
|
|
981 | map = freed_map; |
|
|
982 | x = 1; |
|
|
983 | y = 1; |
|
|
984 | } |
|
|
985 | |
974 | // clear those pointers that likely might have circular references to us |
986 | // clear those pointers that likely might have circular references to us |
975 | owner = 0; |
987 | owner = 0; |
976 | enemy = 0; |
988 | enemy = 0; |
977 | attacked_by = 0; |
989 | attacked_by = 0; |
978 | |
990 | |
… | |
… | |
990 | |
1002 | |
991 | /* |
1003 | /* |
992 | * sub_weight() recursively (outwards) subtracts a number from the |
1004 | * sub_weight() recursively (outwards) subtracts a number from the |
993 | * weight of an object (and what is carried by it's environment(s)). |
1005 | * weight of an object (and what is carried by it's environment(s)). |
994 | */ |
1006 | */ |
995 | |
|
|
996 | void |
1007 | void |
997 | sub_weight (object *op, signed long weight) |
1008 | sub_weight (object *op, signed long weight) |
998 | { |
1009 | { |
999 | while (op != NULL) |
1010 | while (op != NULL) |
1000 | { |
1011 | { |
… | |
… | |
1012 | * object will have no environment. If the object previously had an |
1023 | * object will have no environment. If the object previously had an |
1013 | * environment, the x and y coordinates will be updated to |
1024 | * environment, the x and y coordinates will be updated to |
1014 | * the previous environment. |
1025 | * the previous environment. |
1015 | * Beware: This function is called from the editor as well! |
1026 | * Beware: This function is called from the editor as well! |
1016 | */ |
1027 | */ |
1017 | |
|
|
1018 | void |
1028 | void |
1019 | remove_ob (object *op) |
1029 | object::remove () |
1020 | { |
1030 | { |
1021 | object *tmp, *last = 0; |
1031 | object *tmp, *last = 0; |
1022 | object *otmp; |
1032 | object *otmp; |
1023 | |
1033 | |
1024 | int check_walk_off; |
1034 | int check_walk_off; |
1025 | maptile *m; |
|
|
1026 | |
1035 | |
1027 | sint16 x, y; |
|
|
1028 | |
|
|
1029 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1036 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1030 | return; |
1037 | return; |
1031 | |
1038 | |
1032 | SET_FLAG (op, FLAG_REMOVED); |
1039 | SET_FLAG (this, FLAG_REMOVED); |
1033 | |
1040 | |
1034 | if (op->more != NULL) |
1041 | if (more) |
1035 | remove_ob (op->more); |
1042 | more->remove (); |
1036 | |
1043 | |
1037 | /* |
1044 | /* |
1038 | * In this case, the object to be removed is in someones |
1045 | * In this case, the object to be removed is in someones |
1039 | * inventory. |
1046 | * inventory. |
1040 | */ |
1047 | */ |
1041 | if (op->env != NULL) |
1048 | if (env) |
1042 | { |
1049 | { |
1043 | if (op->nrof) |
1050 | if (nrof) |
1044 | sub_weight (op->env, op->weight * op->nrof); |
1051 | sub_weight (env, weight * nrof); |
1045 | else |
1052 | else |
1046 | sub_weight (op->env, op->weight + op->carrying); |
1053 | sub_weight (env, weight + carrying); |
1047 | |
1054 | |
1048 | /* NO_FIX_PLAYER is set when a great many changes are being |
1055 | /* NO_FIX_PLAYER is set when a great many changes are being |
1049 | * made to players inventory. If set, avoiding the call |
1056 | * made to players inventory. If set, avoiding the call |
1050 | * to save cpu time. |
1057 | * to save cpu time. |
1051 | */ |
1058 | */ |
1052 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1059 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1053 | fix_player (otmp); |
1060 | fix_player (otmp); |
1054 | |
1061 | |
1055 | if (op->above != NULL) |
1062 | if (above != NULL) |
1056 | op->above->below = op->below; |
1063 | above->below = below; |
1057 | else |
1064 | else |
1058 | op->env->inv = op->below; |
1065 | env->inv = below; |
1059 | |
1066 | |
1060 | if (op->below != NULL) |
1067 | if (below != NULL) |
1061 | op->below->above = op->above; |
1068 | below->above = above; |
1062 | |
1069 | |
1063 | /* we set up values so that it could be inserted into |
1070 | /* we set up values so that it could be inserted into |
1064 | * the map, but we don't actually do that - it is up |
1071 | * the map, but we don't actually do that - it is up |
1065 | * to the caller to decide what we want to do. |
1072 | * to the caller to decide what we want to do. |
1066 | */ |
1073 | */ |
1067 | op->x = op->env->x, op->y = op->env->y; |
1074 | x = env->x, y = env->y; |
1068 | op->map = op->env->map; |
1075 | map = env->map; |
1069 | op->above = NULL, op->below = NULL; |
1076 | above = 0, below = 0; |
1070 | op->env = NULL; |
1077 | env = 0; |
1071 | } |
1078 | } |
1072 | else if (op->map) |
1079 | else if (map) |
1073 | { |
1080 | { |
1074 | x = op->x; |
|
|
1075 | y = op->y; |
|
|
1076 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1077 | |
|
|
1078 | if (!m) |
|
|
1079 | { |
|
|
1080 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1081 | op->map->path, op->x, op->y); |
|
|
1082 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1083 | * it seems if we get into this case, something is probablye |
|
|
1084 | * screwed up and should be fixed. |
|
|
1085 | */ |
|
|
1086 | abort (); |
|
|
1087 | } |
|
|
1088 | |
|
|
1089 | if (op->map != m) |
|
|
1090 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1091 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1092 | |
|
|
1093 | /* Re did the following section of code - it looks like it had |
1081 | /* Re did the following section of code - it looks like it had |
1094 | * lots of logic for things we no longer care about |
1082 | * lots of logic for things we no longer care about |
1095 | */ |
1083 | */ |
1096 | |
1084 | |
1097 | /* link the object above us */ |
1085 | /* link the object above us */ |
1098 | if (op->above) |
1086 | if (above) |
1099 | op->above->below = op->below; |
1087 | above->below = below; |
1100 | else |
1088 | else |
1101 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1089 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1102 | |
1090 | |
1103 | /* Relink the object below us, if there is one */ |
1091 | /* Relink the object below us, if there is one */ |
1104 | if (op->below) |
1092 | if (below) |
1105 | op->below->above = op->above; |
1093 | below->above = above; |
1106 | else |
1094 | else |
1107 | { |
1095 | { |
1108 | /* Nothing below, which means we need to relink map object for this space |
1096 | /* Nothing below, which means we need to relink map object for this space |
1109 | * use translated coordinates in case some oddness with map tiling is |
1097 | * use translated coordinates in case some oddness with map tiling is |
1110 | * evident |
1098 | * evident |
1111 | */ |
1099 | */ |
1112 | if (GET_MAP_OB (m, x, y) != op) |
1100 | if (GET_MAP_OB (map, x, y) != this) |
1113 | { |
1101 | { |
1114 | char *dump = dump_object (op); |
1102 | char *dump = dump_object (this); |
1115 | LOG (llevError, |
1103 | LOG (llevError, |
1116 | "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); |
1104 | "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); |
1117 | free (dump); |
1105 | free (dump); |
1118 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1106 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1119 | LOG (llevError, "%s\n", dump); |
1107 | LOG (llevError, "%s\n", dump); |
1120 | free (dump); |
1108 | free (dump); |
1121 | } |
1109 | } |
1122 | |
1110 | |
1123 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1111 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1124 | } |
1112 | } |
1125 | |
1113 | |
1126 | op->above = 0; |
1114 | above = 0; |
1127 | op->below = 0; |
1115 | below = 0; |
1128 | |
1116 | |
1129 | if (op->map->in_memory == MAP_SAVING) |
1117 | if (map->in_memory == MAP_SAVING) |
1130 | return; |
1118 | return; |
1131 | |
1119 | |
1132 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1120 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1133 | |
1121 | |
1134 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1122 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1135 | { |
1123 | { |
1136 | /* No point updating the players look faces if he is the object |
1124 | /* No point updating the players look faces if he is the object |
1137 | * being removed. |
1125 | * being removed. |
1138 | */ |
1126 | */ |
1139 | |
1127 | |
1140 | if (tmp->type == PLAYER && tmp != op) |
1128 | if (tmp->type == PLAYER && tmp != this) |
1141 | { |
1129 | { |
1142 | /* If a container that the player is currently using somehow gets |
1130 | /* If a container that the player is currently using somehow gets |
1143 | * removed (most likely destroyed), update the player view |
1131 | * removed (most likely destroyed), update the player view |
1144 | * appropriately. |
1132 | * appropriately. |
1145 | */ |
1133 | */ |
1146 | if (tmp->container == op) |
1134 | if (tmp->container == this) |
1147 | { |
1135 | { |
1148 | CLEAR_FLAG (op, FLAG_APPLIED); |
1136 | CLEAR_FLAG (this, FLAG_APPLIED); |
1149 | tmp->container = NULL; |
1137 | tmp->container = 0; |
1150 | } |
1138 | } |
1151 | |
1139 | |
1152 | tmp->contr->socket.update_look = 1; |
1140 | tmp->contr->socket.update_look = 1; |
1153 | } |
1141 | } |
1154 | |
1142 | |
1155 | /* See if player moving off should effect something */ |
1143 | /* See if player moving off should effect something */ |
1156 | if (check_walk_off |
1144 | if (check_walk_off |
1157 | && ((op->move_type & tmp->move_off) |
1145 | && ((move_type & tmp->move_off) |
1158 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1146 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1159 | { |
1147 | { |
1160 | move_apply (tmp, op, NULL); |
1148 | move_apply (tmp, this, 0); |
1161 | |
1149 | |
1162 | if (op->destroyed ()) |
1150 | if (destroyed ()) |
1163 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1151 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1164 | } |
1152 | } |
1165 | |
1153 | |
1166 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1154 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1167 | |
1155 | |
1168 | if (tmp->above == tmp) |
1156 | if (tmp->above == tmp) |
1169 | tmp->above = NULL; |
1157 | tmp->above = 0; |
1170 | |
1158 | |
1171 | last = tmp; |
1159 | last = tmp; |
1172 | } |
1160 | } |
1173 | |
1161 | |
1174 | /* last == NULL of there are no objects on this space */ |
1162 | /* last == NULL of there are no objects on this space */ |
1175 | if (last == NULL) |
1163 | if (!last) |
1176 | { |
1164 | { |
1177 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1165 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1178 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1166 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1179 | * those out anyways, and if there are any flags set right now, they won't |
1167 | * those out anyways, and if there are any flags set right now, they won't |
1180 | * be correct anyways. |
1168 | * be correct anyways. |
1181 | */ |
1169 | */ |
1182 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1170 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1183 | update_position (op->map, op->x, op->y); |
1171 | update_position (map, x, y); |
1184 | } |
1172 | } |
1185 | else |
1173 | else |
1186 | update_object (last, UP_OBJ_REMOVE); |
1174 | update_object (last, UP_OBJ_REMOVE); |
1187 | |
1175 | |
1188 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1176 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1189 | update_all_los (op->map, op->x, op->y); |
1177 | update_all_los (map, x, y); |
1190 | } |
1178 | } |
1191 | } |
1179 | } |
1192 | |
1180 | |
1193 | /* |
1181 | /* |
1194 | * merge_ob(op,top): |
1182 | * merge_ob(op,top): |
… | |
… | |
1729 | op->carrying += weight; |
1717 | op->carrying += weight; |
1730 | op = op->env; |
1718 | op = op->env; |
1731 | } |
1719 | } |
1732 | } |
1720 | } |
1733 | |
1721 | |
1734 | /* |
|
|
1735 | * insert_ob_in_ob(op,environment): |
|
|
1736 | * This function inserts the object op in the linked list |
|
|
1737 | * inside the object environment. |
|
|
1738 | * |
|
|
1739 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1740 | * the inventory at the last position or next to other objects of the same |
|
|
1741 | * type. |
|
|
1742 | * Frank: Now sorted by type, archetype and magic! |
|
|
1743 | * |
|
|
1744 | * The function returns now pointer to inserted item, and return value can |
|
|
1745 | * be != op, if items are merged. -Tero |
|
|
1746 | */ |
|
|
1747 | |
|
|
1748 | object * |
1722 | object * |
1749 | insert_ob_in_ob (object *op, object *where) |
1723 | insert_ob_in_ob (object *op, object *where) |
1750 | { |
1724 | { |
1751 | object * |
1725 | if (!where) |
1752 | tmp, * |
|
|
1753 | otmp; |
|
|
1754 | |
|
|
1755 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1756 | { |
|
|
1757 | char *dump = dump_object (op); |
|
|
1758 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); |
|
|
1759 | free (dump); |
|
|
1760 | return op; |
|
|
1761 | } |
|
|
1762 | |
|
|
1763 | if (where == NULL) |
|
|
1764 | { |
1726 | { |
1765 | char *dump = dump_object (op); |
1727 | char *dump = dump_object (op); |
1766 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1728 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1767 | free (dump); |
1729 | free (dump); |
1768 | return op; |
1730 | return op; |
1769 | } |
1731 | } |
1770 | |
1732 | |
1771 | if (where->head) |
1733 | if (where->head) |
1772 | { |
1734 | { |
1773 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1735 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1774 | where = where->head; |
1736 | where = where->head; |
1775 | } |
1737 | } |
|
|
1738 | |
|
|
1739 | return where->insert (op); |
|
|
1740 | } |
|
|
1741 | |
|
|
1742 | /* |
|
|
1743 | * env->insert (op) |
|
|
1744 | * This function inserts the object op in the linked list |
|
|
1745 | * inside the object environment. |
|
|
1746 | * |
|
|
1747 | * The function returns now pointer to inserted item, and return value can |
|
|
1748 | * be != op, if items are merged. -Tero |
|
|
1749 | */ |
|
|
1750 | |
|
|
1751 | object * |
|
|
1752 | object::insert (object *op) |
|
|
1753 | { |
|
|
1754 | object *tmp, *otmp; |
|
|
1755 | |
|
|
1756 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1757 | op->remove (); |
1776 | |
1758 | |
1777 | if (op->more) |
1759 | if (op->more) |
1778 | { |
1760 | { |
1779 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1761 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1780 | return op; |
1762 | return op; |
… | |
… | |
1782 | |
1764 | |
1783 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1765 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1784 | CLEAR_FLAG (op, FLAG_REMOVED); |
1766 | CLEAR_FLAG (op, FLAG_REMOVED); |
1785 | if (op->nrof) |
1767 | if (op->nrof) |
1786 | { |
1768 | { |
1787 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1769 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1788 | if (CAN_MERGE (tmp, op)) |
1770 | if (CAN_MERGE (tmp, op)) |
1789 | { |
1771 | { |
1790 | /* return the original object and remove inserted object |
1772 | /* return the original object and remove inserted object |
1791 | (client needs the original object) */ |
1773 | (client needs the original object) */ |
1792 | tmp->nrof += op->nrof; |
1774 | tmp->nrof += op->nrof; |
1793 | /* Weight handling gets pretty funky. Since we are adding to |
1775 | /* Weight handling gets pretty funky. Since we are adding to |
1794 | * tmp->nrof, we need to increase the weight. |
1776 | * tmp->nrof, we need to increase the weight. |
1795 | */ |
1777 | */ |
1796 | add_weight (where, op->weight * op->nrof); |
1778 | add_weight (this, op->weight * op->nrof); |
1797 | SET_FLAG (op, FLAG_REMOVED); |
1779 | SET_FLAG (op, FLAG_REMOVED); |
1798 | free_object (op); /* free the inserted object */ |
1780 | op->destroy (); /* free the inserted object */ |
1799 | op = tmp; |
1781 | op = tmp; |
1800 | remove_ob (op); /* and fix old object's links */ |
1782 | op->remove (); /* and fix old object's links */ |
1801 | CLEAR_FLAG (op, FLAG_REMOVED); |
1783 | CLEAR_FLAG (op, FLAG_REMOVED); |
1802 | break; |
1784 | break; |
1803 | } |
1785 | } |
1804 | |
1786 | |
1805 | /* I assume combined objects have no inventory |
1787 | /* I assume combined objects have no inventory |
1806 | * We add the weight - this object could have just been removed |
1788 | * We add the weight - this object could have just been removed |
1807 | * (if it was possible to merge). calling remove_ob will subtract |
1789 | * (if it was possible to merge). calling remove_ob will subtract |
1808 | * the weight, so we need to add it in again, since we actually do |
1790 | * the weight, so we need to add it in again, since we actually do |
1809 | * the linking below |
1791 | * the linking below |
1810 | */ |
1792 | */ |
1811 | add_weight (where, op->weight * op->nrof); |
1793 | add_weight (this, op->weight * op->nrof); |
1812 | } |
1794 | } |
1813 | else |
1795 | else |
1814 | add_weight (where, (op->weight + op->carrying)); |
1796 | add_weight (this, (op->weight + op->carrying)); |
1815 | |
1797 | |
1816 | otmp = is_player_inv (where); |
1798 | otmp = is_player_inv (this); |
1817 | if (otmp && otmp->contr != NULL) |
1799 | if (otmp && otmp->contr) |
1818 | { |
|
|
1819 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1800 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1820 | fix_player (otmp); |
1801 | fix_player (otmp); |
1821 | } |
|
|
1822 | |
1802 | |
1823 | op->map = NULL; |
1803 | op->map = NULL; |
1824 | op->env = where; |
1804 | op->env = this; |
1825 | op->above = NULL; |
1805 | op->above = NULL; |
1826 | op->below = NULL; |
1806 | op->below = NULL; |
1827 | op->x = 0, op->y = 0; |
1807 | op->x = 0, op->y = 0; |
1828 | |
1808 | |
1829 | /* reset the light list and los of the players on the map */ |
1809 | /* reset the light list and los of the players on the map */ |
1830 | if ((op->glow_radius != 0) && where->map) |
1810 | if ((op->glow_radius != 0) && map) |
1831 | { |
1811 | { |
1832 | #ifdef DEBUG_LIGHTS |
1812 | #ifdef DEBUG_LIGHTS |
1833 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1813 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1834 | #endif /* DEBUG_LIGHTS */ |
1814 | #endif /* DEBUG_LIGHTS */ |
1835 | if (MAP_DARKNESS (where->map)) |
1815 | if (MAP_DARKNESS (map)) |
1836 | update_all_los (where->map, where->x, where->y); |
1816 | update_all_los (map, x, y); |
1837 | } |
1817 | } |
1838 | |
1818 | |
1839 | /* Client has no idea of ordering so lets not bother ordering it here. |
1819 | /* Client has no idea of ordering so lets not bother ordering it here. |
1840 | * It sure simplifies this function... |
1820 | * It sure simplifies this function... |
1841 | */ |
1821 | */ |
1842 | if (where->inv == NULL) |
1822 | if (!inv) |
1843 | where->inv = op; |
1823 | inv = op; |
1844 | else |
1824 | else |
1845 | { |
1825 | { |
1846 | op->below = where->inv; |
1826 | op->below = inv; |
1847 | op->below->above = op; |
1827 | op->below->above = op; |
1848 | where->inv = op; |
1828 | inv = op; |
1849 | } |
1829 | } |
|
|
1830 | |
1850 | return op; |
1831 | return op; |
1851 | } |
1832 | } |
1852 | |
1833 | |
1853 | /* |
1834 | /* |
1854 | * Checks if any objects has a move_type that matches objects |
1835 | * Checks if any objects has a move_type that matches objects |