… | |
… | |
553 | |
553 | |
554 | op2->clone (op); |
554 | op2->clone (op); |
555 | |
555 | |
556 | if (is_freed) |
556 | if (is_freed) |
557 | SET_FLAG (op, FLAG_FREED); |
557 | SET_FLAG (op, FLAG_FREED); |
|
|
558 | |
558 | if (is_removed) |
559 | if (is_removed) |
559 | SET_FLAG (op, FLAG_REMOVED); |
560 | SET_FLAG (op, FLAG_REMOVED); |
560 | |
561 | |
561 | if (op2->speed < 0) |
562 | if (op2->speed < 0) |
562 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
563 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
… | |
… | |
804 | update_now = 1; |
805 | update_now = 1; |
805 | |
806 | |
806 | if ((move_slow | op->move_slow) != move_slow) |
807 | if ((move_slow | op->move_slow) != move_slow) |
807 | update_now = 1; |
808 | update_now = 1; |
808 | } |
809 | } |
|
|
810 | |
809 | /* if the object is being removed, we can't make intelligent |
811 | /* if the object is being removed, we can't make intelligent |
810 | * decisions, because remove_ob can't really pass the object |
812 | * decisions, because remove_ob can't really pass the object |
811 | * that is being removed. |
813 | * that is being removed. |
812 | */ |
814 | */ |
813 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
815 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
839 | else |
841 | else |
840 | { |
842 | { |
841 | delete *i; |
843 | delete *i; |
842 | mortals.erase (i); |
844 | mortals.erase (i); |
843 | } |
845 | } |
844 | |
|
|
845 | static int lastmortals = 0;//D |
|
|
846 | |
|
|
847 | if (mortals.size() != lastmortals && lastmortals > 100)//D |
|
|
848 | { |
|
|
849 | lastmortals = mortals.size ();//D |
|
|
850 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
851 | } |
|
|
852 | } |
846 | } |
853 | |
847 | |
854 | object::object () |
848 | object::object () |
855 | { |
849 | { |
856 | SET_FLAG (this, FLAG_REMOVED); |
850 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
918 | |
912 | |
919 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
913 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
920 | remove_ob (this); |
914 | remove_ob (this); |
921 | |
915 | |
922 | SET_FLAG (this, FLAG_FREED); |
916 | SET_FLAG (this, FLAG_FREED); |
923 | |
|
|
924 | // hack to ensure that freed objects still have a valid map |
|
|
925 | { |
|
|
926 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
927 | |
|
|
928 | if (!freed_map) |
|
|
929 | { |
|
|
930 | freed_map = get_empty_map (3, 3); |
|
|
931 | freed_map->name = "freed objects map"; |
|
|
932 | allocate_map (freed_map); |
|
|
933 | } |
|
|
934 | |
|
|
935 | map = freed_map; |
|
|
936 | x = 1; |
|
|
937 | y = 1; |
|
|
938 | } |
|
|
939 | |
917 | |
940 | if (more) |
918 | if (more) |
941 | { |
919 | { |
942 | more->destroy (destroy_inventory); |
920 | more->destroy (destroy_inventory); |
943 | more = 0; |
921 | more = 0; |
… | |
… | |
983 | op = tmp; |
961 | op = tmp; |
984 | } |
962 | } |
985 | } |
963 | } |
986 | } |
964 | } |
987 | |
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 | |
988 | // clear those pointers that likely might have circular references to us |
986 | // clear those pointers that likely might have circular references to us |
989 | owner = 0; |
987 | owner = 0; |
990 | enemy = 0; |
988 | enemy = 0; |
991 | attacked_by = 0; |
989 | attacked_by = 0; |
992 | |
990 | |
… | |
… | |
1004 | |
1002 | |
1005 | /* |
1003 | /* |
1006 | * sub_weight() recursively (outwards) subtracts a number from the |
1004 | * sub_weight() recursively (outwards) subtracts a number from the |
1007 | * 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)). |
1008 | */ |
1006 | */ |
1009 | |
|
|
1010 | void |
1007 | void |
1011 | sub_weight (object *op, signed long weight) |
1008 | sub_weight (object *op, signed long weight) |
1012 | { |
1009 | { |
1013 | while (op != NULL) |
1010 | while (op != NULL) |
1014 | { |
1011 | { |
… | |
… | |
1026 | * object will have no environment. If the object previously had an |
1023 | * object will have no environment. If the object previously had an |
1027 | * environment, the x and y coordinates will be updated to |
1024 | * environment, the x and y coordinates will be updated to |
1028 | * the previous environment. |
1025 | * the previous environment. |
1029 | * Beware: This function is called from the editor as well! |
1026 | * Beware: This function is called from the editor as well! |
1030 | */ |
1027 | */ |
1031 | |
|
|
1032 | void |
1028 | void |
1033 | remove_ob (object *op) |
1029 | object::remove () |
1034 | { |
1030 | { |
1035 | object *tmp, *last = 0; |
1031 | object *tmp, *last = 0; |
1036 | object *otmp; |
1032 | object *otmp; |
1037 | |
1033 | |
1038 | int check_walk_off; |
1034 | int check_walk_off; |
1039 | maptile *m; |
|
|
1040 | |
1035 | |
1041 | sint16 x, y; |
|
|
1042 | |
|
|
1043 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1036 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1044 | return; |
1037 | return; |
1045 | |
1038 | |
1046 | SET_FLAG (op, FLAG_REMOVED); |
1039 | SET_FLAG (this, FLAG_REMOVED); |
1047 | |
1040 | |
1048 | if (op->more != NULL) |
1041 | if (more) |
1049 | remove_ob (op->more); |
1042 | more->remove (); |
1050 | |
1043 | |
1051 | /* |
1044 | /* |
1052 | * In this case, the object to be removed is in someones |
1045 | * In this case, the object to be removed is in someones |
1053 | * inventory. |
1046 | * inventory. |
1054 | */ |
1047 | */ |
1055 | if (op->env != NULL) |
1048 | if (env) |
1056 | { |
1049 | { |
1057 | if (op->nrof) |
1050 | if (nrof) |
1058 | sub_weight (op->env, op->weight * op->nrof); |
1051 | sub_weight (env, weight * nrof); |
1059 | else |
1052 | else |
1060 | sub_weight (op->env, op->weight + op->carrying); |
1053 | sub_weight (env, weight + carrying); |
1061 | |
1054 | |
1062 | /* 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 |
1063 | * made to players inventory. If set, avoiding the call |
1056 | * made to players inventory. If set, avoiding the call |
1064 | * to save cpu time. |
1057 | * to save cpu time. |
1065 | */ |
1058 | */ |
1066 | 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)) |
1067 | fix_player (otmp); |
1060 | fix_player (otmp); |
1068 | |
1061 | |
1069 | if (op->above != NULL) |
1062 | if (above != NULL) |
1070 | op->above->below = op->below; |
1063 | above->below = below; |
1071 | else |
1064 | else |
1072 | op->env->inv = op->below; |
1065 | env->inv = below; |
1073 | |
1066 | |
1074 | if (op->below != NULL) |
1067 | if (below != NULL) |
1075 | op->below->above = op->above; |
1068 | below->above = above; |
1076 | |
1069 | |
1077 | /* we set up values so that it could be inserted into |
1070 | /* we set up values so that it could be inserted into |
1078 | * 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 |
1079 | * to the caller to decide what we want to do. |
1072 | * to the caller to decide what we want to do. |
1080 | */ |
1073 | */ |
1081 | op->x = op->env->x, op->y = op->env->y; |
1074 | x = env->x, y = env->y; |
1082 | op->map = op->env->map; |
1075 | map = env->map; |
1083 | op->above = NULL, op->below = NULL; |
1076 | above = 0, below = 0; |
1084 | op->env = NULL; |
1077 | env = 0; |
1085 | } |
1078 | } |
1086 | else if (op->map) |
1079 | else if (map) |
1087 | { |
1080 | { |
1088 | x = op->x; |
|
|
1089 | y = op->y; |
|
|
1090 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1091 | |
|
|
1092 | if (!m) |
|
|
1093 | { |
|
|
1094 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1095 | op->map->path, op->x, op->y); |
|
|
1096 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1097 | * it seems if we get into this case, something is probablye |
|
|
1098 | * screwed up and should be fixed. |
|
|
1099 | */ |
|
|
1100 | abort (); |
|
|
1101 | } |
|
|
1102 | |
|
|
1103 | if (op->map != m) |
|
|
1104 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1105 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1106 | |
|
|
1107 | /* 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 |
1108 | * lots of logic for things we no longer care about |
1082 | * lots of logic for things we no longer care about |
1109 | */ |
1083 | */ |
1110 | |
1084 | |
1111 | /* link the object above us */ |
1085 | /* link the object above us */ |
1112 | if (op->above) |
1086 | if (above) |
1113 | op->above->below = op->below; |
1087 | above->below = below; |
1114 | else |
1088 | else |
1115 | 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 */ |
1116 | |
1090 | |
1117 | /* Relink the object below us, if there is one */ |
1091 | /* Relink the object below us, if there is one */ |
1118 | if (op->below) |
1092 | if (below) |
1119 | op->below->above = op->above; |
1093 | below->above = above; |
1120 | else |
1094 | else |
1121 | { |
1095 | { |
1122 | /* 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 |
1123 | * use translated coordinates in case some oddness with map tiling is |
1097 | * use translated coordinates in case some oddness with map tiling is |
1124 | * evident |
1098 | * evident |
1125 | */ |
1099 | */ |
1126 | if (GET_MAP_OB (m, x, y) != op) |
1100 | if (GET_MAP_OB (map, x, y) != this) |
1127 | { |
1101 | { |
1128 | char *dump = dump_object (op); |
1102 | char *dump = dump_object (this); |
1129 | LOG (llevError, |
1103 | LOG (llevError, |
1130 | "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); |
1131 | free (dump); |
1105 | free (dump); |
1132 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1106 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1133 | LOG (llevError, "%s\n", dump); |
1107 | LOG (llevError, "%s\n", dump); |
1134 | free (dump); |
1108 | free (dump); |
1135 | } |
1109 | } |
1136 | |
1110 | |
1137 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1111 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1138 | } |
1112 | } |
1139 | |
1113 | |
1140 | op->above = 0; |
1114 | above = 0; |
1141 | op->below = 0; |
1115 | below = 0; |
1142 | |
1116 | |
1143 | if (op->map->in_memory == MAP_SAVING) |
1117 | if (map->in_memory == MAP_SAVING) |
1144 | return; |
1118 | return; |
1145 | |
1119 | |
1146 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1120 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1147 | |
1121 | |
1148 | 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) |
1149 | { |
1123 | { |
1150 | /* 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 |
1151 | * being removed. |
1125 | * being removed. |
1152 | */ |
1126 | */ |
1153 | |
1127 | |
1154 | if (tmp->type == PLAYER && tmp != op) |
1128 | if (tmp->type == PLAYER && tmp != this) |
1155 | { |
1129 | { |
1156 | /* If a container that the player is currently using somehow gets |
1130 | /* If a container that the player is currently using somehow gets |
1157 | * removed (most likely destroyed), update the player view |
1131 | * removed (most likely destroyed), update the player view |
1158 | * appropriately. |
1132 | * appropriately. |
1159 | */ |
1133 | */ |
1160 | if (tmp->container == op) |
1134 | if (tmp->container == this) |
1161 | { |
1135 | { |
1162 | CLEAR_FLAG (op, FLAG_APPLIED); |
1136 | CLEAR_FLAG (this, FLAG_APPLIED); |
1163 | tmp->container = NULL; |
1137 | tmp->container = 0; |
1164 | } |
1138 | } |
1165 | |
1139 | |
1166 | tmp->contr->socket.update_look = 1; |
1140 | tmp->contr->socket.update_look = 1; |
1167 | } |
1141 | } |
1168 | |
1142 | |
1169 | /* See if player moving off should effect something */ |
1143 | /* See if player moving off should effect something */ |
1170 | if (check_walk_off |
1144 | if (check_walk_off |
1171 | && ((op->move_type & tmp->move_off) |
1145 | && ((move_type & tmp->move_off) |
1172 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1146 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1173 | { |
1147 | { |
1174 | move_apply (tmp, op, NULL); |
1148 | move_apply (tmp, this, 0); |
1175 | |
1149 | |
1176 | if (op->destroyed ()) |
1150 | if (destroyed ()) |
1177 | 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 ()); |
1178 | } |
1152 | } |
1179 | |
1153 | |
1180 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1154 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1181 | |
1155 | |
1182 | if (tmp->above == tmp) |
1156 | if (tmp->above == tmp) |
1183 | tmp->above = NULL; |
1157 | tmp->above = 0; |
1184 | |
1158 | |
1185 | last = tmp; |
1159 | last = tmp; |
1186 | } |
1160 | } |
1187 | |
1161 | |
1188 | /* last == NULL of there are no objects on this space */ |
1162 | /* last == NULL of there are no objects on this space */ |
1189 | if (last == NULL) |
1163 | if (!last) |
1190 | { |
1164 | { |
1191 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1165 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1192 | * 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 |
1193 | * 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 |
1194 | * be correct anyways. |
1168 | * be correct anyways. |
1195 | */ |
1169 | */ |
1196 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1170 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1197 | update_position (op->map, op->x, op->y); |
1171 | update_position (map, x, y); |
1198 | } |
1172 | } |
1199 | else |
1173 | else |
1200 | update_object (last, UP_OBJ_REMOVE); |
1174 | update_object (last, UP_OBJ_REMOVE); |
1201 | |
1175 | |
1202 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1176 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1203 | update_all_los (op->map, op->x, op->y); |
1177 | update_all_los (map, x, y); |
1204 | } |
1178 | } |
1205 | } |
1179 | } |
1206 | |
1180 | |
1207 | /* |
1181 | /* |
1208 | * merge_ob(op,top): |
1182 | * merge_ob(op,top): |
… | |
… | |
1743 | op->carrying += weight; |
1717 | op->carrying += weight; |
1744 | op = op->env; |
1718 | op = op->env; |
1745 | } |
1719 | } |
1746 | } |
1720 | } |
1747 | |
1721 | |
1748 | /* |
|
|
1749 | * insert_ob_in_ob(op,environment): |
|
|
1750 | * This function inserts the object op in the linked list |
|
|
1751 | * inside the object environment. |
|
|
1752 | * |
|
|
1753 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1754 | * the inventory at the last position or next to other objects of the same |
|
|
1755 | * type. |
|
|
1756 | * Frank: Now sorted by type, archetype and magic! |
|
|
1757 | * |
|
|
1758 | * The function returns now pointer to inserted item, and return value can |
|
|
1759 | * be != op, if items are merged. -Tero |
|
|
1760 | */ |
|
|
1761 | |
|
|
1762 | object * |
1722 | object * |
1763 | insert_ob_in_ob (object *op, object *where) |
1723 | insert_ob_in_ob (object *op, object *where) |
1764 | { |
1724 | { |
1765 | object * |
1725 | if (!where) |
1766 | tmp, * |
|
|
1767 | otmp; |
|
|
1768 | |
|
|
1769 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1770 | { |
|
|
1771 | char *dump = dump_object (op); |
|
|
1772 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); |
|
|
1773 | free (dump); |
|
|
1774 | return op; |
|
|
1775 | } |
|
|
1776 | |
|
|
1777 | if (where == NULL) |
|
|
1778 | { |
1726 | { |
1779 | char *dump = dump_object (op); |
1727 | char *dump = dump_object (op); |
1780 | 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); |
1781 | free (dump); |
1729 | free (dump); |
1782 | return op; |
1730 | return op; |
1783 | } |
1731 | } |
1784 | |
1732 | |
1785 | if (where->head) |
1733 | if (where->head) |
1786 | { |
1734 | { |
1787 | 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"); |
1788 | where = where->head; |
1736 | where = where->head; |
1789 | } |
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 (); |
1790 | |
1758 | |
1791 | if (op->more) |
1759 | if (op->more) |
1792 | { |
1760 | { |
1793 | 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); |
1794 | return op; |
1762 | return op; |
… | |
… | |
1796 | |
1764 | |
1797 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1765 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1798 | CLEAR_FLAG (op, FLAG_REMOVED); |
1766 | CLEAR_FLAG (op, FLAG_REMOVED); |
1799 | if (op->nrof) |
1767 | if (op->nrof) |
1800 | { |
1768 | { |
1801 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1769 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1802 | if (CAN_MERGE (tmp, op)) |
1770 | if (CAN_MERGE (tmp, op)) |
1803 | { |
1771 | { |
1804 | /* return the original object and remove inserted object |
1772 | /* return the original object and remove inserted object |
1805 | (client needs the original object) */ |
1773 | (client needs the original object) */ |
1806 | tmp->nrof += op->nrof; |
1774 | tmp->nrof += op->nrof; |
1807 | /* Weight handling gets pretty funky. Since we are adding to |
1775 | /* Weight handling gets pretty funky. Since we are adding to |
1808 | * tmp->nrof, we need to increase the weight. |
1776 | * tmp->nrof, we need to increase the weight. |
1809 | */ |
1777 | */ |
1810 | add_weight (where, op->weight * op->nrof); |
1778 | add_weight (this, op->weight * op->nrof); |
1811 | SET_FLAG (op, FLAG_REMOVED); |
1779 | SET_FLAG (op, FLAG_REMOVED); |
1812 | free_object (op); /* free the inserted object */ |
1780 | op->destroy (); /* free the inserted object */ |
1813 | op = tmp; |
1781 | op = tmp; |
1814 | remove_ob (op); /* and fix old object's links */ |
1782 | op->remove (); /* and fix old object's links */ |
1815 | CLEAR_FLAG (op, FLAG_REMOVED); |
1783 | CLEAR_FLAG (op, FLAG_REMOVED); |
1816 | break; |
1784 | break; |
1817 | } |
1785 | } |
1818 | |
1786 | |
1819 | /* I assume combined objects have no inventory |
1787 | /* I assume combined objects have no inventory |
1820 | * We add the weight - this object could have just been removed |
1788 | * We add the weight - this object could have just been removed |
1821 | * (if it was possible to merge). calling remove_ob will subtract |
1789 | * (if it was possible to merge). calling remove_ob will subtract |
1822 | * 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 |
1823 | * the linking below |
1791 | * the linking below |
1824 | */ |
1792 | */ |
1825 | add_weight (where, op->weight * op->nrof); |
1793 | add_weight (this, op->weight * op->nrof); |
1826 | } |
1794 | } |
1827 | else |
1795 | else |
1828 | add_weight (where, (op->weight + op->carrying)); |
1796 | add_weight (this, (op->weight + op->carrying)); |
1829 | |
1797 | |
1830 | otmp = is_player_inv (where); |
1798 | otmp = is_player_inv (this); |
1831 | if (otmp && otmp->contr != NULL) |
1799 | if (otmp && otmp->contr) |
1832 | { |
|
|
1833 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1800 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1834 | fix_player (otmp); |
1801 | fix_player (otmp); |
1835 | } |
|
|
1836 | |
1802 | |
1837 | op->map = NULL; |
1803 | op->map = NULL; |
1838 | op->env = where; |
1804 | op->env = this; |
1839 | op->above = NULL; |
1805 | op->above = NULL; |
1840 | op->below = NULL; |
1806 | op->below = NULL; |
1841 | op->x = 0, op->y = 0; |
1807 | op->x = 0, op->y = 0; |
1842 | |
1808 | |
1843 | /* 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 */ |
1844 | if ((op->glow_radius != 0) && where->map) |
1810 | if ((op->glow_radius != 0) && map) |
1845 | { |
1811 | { |
1846 | #ifdef DEBUG_LIGHTS |
1812 | #ifdef DEBUG_LIGHTS |
1847 | 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); |
1848 | #endif /* DEBUG_LIGHTS */ |
1814 | #endif /* DEBUG_LIGHTS */ |
1849 | if (MAP_DARKNESS (where->map)) |
1815 | if (MAP_DARKNESS (map)) |
1850 | update_all_los (where->map, where->x, where->y); |
1816 | update_all_los (map, x, y); |
1851 | } |
1817 | } |
1852 | |
1818 | |
1853 | /* 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. |
1854 | * It sure simplifies this function... |
1820 | * It sure simplifies this function... |
1855 | */ |
1821 | */ |
1856 | if (where->inv == NULL) |
1822 | if (!inv) |
1857 | where->inv = op; |
1823 | inv = op; |
1858 | else |
1824 | else |
1859 | { |
1825 | { |
1860 | op->below = where->inv; |
1826 | op->below = inv; |
1861 | op->below->above = op; |
1827 | op->below->above = op; |
1862 | where->inv = op; |
1828 | inv = op; |
1863 | } |
1829 | } |
|
|
1830 | |
1864 | return op; |
1831 | return op; |
1865 | } |
1832 | } |
1866 | |
1833 | |
1867 | /* |
1834 | /* |
1868 | * Checks if any objects has a move_type that matches objects |
1835 | * Checks if any objects has a move_type that matches objects |