… | |
… | |
104 | _exit (1); |
104 | _exit (1); |
105 | } |
105 | } |
106 | |
106 | |
107 | uuid.seq = uid; |
107 | uuid.seq = uid; |
108 | write_uuid (); |
108 | write_uuid (); |
109 | LOG (llevDebug, "read UID: %lld\n", uid); |
109 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
110 | fclose (fp); |
110 | fclose (fp); |
111 | } |
111 | } |
112 | |
112 | |
113 | UUID |
113 | UUID |
114 | gen_uuid () |
114 | gen_uuid () |
… | |
… | |
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); |
… | |
… | |
915 | |
909 | |
916 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
910 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
917 | remove_friendly_object (this); |
911 | remove_friendly_object (this); |
918 | |
912 | |
919 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
913 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
920 | remove_ob (this); |
914 | remove (); |
921 | |
915 | |
922 | SET_FLAG (this, FLAG_FREED); |
916 | SET_FLAG (this, FLAG_FREED); |
923 | |
917 | |
924 | if (more) |
918 | if (more) |
925 | { |
919 | { |
… | |
… | |
950 | |
944 | |
951 | while (op) |
945 | while (op) |
952 | { |
946 | { |
953 | object *tmp = op->below; |
947 | object *tmp = op->below; |
954 | |
948 | |
955 | remove_ob (op); |
949 | op->remove (); |
956 | |
950 | |
957 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
951 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
958 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
952 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
959 | free_object (op); |
953 | op->destroy (0); |
960 | else |
954 | else |
961 | { |
955 | { |
962 | op->x = x; |
956 | op->x = x; |
963 | op->y = y; |
957 | op->y = y; |
964 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
958 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
967 | op = tmp; |
961 | op = tmp; |
968 | } |
962 | } |
969 | } |
963 | } |
970 | } |
964 | } |
971 | |
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 | |
972 | // clear those pointers that likely might have circular references to us |
986 | // clear those pointers that likely might have circular references to us |
973 | owner = 0; |
987 | owner = 0; |
974 | enemy = 0; |
988 | enemy = 0; |
975 | attacked_by = 0; |
989 | attacked_by = 0; |
976 | |
990 | |
… | |
… | |
988 | |
1002 | |
989 | /* |
1003 | /* |
990 | * sub_weight() recursively (outwards) subtracts a number from the |
1004 | * sub_weight() recursively (outwards) subtracts a number from the |
991 | * 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)). |
992 | */ |
1006 | */ |
993 | |
|
|
994 | void |
1007 | void |
995 | sub_weight (object *op, signed long weight) |
1008 | sub_weight (object *op, signed long weight) |
996 | { |
1009 | { |
997 | while (op != NULL) |
1010 | while (op != NULL) |
998 | { |
1011 | { |
… | |
… | |
1002 | op->carrying -= weight; |
1015 | op->carrying -= weight; |
1003 | op = op->env; |
1016 | op = op->env; |
1004 | } |
1017 | } |
1005 | } |
1018 | } |
1006 | |
1019 | |
1007 | /* remove_ob(op): |
1020 | /* op->remove (): |
1008 | * This function removes the object op from the linked list of objects |
1021 | * This function removes the object op from the linked list of objects |
1009 | * which it is currently tied to. When this function is done, the |
1022 | * which it is currently tied to. When this function is done, the |
1010 | * object will have no environment. If the object previously had an |
1023 | * object will have no environment. If the object previously had an |
1011 | * environment, the x and y coordinates will be updated to |
1024 | * environment, the x and y coordinates will be updated to |
1012 | * the previous environment. |
1025 | * the previous environment. |
1013 | * Beware: This function is called from the editor as well! |
1026 | * Beware: This function is called from the editor as well! |
1014 | */ |
1027 | */ |
1015 | |
|
|
1016 | void |
1028 | void |
1017 | remove_ob (object *op) |
1029 | object::remove () |
1018 | { |
1030 | { |
1019 | object *tmp, *last = 0; |
1031 | object *tmp, *last = 0; |
1020 | object *otmp; |
1032 | object *otmp; |
1021 | |
1033 | |
1022 | int check_walk_off; |
1034 | int check_walk_off; |
1023 | maptile *m; |
|
|
1024 | |
1035 | |
1025 | sint16 x, y; |
|
|
1026 | |
|
|
1027 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1036 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1028 | return; |
1037 | return; |
1029 | |
1038 | |
1030 | SET_FLAG (op, FLAG_REMOVED); |
1039 | SET_FLAG (this, FLAG_REMOVED); |
1031 | |
1040 | |
1032 | if (op->more != NULL) |
1041 | if (more) |
1033 | remove_ob (op->more); |
1042 | more->remove (); |
1034 | |
1043 | |
1035 | /* |
1044 | /* |
1036 | * In this case, the object to be removed is in someones |
1045 | * In this case, the object to be removed is in someones |
1037 | * inventory. |
1046 | * inventory. |
1038 | */ |
1047 | */ |
1039 | if (op->env != NULL) |
1048 | if (env) |
1040 | { |
1049 | { |
1041 | if (op->nrof) |
1050 | if (nrof) |
1042 | sub_weight (op->env, op->weight * op->nrof); |
1051 | sub_weight (env, weight * nrof); |
1043 | else |
1052 | else |
1044 | sub_weight (op->env, op->weight + op->carrying); |
1053 | sub_weight (env, weight + carrying); |
1045 | |
1054 | |
1046 | /* 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 |
1047 | * made to players inventory. If set, avoiding the call |
1056 | * made to players inventory. If set, avoiding the call |
1048 | * to save cpu time. |
1057 | * to save cpu time. |
1049 | */ |
1058 | */ |
1050 | 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)) |
1051 | fix_player (otmp); |
1060 | fix_player (otmp); |
1052 | |
1061 | |
1053 | if (op->above != NULL) |
1062 | if (above != NULL) |
1054 | op->above->below = op->below; |
1063 | above->below = below; |
1055 | else |
1064 | else |
1056 | op->env->inv = op->below; |
1065 | env->inv = below; |
1057 | |
1066 | |
1058 | if (op->below != NULL) |
1067 | if (below != NULL) |
1059 | op->below->above = op->above; |
1068 | below->above = above; |
1060 | |
1069 | |
1061 | /* we set up values so that it could be inserted into |
1070 | /* we set up values so that it could be inserted into |
1062 | * 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 |
1063 | * to the caller to decide what we want to do. |
1072 | * to the caller to decide what we want to do. |
1064 | */ |
1073 | */ |
1065 | op->x = op->env->x, op->y = op->env->y; |
1074 | x = env->x, y = env->y; |
1066 | op->map = op->env->map; |
1075 | map = env->map; |
1067 | op->above = NULL, op->below = NULL; |
1076 | above = 0, below = 0; |
1068 | op->env = NULL; |
1077 | env = 0; |
1069 | } |
1078 | } |
1070 | else if (op->map) |
1079 | else if (map) |
1071 | { |
1080 | { |
1072 | x = op->x; |
|
|
1073 | y = op->y; |
|
|
1074 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1075 | |
|
|
1076 | if (!m) |
|
|
1077 | { |
|
|
1078 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1079 | op->map->path, op->x, op->y); |
|
|
1080 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1081 | * it seems if we get into this case, something is probablye |
|
|
1082 | * screwed up and should be fixed. |
|
|
1083 | */ |
|
|
1084 | abort (); |
|
|
1085 | } |
|
|
1086 | |
|
|
1087 | if (op->map != m) |
|
|
1088 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1089 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1090 | |
|
|
1091 | /* 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 |
1092 | * lots of logic for things we no longer care about |
1082 | * lots of logic for things we no longer care about |
1093 | */ |
1083 | */ |
1094 | |
1084 | |
1095 | /* link the object above us */ |
1085 | /* link the object above us */ |
1096 | if (op->above) |
1086 | if (above) |
1097 | op->above->below = op->below; |
1087 | above->below = below; |
1098 | else |
1088 | else |
1099 | 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 */ |
1100 | |
1090 | |
1101 | /* Relink the object below us, if there is one */ |
1091 | /* Relink the object below us, if there is one */ |
1102 | if (op->below) |
1092 | if (below) |
1103 | op->below->above = op->above; |
1093 | below->above = above; |
1104 | else |
1094 | else |
1105 | { |
1095 | { |
1106 | /* 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 |
1107 | * use translated coordinates in case some oddness with map tiling is |
1097 | * use translated coordinates in case some oddness with map tiling is |
1108 | * evident |
1098 | * evident |
1109 | */ |
1099 | */ |
1110 | if (GET_MAP_OB (m, x, y) != op) |
1100 | if (GET_MAP_OB (map, x, y) != this) |
1111 | { |
1101 | { |
1112 | char *dump = dump_object (op); |
1102 | char *dump = dump_object (this); |
1113 | LOG (llevError, |
1103 | LOG (llevError, |
1114 | "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); |
1115 | free (dump); |
1105 | free (dump); |
1116 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1106 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1117 | LOG (llevError, "%s\n", dump); |
1107 | LOG (llevError, "%s\n", dump); |
1118 | free (dump); |
1108 | free (dump); |
1119 | } |
1109 | } |
1120 | |
1110 | |
1121 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1111 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1122 | } |
1112 | } |
1123 | |
1113 | |
1124 | op->above = 0; |
1114 | above = 0; |
1125 | op->below = 0; |
1115 | below = 0; |
1126 | |
1116 | |
1127 | if (op->map->in_memory == MAP_SAVING) |
1117 | if (map->in_memory == MAP_SAVING) |
1128 | return; |
1118 | return; |
1129 | |
1119 | |
1130 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1120 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1131 | |
1121 | |
1132 | 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) |
1133 | { |
1123 | { |
1134 | /* 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 |
1135 | * being removed. |
1125 | * being removed. |
1136 | */ |
1126 | */ |
1137 | |
1127 | |
1138 | if (tmp->type == PLAYER && tmp != op) |
1128 | if (tmp->type == PLAYER && tmp != this) |
1139 | { |
1129 | { |
1140 | /* If a container that the player is currently using somehow gets |
1130 | /* If a container that the player is currently using somehow gets |
1141 | * removed (most likely destroyed), update the player view |
1131 | * removed (most likely destroyed), update the player view |
1142 | * appropriately. |
1132 | * appropriately. |
1143 | */ |
1133 | */ |
1144 | if (tmp->container == op) |
1134 | if (tmp->container == this) |
1145 | { |
1135 | { |
1146 | CLEAR_FLAG (op, FLAG_APPLIED); |
1136 | CLEAR_FLAG (this, FLAG_APPLIED); |
1147 | tmp->container = NULL; |
1137 | tmp->container = 0; |
1148 | } |
1138 | } |
1149 | |
1139 | |
1150 | tmp->contr->socket.update_look = 1; |
1140 | tmp->contr->socket.update_look = 1; |
1151 | } |
1141 | } |
1152 | |
1142 | |
1153 | /* See if player moving off should effect something */ |
1143 | /* See if player moving off should effect something */ |
1154 | if (check_walk_off |
1144 | if (check_walk_off |
1155 | && ((op->move_type & tmp->move_off) |
1145 | && ((move_type & tmp->move_off) |
1156 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1146 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1157 | { |
1147 | { |
1158 | move_apply (tmp, op, NULL); |
1148 | move_apply (tmp, this, 0); |
1159 | |
1149 | |
1160 | if (op->destroyed ()) |
1150 | if (destroyed ()) |
1161 | 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 ()); |
1162 | } |
1152 | } |
1163 | |
1153 | |
1164 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1154 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1165 | |
1155 | |
1166 | if (tmp->above == tmp) |
1156 | if (tmp->above == tmp) |
1167 | tmp->above = NULL; |
1157 | tmp->above = 0; |
1168 | |
1158 | |
1169 | last = tmp; |
1159 | last = tmp; |
1170 | } |
1160 | } |
1171 | |
1161 | |
1172 | /* last == NULL of there are no objects on this space */ |
1162 | /* last == NULL of there are no objects on this space */ |
1173 | if (last == NULL) |
1163 | if (!last) |
1174 | { |
1164 | { |
1175 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1165 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1176 | * 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 |
1177 | * 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 |
1178 | * be correct anyways. |
1168 | * be correct anyways. |
1179 | */ |
1169 | */ |
1180 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1170 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1181 | update_position (op->map, op->x, op->y); |
1171 | update_position (map, x, y); |
1182 | } |
1172 | } |
1183 | else |
1173 | else |
1184 | update_object (last, UP_OBJ_REMOVE); |
1174 | update_object (last, UP_OBJ_REMOVE); |
1185 | |
1175 | |
1186 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1176 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1187 | update_all_los (op->map, op->x, op->y); |
1177 | update_all_los (map, x, y); |
1188 | } |
1178 | } |
1189 | } |
1179 | } |
1190 | |
1180 | |
1191 | /* |
1181 | /* |
1192 | * merge_ob(op,top): |
1182 | * merge_ob(op,top): |
… | |
… | |
1213 | { |
1203 | { |
1214 | top->nrof += op->nrof; |
1204 | top->nrof += op->nrof; |
1215 | |
1205 | |
1216 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1206 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1217 | op->weight = 0; /* Don't want any adjustements now */ |
1207 | op->weight = 0; /* Don't want any adjustements now */ |
1218 | remove_ob (op); |
1208 | op->remove (); |
1219 | free_object (op); |
1209 | op->destroy (0); |
1220 | return top; |
1210 | return top; |
1221 | } |
1211 | } |
1222 | } |
1212 | } |
1223 | |
1213 | |
1224 | return 0; |
1214 | return 0; |
… | |
… | |
1354 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1344 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1355 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1345 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1356 | if (CAN_MERGE (op, tmp)) |
1346 | if (CAN_MERGE (op, tmp)) |
1357 | { |
1347 | { |
1358 | op->nrof += tmp->nrof; |
1348 | op->nrof += tmp->nrof; |
1359 | remove_ob (tmp); |
1349 | tmp->remove (); |
1360 | free_object (tmp); |
1350 | tmp->destroy (0); |
1361 | } |
1351 | } |
1362 | |
1352 | |
1363 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1353 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1364 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1354 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1365 | |
1355 | |
… | |
… | |
1554 | |
1544 | |
1555 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1545 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1556 | { |
1546 | { |
1557 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1547 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1558 | { |
1548 | { |
1559 | remove_ob (tmp); |
1549 | tmp->remove (); |
1560 | free_object (tmp); |
1550 | tmp->destroy (0); |
1561 | } |
1551 | } |
1562 | } |
1552 | } |
1563 | |
1553 | |
1564 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1554 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1565 | |
1555 | |
… | |
… | |
1591 | } |
1581 | } |
1592 | |
1582 | |
1593 | newob = object_create_clone (orig_ob); |
1583 | newob = object_create_clone (orig_ob); |
1594 | |
1584 | |
1595 | if ((orig_ob->nrof -= nr) < 1) |
1585 | if ((orig_ob->nrof -= nr) < 1) |
1596 | { |
1586 | orig_ob->destroy (1); |
1597 | if (!is_removed) |
|
|
1598 | remove_ob (orig_ob); |
|
|
1599 | free_object2 (orig_ob, 1); |
|
|
1600 | } |
|
|
1601 | else if (!is_removed) |
1587 | else if (!is_removed) |
1602 | { |
1588 | { |
1603 | if (orig_ob->env != NULL) |
1589 | if (orig_ob->env != NULL) |
1604 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1590 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1605 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1591 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1669 | esrv_send_item (tmp, op); |
1655 | esrv_send_item (tmp, op); |
1670 | } |
1656 | } |
1671 | } |
1657 | } |
1672 | else |
1658 | else |
1673 | { |
1659 | { |
1674 | remove_ob (op); |
1660 | op->remove (); |
1675 | op->nrof = 0; |
1661 | op->nrof = 0; |
1676 | if (tmp) |
1662 | if (tmp) |
1677 | { |
1663 | { |
1678 | esrv_del_item (tmp->contr, op->count); |
1664 | esrv_del_item (tmp->contr, op->count); |
1679 | } |
1665 | } |
… | |
… | |
1685 | |
1671 | |
1686 | if (i < op->nrof) |
1672 | if (i < op->nrof) |
1687 | op->nrof -= i; |
1673 | op->nrof -= i; |
1688 | else |
1674 | else |
1689 | { |
1675 | { |
1690 | remove_ob (op); |
1676 | op->remove (); |
1691 | op->nrof = 0; |
1677 | op->nrof = 0; |
1692 | } |
1678 | } |
1693 | |
1679 | |
1694 | /* Since we just removed op, op->above is null */ |
1680 | /* Since we just removed op, op->above is null */ |
1695 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1681 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
… | |
… | |
1704 | |
1690 | |
1705 | if (op->nrof) |
1691 | if (op->nrof) |
1706 | return op; |
1692 | return op; |
1707 | else |
1693 | else |
1708 | { |
1694 | { |
1709 | free_object (op); |
1695 | op->destroy (0); |
1710 | return NULL; |
1696 | return NULL; |
1711 | } |
1697 | } |
1712 | } |
1698 | } |
1713 | |
1699 | |
1714 | /* |
1700 | /* |
… | |
… | |
1727 | op->carrying += weight; |
1713 | op->carrying += weight; |
1728 | op = op->env; |
1714 | op = op->env; |
1729 | } |
1715 | } |
1730 | } |
1716 | } |
1731 | |
1717 | |
1732 | /* |
|
|
1733 | * insert_ob_in_ob(op,environment): |
|
|
1734 | * This function inserts the object op in the linked list |
|
|
1735 | * inside the object environment. |
|
|
1736 | * |
|
|
1737 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1738 | * the inventory at the last position or next to other objects of the same |
|
|
1739 | * type. |
|
|
1740 | * Frank: Now sorted by type, archetype and magic! |
|
|
1741 | * |
|
|
1742 | * The function returns now pointer to inserted item, and return value can |
|
|
1743 | * be != op, if items are merged. -Tero |
|
|
1744 | */ |
|
|
1745 | |
|
|
1746 | object * |
1718 | object * |
1747 | insert_ob_in_ob (object *op, object *where) |
1719 | insert_ob_in_ob (object *op, object *where) |
1748 | { |
1720 | { |
1749 | object * |
1721 | if (!where) |
1750 | tmp, * |
|
|
1751 | otmp; |
|
|
1752 | |
|
|
1753 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1754 | { |
|
|
1755 | char *dump = dump_object (op); |
|
|
1756 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); |
|
|
1757 | free (dump); |
|
|
1758 | return op; |
|
|
1759 | } |
|
|
1760 | |
|
|
1761 | if (where == NULL) |
|
|
1762 | { |
1722 | { |
1763 | char *dump = dump_object (op); |
1723 | char *dump = dump_object (op); |
1764 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1724 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1765 | free (dump); |
1725 | free (dump); |
1766 | return op; |
1726 | return op; |
1767 | } |
1727 | } |
1768 | |
1728 | |
1769 | if (where->head) |
1729 | if (where->head) |
1770 | { |
1730 | { |
1771 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1731 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1772 | where = where->head; |
1732 | where = where->head; |
1773 | } |
1733 | } |
|
|
1734 | |
|
|
1735 | return where->insert (op); |
|
|
1736 | } |
|
|
1737 | |
|
|
1738 | /* |
|
|
1739 | * env->insert (op) |
|
|
1740 | * This function inserts the object op in the linked list |
|
|
1741 | * inside the object environment. |
|
|
1742 | * |
|
|
1743 | * The function returns now pointer to inserted item, and return value can |
|
|
1744 | * be != op, if items are merged. -Tero |
|
|
1745 | */ |
|
|
1746 | |
|
|
1747 | object * |
|
|
1748 | object::insert (object *op) |
|
|
1749 | { |
|
|
1750 | object *tmp, *otmp; |
|
|
1751 | |
|
|
1752 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1753 | op->remove (); |
1774 | |
1754 | |
1775 | if (op->more) |
1755 | if (op->more) |
1776 | { |
1756 | { |
1777 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1757 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1778 | return op; |
1758 | return op; |
… | |
… | |
1780 | |
1760 | |
1781 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1761 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1782 | CLEAR_FLAG (op, FLAG_REMOVED); |
1762 | CLEAR_FLAG (op, FLAG_REMOVED); |
1783 | if (op->nrof) |
1763 | if (op->nrof) |
1784 | { |
1764 | { |
1785 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1765 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1786 | if (CAN_MERGE (tmp, op)) |
1766 | if (CAN_MERGE (tmp, op)) |
1787 | { |
1767 | { |
1788 | /* return the original object and remove inserted object |
1768 | /* return the original object and remove inserted object |
1789 | (client needs the original object) */ |
1769 | (client needs the original object) */ |
1790 | tmp->nrof += op->nrof; |
1770 | tmp->nrof += op->nrof; |
1791 | /* Weight handling gets pretty funky. Since we are adding to |
1771 | /* Weight handling gets pretty funky. Since we are adding to |
1792 | * tmp->nrof, we need to increase the weight. |
1772 | * tmp->nrof, we need to increase the weight. |
1793 | */ |
1773 | */ |
1794 | add_weight (where, op->weight * op->nrof); |
1774 | add_weight (this, op->weight * op->nrof); |
1795 | SET_FLAG (op, FLAG_REMOVED); |
1775 | SET_FLAG (op, FLAG_REMOVED); |
1796 | free_object (op); /* free the inserted object */ |
1776 | op->destroy (); /* free the inserted object */ |
1797 | op = tmp; |
1777 | op = tmp; |
1798 | remove_ob (op); /* and fix old object's links */ |
1778 | op->remove (); /* and fix old object's links */ |
1799 | CLEAR_FLAG (op, FLAG_REMOVED); |
1779 | CLEAR_FLAG (op, FLAG_REMOVED); |
1800 | break; |
1780 | break; |
1801 | } |
1781 | } |
1802 | |
1782 | |
1803 | /* I assume combined objects have no inventory |
1783 | /* I assume combined objects have no inventory |
1804 | * We add the weight - this object could have just been removed |
1784 | * We add the weight - this object could have just been removed |
1805 | * (if it was possible to merge). calling remove_ob will subtract |
1785 | * (if it was possible to merge). calling remove_ob will subtract |
1806 | * the weight, so we need to add it in again, since we actually do |
1786 | * the weight, so we need to add it in again, since we actually do |
1807 | * the linking below |
1787 | * the linking below |
1808 | */ |
1788 | */ |
1809 | add_weight (where, op->weight * op->nrof); |
1789 | add_weight (this, op->weight * op->nrof); |
1810 | } |
1790 | } |
1811 | else |
1791 | else |
1812 | add_weight (where, (op->weight + op->carrying)); |
1792 | add_weight (this, (op->weight + op->carrying)); |
1813 | |
1793 | |
1814 | otmp = is_player_inv (where); |
1794 | otmp = is_player_inv (this); |
1815 | if (otmp && otmp->contr != NULL) |
1795 | if (otmp && otmp->contr) |
1816 | { |
|
|
1817 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1796 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1818 | fix_player (otmp); |
1797 | fix_player (otmp); |
1819 | } |
|
|
1820 | |
1798 | |
1821 | op->map = NULL; |
1799 | op->map = NULL; |
1822 | op->env = where; |
1800 | op->env = this; |
1823 | op->above = NULL; |
1801 | op->above = NULL; |
1824 | op->below = NULL; |
1802 | op->below = NULL; |
1825 | op->x = 0, op->y = 0; |
1803 | op->x = 0, op->y = 0; |
1826 | |
1804 | |
1827 | /* reset the light list and los of the players on the map */ |
1805 | /* reset the light list and los of the players on the map */ |
1828 | if ((op->glow_radius != 0) && where->map) |
1806 | if ((op->glow_radius != 0) && map) |
1829 | { |
1807 | { |
1830 | #ifdef DEBUG_LIGHTS |
1808 | #ifdef DEBUG_LIGHTS |
1831 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1809 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1832 | #endif /* DEBUG_LIGHTS */ |
1810 | #endif /* DEBUG_LIGHTS */ |
1833 | if (MAP_DARKNESS (where->map)) |
1811 | if (MAP_DARKNESS (map)) |
1834 | update_all_los (where->map, where->x, where->y); |
1812 | update_all_los (map, x, y); |
1835 | } |
1813 | } |
1836 | |
1814 | |
1837 | /* Client has no idea of ordering so lets not bother ordering it here. |
1815 | /* Client has no idea of ordering so lets not bother ordering it here. |
1838 | * It sure simplifies this function... |
1816 | * It sure simplifies this function... |
1839 | */ |
1817 | */ |
1840 | if (where->inv == NULL) |
1818 | if (!inv) |
1841 | where->inv = op; |
1819 | inv = op; |
1842 | else |
1820 | else |
1843 | { |
1821 | { |
1844 | op->below = where->inv; |
1822 | op->below = inv; |
1845 | op->below->above = op; |
1823 | op->below->above = op; |
1846 | where->inv = op; |
1824 | inv = op; |
1847 | } |
1825 | } |
|
|
1826 | |
1848 | return op; |
1827 | return op; |
1849 | } |
1828 | } |
1850 | |
1829 | |
1851 | /* |
1830 | /* |
1852 | * Checks if any objects has a move_type that matches objects |
1831 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
2541 | * create clone from object to another |
2520 | * create clone from object to another |
2542 | */ |
2521 | */ |
2543 | object * |
2522 | object * |
2544 | object_create_clone (object *asrc) |
2523 | object_create_clone (object *asrc) |
2545 | { |
2524 | { |
2546 | object * |
|
|
2547 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2525 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2548 | |
2526 | |
2549 | if (!asrc) |
2527 | if (!asrc) |
2550 | return NULL; |
2528 | return 0; |
|
|
2529 | |
2551 | src = asrc; |
2530 | src = asrc; |
2552 | if (src->head) |
2531 | if (src->head) |
2553 | src = src->head; |
2532 | src = src->head; |
2554 | |
2533 | |
2555 | prev = NULL; |
2534 | prev = 0; |
2556 | for (part = src; part; part = part->more) |
2535 | for (part = src; part; part = part->more) |
2557 | { |
2536 | { |
2558 | tmp = get_object (); |
2537 | tmp = get_object (); |
2559 | copy_object (part, tmp); |
2538 | copy_object (part, tmp); |
2560 | tmp->x -= src->x; |
2539 | tmp->x -= src->x; |
2561 | tmp->y -= src->y; |
2540 | tmp->y -= src->y; |
|
|
2541 | |
2562 | if (!part->head) |
2542 | if (!part->head) |
2563 | { |
2543 | { |
2564 | dst = tmp; |
2544 | dst = tmp; |
2565 | tmp->head = NULL; |
2545 | tmp->head = 0; |
2566 | } |
2546 | } |
2567 | else |
2547 | else |
2568 | { |
2548 | { |
2569 | tmp->head = dst; |
2549 | tmp->head = dst; |
2570 | } |
2550 | } |
|
|
2551 | |
2571 | tmp->more = NULL; |
2552 | tmp->more = 0; |
|
|
2553 | |
2572 | if (prev) |
2554 | if (prev) |
2573 | prev->more = tmp; |
2555 | prev->more = tmp; |
|
|
2556 | |
2574 | prev = tmp; |
2557 | prev = tmp; |
2575 | } |
2558 | } |
2576 | |
2559 | |
2577 | for (item = src->inv; item; item = item->below) |
2560 | for (item = src->inv; item; item = item->below) |
2578 | insert_ob_in_ob (object_create_clone (item), dst); |
2561 | insert_ob_in_ob (object_create_clone (item), dst); |