… | |
… | |
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 () |
… | |
… | |
526 | |
526 | |
527 | if (settings.casting_time) |
527 | if (settings.casting_time) |
528 | casting_time = -1; |
528 | casting_time = -1; |
529 | } |
529 | } |
530 | |
530 | |
531 | void object::clone (object *destination) |
|
|
532 | { |
|
|
533 | *(object_copy *)destination = *this; |
|
|
534 | *(object_pod *)destination = *this; |
|
|
535 | |
|
|
536 | if (self || cb) |
|
|
537 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
538 | } |
|
|
539 | |
|
|
540 | /* |
531 | /* |
541 | * copy object first frees everything allocated by the second object, |
532 | * copy_to first frees everything allocated by the dst object, |
542 | * and then copies the contends of the first object into the second |
533 | * and then copies the contents of itself into the second |
543 | * object, allocating what needs to be allocated. Basically, any |
534 | * object, allocating what needs to be allocated. Basically, any |
544 | * 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, |
545 | * 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 |
546 | * will point at garbage. |
537 | * will point at garbage. |
547 | */ |
538 | */ |
548 | void |
539 | void |
549 | copy_object (object *op2, object *op) |
540 | object::copy_to (object *dst) |
550 | { |
541 | { |
551 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
542 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
552 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
543 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
553 | |
544 | |
554 | 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)); |
555 | |
550 | |
556 | if (is_freed) |
551 | if (is_freed) |
557 | SET_FLAG (op, FLAG_FREED); |
552 | SET_FLAG (dst, FLAG_FREED); |
|
|
553 | |
558 | if (is_removed) |
554 | if (is_removed) |
559 | SET_FLAG (op, FLAG_REMOVED); |
555 | SET_FLAG (dst, FLAG_REMOVED); |
560 | |
556 | |
561 | if (op2->speed < 0) |
557 | if (speed < 0) |
562 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
558 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
563 | |
559 | |
564 | /* Copy over key_values, if any. */ |
560 | /* Copy over key_values, if any. */ |
565 | if (op2->key_values) |
561 | if (key_values) |
566 | { |
562 | { |
567 | key_value *tail = 0; |
563 | key_value *tail = 0; |
568 | key_value *i; |
564 | key_value *i; |
569 | |
565 | |
570 | op->key_values = 0; |
566 | dst->key_values = 0; |
571 | |
567 | |
572 | for (i = op2->key_values; i; i = i->next) |
568 | for (i = key_values; i; i = i->next) |
573 | { |
569 | { |
574 | key_value *new_link = new key_value; |
570 | key_value *new_link = new key_value; |
575 | |
571 | |
576 | new_link->next = 0; |
572 | new_link->next = 0; |
577 | new_link->key = i->key; |
573 | new_link->key = i->key; |
578 | new_link->value = i->value; |
574 | new_link->value = i->value; |
579 | |
575 | |
580 | /* Try and be clever here, too. */ |
576 | /* Try and be clever here, too. */ |
581 | if (!op->key_values) |
577 | if (!dst->key_values) |
582 | { |
578 | { |
583 | op->key_values = new_link; |
579 | dst->key_values = new_link; |
584 | tail = new_link; |
580 | tail = new_link; |
585 | } |
581 | } |
586 | else |
582 | else |
587 | { |
583 | { |
588 | tail->next = new_link; |
584 | tail->next = new_link; |
589 | tail = new_link; |
585 | tail = new_link; |
590 | } |
586 | } |
591 | } |
587 | } |
592 | } |
588 | } |
593 | |
589 | |
594 | update_ob_speed (op); |
590 | update_ob_speed (dst); |
595 | } |
591 | } |
596 | |
592 | |
597 | /* |
593 | /* |
598 | * 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 |
599 | * 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 |
… | |
… | |
804 | update_now = 1; |
800 | update_now = 1; |
805 | |
801 | |
806 | if ((move_slow | op->move_slow) != move_slow) |
802 | if ((move_slow | op->move_slow) != move_slow) |
807 | update_now = 1; |
803 | update_now = 1; |
808 | } |
804 | } |
|
|
805 | |
809 | /* if the object is being removed, we can't make intelligent |
806 | /* if the object is being removed, we can't make intelligent |
810 | * decisions, because remove_ob can't really pass the object |
807 | * decisions, because remove_ob can't really pass the object |
811 | * that is being removed. |
808 | * that is being removed. |
812 | */ |
809 | */ |
813 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
810 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
839 | else |
836 | else |
840 | { |
837 | { |
841 | delete *i; |
838 | delete *i; |
842 | mortals.erase (i); |
839 | mortals.erase (i); |
843 | } |
840 | } |
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 | } |
841 | } |
853 | |
842 | |
854 | object::object () |
843 | object::object () |
855 | { |
844 | { |
856 | SET_FLAG (this, FLAG_REMOVED); |
845 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
915 | |
904 | |
916 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
905 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
917 | remove_friendly_object (this); |
906 | remove_friendly_object (this); |
918 | |
907 | |
919 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
908 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
920 | remove_ob (this); |
909 | remove (); |
921 | |
910 | |
922 | SET_FLAG (this, FLAG_FREED); |
911 | 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 = new maptile; |
|
|
931 | |
|
|
932 | freed_map->name = "/internal/freed_objects_map"; |
|
|
933 | freed_map->width = 3; |
|
|
934 | freed_map->height = 3; |
|
|
935 | |
|
|
936 | freed_map->allocate (); |
|
|
937 | } |
|
|
938 | |
|
|
939 | map = freed_map; |
|
|
940 | x = 1; |
|
|
941 | y = 1; |
|
|
942 | } |
|
|
943 | |
912 | |
944 | if (more) |
913 | if (more) |
945 | { |
914 | { |
946 | more->destroy (destroy_inventory); |
915 | more->destroy (destroy_inventory); |
947 | more = 0; |
916 | more = 0; |
… | |
… | |
970 | |
939 | |
971 | while (op) |
940 | while (op) |
972 | { |
941 | { |
973 | object *tmp = op->below; |
942 | object *tmp = op->below; |
974 | |
943 | |
975 | remove_ob (op); |
944 | op->remove (); |
976 | |
945 | |
977 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
946 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
978 | || 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)) |
979 | free_object (op); |
948 | op->destroy (); |
980 | else |
949 | else |
981 | { |
950 | { |
982 | op->x = x; |
951 | op->x = x; |
983 | op->y = y; |
952 | op->y = y; |
984 | 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 */ |
… | |
… | |
987 | op = tmp; |
956 | op = tmp; |
988 | } |
957 | } |
989 | } |
958 | } |
990 | } |
959 | } |
991 | |
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 | |
992 | // clear those pointers that likely might have circular references to us |
981 | // clear those pointers that likely might have circular references to us |
993 | owner = 0; |
982 | owner = 0; |
994 | enemy = 0; |
983 | enemy = 0; |
995 | attacked_by = 0; |
984 | attacked_by = 0; |
996 | |
985 | |
… | |
… | |
1008 | |
997 | |
1009 | /* |
998 | /* |
1010 | * sub_weight() recursively (outwards) subtracts a number from the |
999 | * sub_weight() recursively (outwards) subtracts a number from the |
1011 | * 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)). |
1012 | */ |
1001 | */ |
1013 | |
|
|
1014 | void |
1002 | void |
1015 | sub_weight (object *op, signed long weight) |
1003 | sub_weight (object *op, signed long weight) |
1016 | { |
1004 | { |
1017 | while (op != NULL) |
1005 | while (op != NULL) |
1018 | { |
1006 | { |
… | |
… | |
1022 | op->carrying -= weight; |
1010 | op->carrying -= weight; |
1023 | op = op->env; |
1011 | op = op->env; |
1024 | } |
1012 | } |
1025 | } |
1013 | } |
1026 | |
1014 | |
1027 | /* remove_ob(op): |
1015 | /* op->remove (): |
1028 | * 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 |
1029 | * 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 |
1030 | * object will have no environment. If the object previously had an |
1018 | * object will have no environment. If the object previously had an |
1031 | * environment, the x and y coordinates will be updated to |
1019 | * environment, the x and y coordinates will be updated to |
1032 | * the previous environment. |
1020 | * the previous environment. |
1033 | * Beware: This function is called from the editor as well! |
1021 | * Beware: This function is called from the editor as well! |
1034 | */ |
1022 | */ |
1035 | |
|
|
1036 | void |
1023 | void |
1037 | remove_ob (object *op) |
1024 | object::remove () |
1038 | { |
1025 | { |
1039 | object *tmp, *last = 0; |
1026 | object *tmp, *last = 0; |
1040 | object *otmp; |
1027 | object *otmp; |
1041 | |
1028 | |
1042 | int check_walk_off; |
1029 | int check_walk_off; |
1043 | maptile *m; |
|
|
1044 | |
1030 | |
1045 | sint16 x, y; |
|
|
1046 | |
|
|
1047 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1031 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1048 | return; |
1032 | return; |
1049 | |
1033 | |
1050 | SET_FLAG (op, FLAG_REMOVED); |
1034 | SET_FLAG (this, FLAG_REMOVED); |
1051 | |
1035 | |
1052 | if (op->more != NULL) |
1036 | if (more) |
1053 | remove_ob (op->more); |
1037 | more->remove (); |
1054 | |
1038 | |
1055 | /* |
1039 | /* |
1056 | * In this case, the object to be removed is in someones |
1040 | * In this case, the object to be removed is in someones |
1057 | * inventory. |
1041 | * inventory. |
1058 | */ |
1042 | */ |
1059 | if (op->env != NULL) |
1043 | if (env) |
1060 | { |
1044 | { |
1061 | if (op->nrof) |
1045 | if (nrof) |
1062 | sub_weight (op->env, op->weight * op->nrof); |
1046 | sub_weight (env, weight * nrof); |
1063 | else |
1047 | else |
1064 | sub_weight (op->env, op->weight + op->carrying); |
1048 | sub_weight (env, weight + carrying); |
1065 | |
1049 | |
1066 | /* 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 |
1067 | * made to players inventory. If set, avoiding the call |
1051 | * made to players inventory. If set, avoiding the call |
1068 | * to save cpu time. |
1052 | * to save cpu time. |
1069 | */ |
1053 | */ |
1070 | 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)) |
1071 | fix_player (otmp); |
1055 | fix_player (otmp); |
1072 | |
1056 | |
1073 | if (op->above != NULL) |
1057 | if (above != NULL) |
1074 | op->above->below = op->below; |
1058 | above->below = below; |
1075 | else |
1059 | else |
1076 | op->env->inv = op->below; |
1060 | env->inv = below; |
1077 | |
1061 | |
1078 | if (op->below != NULL) |
1062 | if (below != NULL) |
1079 | op->below->above = op->above; |
1063 | below->above = above; |
1080 | |
1064 | |
1081 | /* we set up values so that it could be inserted into |
1065 | /* we set up values so that it could be inserted into |
1082 | * 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 |
1083 | * to the caller to decide what we want to do. |
1067 | * to the caller to decide what we want to do. |
1084 | */ |
1068 | */ |
1085 | op->x = op->env->x, op->y = op->env->y; |
1069 | x = env->x, y = env->y; |
1086 | op->map = op->env->map; |
1070 | map = env->map; |
1087 | op->above = NULL, op->below = NULL; |
1071 | above = 0, below = 0; |
1088 | op->env = NULL; |
1072 | env = 0; |
1089 | } |
1073 | } |
1090 | else if (op->map) |
1074 | else if (map) |
1091 | { |
1075 | { |
1092 | x = op->x; |
|
|
1093 | y = op->y; |
|
|
1094 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1095 | |
|
|
1096 | if (!m) |
|
|
1097 | { |
|
|
1098 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1099 | op->map->path, op->x, op->y); |
|
|
1100 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1101 | * it seems if we get into this case, something is probablye |
|
|
1102 | * screwed up and should be fixed. |
|
|
1103 | */ |
|
|
1104 | abort (); |
|
|
1105 | } |
|
|
1106 | |
|
|
1107 | if (op->map != m) |
|
|
1108 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1109 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1110 | |
|
|
1111 | /* 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 |
1112 | * lots of logic for things we no longer care about |
1077 | * lots of logic for things we no longer care about |
1113 | */ |
1078 | */ |
1114 | |
1079 | |
1115 | /* link the object above us */ |
1080 | /* link the object above us */ |
1116 | if (op->above) |
1081 | if (above) |
1117 | op->above->below = op->below; |
1082 | above->below = below; |
1118 | else |
1083 | else |
1119 | 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 */ |
1120 | |
1085 | |
1121 | /* Relink the object below us, if there is one */ |
1086 | /* Relink the object below us, if there is one */ |
1122 | if (op->below) |
1087 | if (below) |
1123 | op->below->above = op->above; |
1088 | below->above = above; |
1124 | else |
1089 | else |
1125 | { |
1090 | { |
1126 | /* 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 |
1127 | * use translated coordinates in case some oddness with map tiling is |
1092 | * use translated coordinates in case some oddness with map tiling is |
1128 | * evident |
1093 | * evident |
1129 | */ |
1094 | */ |
1130 | if (GET_MAP_OB (m, x, y) != op) |
1095 | if (GET_MAP_OB (map, x, y) != this) |
1131 | { |
1096 | { |
1132 | char *dump = dump_object (op); |
1097 | char *dump = dump_object (this); |
1133 | LOG (llevError, |
1098 | LOG (llevError, |
1134 | "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); |
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); |
1135 | free (dump); |
1100 | free (dump); |
1136 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1101 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1137 | LOG (llevError, "%s\n", dump); |
1102 | LOG (llevError, "%s\n", dump); |
1138 | free (dump); |
1103 | free (dump); |
1139 | } |
1104 | } |
1140 | |
1105 | |
1141 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1106 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1142 | } |
1107 | } |
1143 | |
1108 | |
1144 | op->above = 0; |
1109 | above = 0; |
1145 | op->below = 0; |
1110 | below = 0; |
1146 | |
1111 | |
1147 | if (op->map->in_memory == MAP_SAVING) |
1112 | if (map->in_memory == MAP_SAVING) |
1148 | return; |
1113 | return; |
1149 | |
1114 | |
1150 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1115 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1151 | |
1116 | |
1152 | 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) |
1153 | { |
1118 | { |
1154 | /* 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 |
1155 | * being removed. |
1120 | * being removed. |
1156 | */ |
1121 | */ |
1157 | |
1122 | |
1158 | if (tmp->type == PLAYER && tmp != op) |
1123 | if (tmp->type == PLAYER && tmp != this) |
1159 | { |
1124 | { |
1160 | /* If a container that the player is currently using somehow gets |
1125 | /* If a container that the player is currently using somehow gets |
1161 | * removed (most likely destroyed), update the player view |
1126 | * removed (most likely destroyed), update the player view |
1162 | * appropriately. |
1127 | * appropriately. |
1163 | */ |
1128 | */ |
1164 | if (tmp->container == op) |
1129 | if (tmp->container == this) |
1165 | { |
1130 | { |
1166 | CLEAR_FLAG (op, FLAG_APPLIED); |
1131 | CLEAR_FLAG (this, FLAG_APPLIED); |
1167 | tmp->container = NULL; |
1132 | tmp->container = 0; |
1168 | } |
1133 | } |
1169 | |
1134 | |
1170 | tmp->contr->socket.update_look = 1; |
1135 | tmp->contr->socket.update_look = 1; |
1171 | } |
1136 | } |
1172 | |
1137 | |
1173 | /* See if player moving off should effect something */ |
1138 | /* See if player moving off should effect something */ |
1174 | if (check_walk_off |
1139 | if (check_walk_off |
1175 | && ((op->move_type & tmp->move_off) |
1140 | && ((move_type & tmp->move_off) |
1176 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1141 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1177 | { |
1142 | { |
1178 | move_apply (tmp, op, NULL); |
1143 | move_apply (tmp, this, 0); |
1179 | |
1144 | |
1180 | if (op->destroyed ()) |
1145 | if (destroyed ()) |
1181 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1146 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1182 | } |
1147 | } |
1183 | |
1148 | |
1184 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1149 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1185 | |
1150 | |
1186 | if (tmp->above == tmp) |
1151 | if (tmp->above == tmp) |
1187 | tmp->above = NULL; |
1152 | tmp->above = 0; |
1188 | |
1153 | |
1189 | last = tmp; |
1154 | last = tmp; |
1190 | } |
1155 | } |
1191 | |
1156 | |
1192 | /* last == NULL of there are no objects on this space */ |
1157 | /* last == NULL of there are no objects on this space */ |
1193 | if (last == NULL) |
1158 | if (!last) |
1194 | { |
1159 | { |
1195 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1160 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1196 | * 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 |
1197 | * 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 |
1198 | * be correct anyways. |
1163 | * be correct anyways. |
1199 | */ |
1164 | */ |
1200 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1165 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1201 | update_position (op->map, op->x, op->y); |
1166 | update_position (map, x, y); |
1202 | } |
1167 | } |
1203 | else |
1168 | else |
1204 | update_object (last, UP_OBJ_REMOVE); |
1169 | update_object (last, UP_OBJ_REMOVE); |
1205 | |
1170 | |
1206 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1171 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1207 | update_all_los (op->map, op->x, op->y); |
1172 | update_all_los (map, x, y); |
1208 | } |
1173 | } |
1209 | } |
1174 | } |
1210 | |
1175 | |
1211 | /* |
1176 | /* |
1212 | * merge_ob(op,top): |
1177 | * merge_ob(op,top): |
… | |
… | |
1233 | { |
1198 | { |
1234 | top->nrof += op->nrof; |
1199 | top->nrof += op->nrof; |
1235 | |
1200 | |
1236 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1201 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1237 | op->weight = 0; /* Don't want any adjustements now */ |
1202 | op->weight = 0; /* Don't want any adjustements now */ |
1238 | remove_ob (op); |
1203 | op->destroy (); |
1239 | free_object (op); |
|
|
1240 | return top; |
1204 | return top; |
1241 | } |
1205 | } |
1242 | } |
1206 | } |
1243 | |
1207 | |
1244 | return 0; |
1208 | return 0; |
… | |
… | |
1374 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1338 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1375 | 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) |
1376 | if (CAN_MERGE (op, tmp)) |
1340 | if (CAN_MERGE (op, tmp)) |
1377 | { |
1341 | { |
1378 | op->nrof += tmp->nrof; |
1342 | op->nrof += tmp->nrof; |
1379 | remove_ob (tmp); |
1343 | tmp->destroy (); |
1380 | free_object (tmp); |
|
|
1381 | } |
1344 | } |
1382 | |
1345 | |
1383 | 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 */ |
1384 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1347 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1385 | |
1348 | |
… | |
… | |
1571 | tmp1; |
1534 | tmp1; |
1572 | |
1535 | |
1573 | /* first search for itself and remove any old instances */ |
1536 | /* first search for itself and remove any old instances */ |
1574 | |
1537 | |
1575 | 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) |
1576 | { |
|
|
1577 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1539 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1578 | { |
1540 | tmp->destroy (); |
1579 | remove_ob (tmp); |
|
|
1580 | free_object (tmp); |
|
|
1581 | } |
|
|
1582 | } |
|
|
1583 | |
1541 | |
1584 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1542 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1585 | |
1543 | |
1586 | tmp1->x = op->x; |
1544 | tmp1->x = op->x; |
1587 | tmp1->y = op->y; |
1545 | tmp1->y = op->y; |
… | |
… | |
1597 | */ |
1555 | */ |
1598 | |
1556 | |
1599 | object * |
1557 | object * |
1600 | get_split_ob (object *orig_ob, uint32 nr) |
1558 | get_split_ob (object *orig_ob, uint32 nr) |
1601 | { |
1559 | { |
1602 | object * |
1560 | object *newob; |
1603 | newob; |
|
|
1604 | int |
|
|
1605 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1561 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1606 | |
1562 | |
1607 | if (orig_ob->nrof < nr) |
1563 | if (orig_ob->nrof < nr) |
1608 | { |
1564 | { |
1609 | 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); |
1610 | return NULL; |
1566 | return NULL; |
1611 | } |
1567 | } |
1612 | |
1568 | |
1613 | newob = object_create_clone (orig_ob); |
1569 | newob = object_create_clone (orig_ob); |
1614 | |
1570 | |
1615 | if ((orig_ob->nrof -= nr) < 1) |
1571 | if ((orig_ob->nrof -= nr) < 1) |
1616 | { |
1572 | orig_ob->destroy (1); |
1617 | if (!is_removed) |
|
|
1618 | remove_ob (orig_ob); |
|
|
1619 | free_object2 (orig_ob, 1); |
|
|
1620 | } |
|
|
1621 | else if (!is_removed) |
1573 | else if (!is_removed) |
1622 | { |
1574 | { |
1623 | if (orig_ob->env != NULL) |
1575 | if (orig_ob->env != NULL) |
1624 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1576 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1625 | 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) |
… | |
… | |
1689 | esrv_send_item (tmp, op); |
1641 | esrv_send_item (tmp, op); |
1690 | } |
1642 | } |
1691 | } |
1643 | } |
1692 | else |
1644 | else |
1693 | { |
1645 | { |
1694 | remove_ob (op); |
1646 | op->remove (); |
1695 | op->nrof = 0; |
1647 | op->nrof = 0; |
1696 | if (tmp) |
1648 | if (tmp) |
1697 | { |
1649 | { |
1698 | esrv_del_item (tmp->contr, op->count); |
1650 | esrv_del_item (tmp->contr, op->count); |
1699 | } |
1651 | } |
… | |
… | |
1705 | |
1657 | |
1706 | if (i < op->nrof) |
1658 | if (i < op->nrof) |
1707 | op->nrof -= i; |
1659 | op->nrof -= i; |
1708 | else |
1660 | else |
1709 | { |
1661 | { |
1710 | remove_ob (op); |
1662 | op->remove (); |
1711 | op->nrof = 0; |
1663 | op->nrof = 0; |
1712 | } |
1664 | } |
1713 | |
1665 | |
1714 | /* Since we just removed op, op->above is null */ |
1666 | /* Since we just removed op, op->above is null */ |
1715 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1667 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
… | |
… | |
1724 | |
1676 | |
1725 | if (op->nrof) |
1677 | if (op->nrof) |
1726 | return op; |
1678 | return op; |
1727 | else |
1679 | else |
1728 | { |
1680 | { |
1729 | free_object (op); |
1681 | op->destroy (); |
1730 | return NULL; |
1682 | return NULL; |
1731 | } |
1683 | } |
1732 | } |
1684 | } |
1733 | |
1685 | |
1734 | /* |
1686 | /* |
… | |
… | |
1747 | op->carrying += weight; |
1699 | op->carrying += weight; |
1748 | op = op->env; |
1700 | op = op->env; |
1749 | } |
1701 | } |
1750 | } |
1702 | } |
1751 | |
1703 | |
1752 | /* |
|
|
1753 | * insert_ob_in_ob(op,environment): |
|
|
1754 | * This function inserts the object op in the linked list |
|
|
1755 | * inside the object environment. |
|
|
1756 | * |
|
|
1757 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1758 | * the inventory at the last position or next to other objects of the same |
|
|
1759 | * type. |
|
|
1760 | * Frank: Now sorted by type, archetype and magic! |
|
|
1761 | * |
|
|
1762 | * The function returns now pointer to inserted item, and return value can |
|
|
1763 | * be != op, if items are merged. -Tero |
|
|
1764 | */ |
|
|
1765 | |
|
|
1766 | object * |
1704 | object * |
1767 | insert_ob_in_ob (object *op, object *where) |
1705 | insert_ob_in_ob (object *op, object *where) |
1768 | { |
1706 | { |
1769 | object * |
1707 | if (!where) |
1770 | tmp, * |
|
|
1771 | otmp; |
|
|
1772 | |
|
|
1773 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1774 | { |
|
|
1775 | char *dump = dump_object (op); |
|
|
1776 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); |
|
|
1777 | free (dump); |
|
|
1778 | return op; |
|
|
1779 | } |
|
|
1780 | |
|
|
1781 | if (where == NULL) |
|
|
1782 | { |
1708 | { |
1783 | char *dump = dump_object (op); |
1709 | char *dump = dump_object (op); |
1784 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1710 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1785 | free (dump); |
1711 | free (dump); |
1786 | return op; |
1712 | return op; |
1787 | } |
1713 | } |
1788 | |
1714 | |
1789 | if (where->head) |
1715 | if (where->head) |
1790 | { |
1716 | { |
1791 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1717 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1792 | where = where->head; |
1718 | where = where->head; |
1793 | } |
1719 | } |
|
|
1720 | |
|
|
1721 | return where->insert (op); |
|
|
1722 | } |
|
|
1723 | |
|
|
1724 | /* |
|
|
1725 | * env->insert (op) |
|
|
1726 | * This function inserts the object op in the linked list |
|
|
1727 | * inside the object environment. |
|
|
1728 | * |
|
|
1729 | * The function returns now pointer to inserted item, and return value can |
|
|
1730 | * be != op, if items are merged. -Tero |
|
|
1731 | */ |
|
|
1732 | |
|
|
1733 | object * |
|
|
1734 | object::insert (object *op) |
|
|
1735 | { |
|
|
1736 | object *tmp, *otmp; |
|
|
1737 | |
|
|
1738 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1739 | op->remove (); |
1794 | |
1740 | |
1795 | if (op->more) |
1741 | if (op->more) |
1796 | { |
1742 | { |
1797 | 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); |
1798 | return op; |
1744 | return op; |
… | |
… | |
1800 | |
1746 | |
1801 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1747 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1802 | CLEAR_FLAG (op, FLAG_REMOVED); |
1748 | CLEAR_FLAG (op, FLAG_REMOVED); |
1803 | if (op->nrof) |
1749 | if (op->nrof) |
1804 | { |
1750 | { |
1805 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1751 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1806 | if (CAN_MERGE (tmp, op)) |
1752 | if (CAN_MERGE (tmp, op)) |
1807 | { |
1753 | { |
1808 | /* return the original object and remove inserted object |
1754 | /* return the original object and remove inserted object |
1809 | (client needs the original object) */ |
1755 | (client needs the original object) */ |
1810 | tmp->nrof += op->nrof; |
1756 | tmp->nrof += op->nrof; |
1811 | /* Weight handling gets pretty funky. Since we are adding to |
1757 | /* Weight handling gets pretty funky. Since we are adding to |
1812 | * tmp->nrof, we need to increase the weight. |
1758 | * tmp->nrof, we need to increase the weight. |
1813 | */ |
1759 | */ |
1814 | add_weight (where, op->weight * op->nrof); |
1760 | add_weight (this, op->weight * op->nrof); |
1815 | SET_FLAG (op, FLAG_REMOVED); |
1761 | SET_FLAG (op, FLAG_REMOVED); |
1816 | free_object (op); /* free the inserted object */ |
1762 | op->destroy (); /* free the inserted object */ |
1817 | op = tmp; |
1763 | op = tmp; |
1818 | remove_ob (op); /* and fix old object's links */ |
1764 | op->remove (); /* and fix old object's links */ |
1819 | CLEAR_FLAG (op, FLAG_REMOVED); |
1765 | CLEAR_FLAG (op, FLAG_REMOVED); |
1820 | break; |
1766 | break; |
1821 | } |
1767 | } |
1822 | |
1768 | |
1823 | /* I assume combined objects have no inventory |
1769 | /* I assume combined objects have no inventory |
1824 | * We add the weight - this object could have just been removed |
1770 | * We add the weight - this object could have just been removed |
1825 | * (if it was possible to merge). calling remove_ob will subtract |
1771 | * (if it was possible to merge). calling remove_ob will subtract |
1826 | * 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 |
1827 | * the linking below |
1773 | * the linking below |
1828 | */ |
1774 | */ |
1829 | add_weight (where, op->weight * op->nrof); |
1775 | add_weight (this, op->weight * op->nrof); |
1830 | } |
1776 | } |
1831 | else |
1777 | else |
1832 | add_weight (where, (op->weight + op->carrying)); |
1778 | add_weight (this, (op->weight + op->carrying)); |
1833 | |
1779 | |
1834 | otmp = is_player_inv (where); |
1780 | otmp = is_player_inv (this); |
1835 | if (otmp && otmp->contr != NULL) |
1781 | if (otmp && otmp->contr) |
1836 | { |
|
|
1837 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1782 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1838 | fix_player (otmp); |
1783 | fix_player (otmp); |
1839 | } |
|
|
1840 | |
1784 | |
1841 | op->map = NULL; |
1785 | op->map = NULL; |
1842 | op->env = where; |
1786 | op->env = this; |
1843 | op->above = NULL; |
1787 | op->above = NULL; |
1844 | op->below = NULL; |
1788 | op->below = NULL; |
1845 | op->x = 0, op->y = 0; |
1789 | op->x = 0, op->y = 0; |
1846 | |
1790 | |
1847 | /* 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 */ |
1848 | if ((op->glow_radius != 0) && where->map) |
1792 | if ((op->glow_radius != 0) && map) |
1849 | { |
1793 | { |
1850 | #ifdef DEBUG_LIGHTS |
1794 | #ifdef DEBUG_LIGHTS |
1851 | 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); |
1852 | #endif /* DEBUG_LIGHTS */ |
1796 | #endif /* DEBUG_LIGHTS */ |
1853 | if (MAP_DARKNESS (where->map)) |
1797 | if (MAP_DARKNESS (map)) |
1854 | update_all_los (where->map, where->x, where->y); |
1798 | update_all_los (map, x, y); |
1855 | } |
1799 | } |
1856 | |
1800 | |
1857 | /* 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. |
1858 | * It sure simplifies this function... |
1802 | * It sure simplifies this function... |
1859 | */ |
1803 | */ |
1860 | if (where->inv == NULL) |
1804 | if (!inv) |
1861 | where->inv = op; |
1805 | inv = op; |
1862 | else |
1806 | else |
1863 | { |
1807 | { |
1864 | op->below = where->inv; |
1808 | op->below = inv; |
1865 | op->below->above = op; |
1809 | op->below->above = op; |
1866 | where->inv = op; |
1810 | inv = op; |
1867 | } |
1811 | } |
|
|
1812 | |
1868 | return op; |
1813 | return op; |
1869 | } |
1814 | } |
1870 | |
1815 | |
1871 | /* |
1816 | /* |
1872 | * Checks if any objects has a move_type that matches objects |
1817 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
2561 | * create clone from object to another |
2506 | * create clone from object to another |
2562 | */ |
2507 | */ |
2563 | object * |
2508 | object * |
2564 | object_create_clone (object *asrc) |
2509 | object_create_clone (object *asrc) |
2565 | { |
2510 | { |
2566 | object * |
|
|
2567 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2511 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2568 | |
2512 | |
2569 | if (!asrc) |
2513 | if (!asrc) |
2570 | return NULL; |
2514 | return 0; |
|
|
2515 | |
2571 | src = asrc; |
2516 | src = asrc; |
2572 | if (src->head) |
2517 | if (src->head) |
2573 | src = src->head; |
2518 | src = src->head; |
2574 | |
2519 | |
2575 | prev = NULL; |
2520 | prev = 0; |
2576 | for (part = src; part; part = part->more) |
2521 | for (part = src; part; part = part->more) |
2577 | { |
2522 | { |
2578 | tmp = get_object (); |
2523 | tmp = object::create (); |
2579 | copy_object (part, tmp); |
2524 | part->copy_to (tmp); |
2580 | tmp->x -= src->x; |
2525 | tmp->x -= src->x; |
2581 | tmp->y -= src->y; |
2526 | tmp->y -= src->y; |
|
|
2527 | |
2582 | if (!part->head) |
2528 | if (!part->head) |
2583 | { |
2529 | { |
2584 | dst = tmp; |
2530 | dst = tmp; |
2585 | tmp->head = NULL; |
2531 | tmp->head = 0; |
2586 | } |
2532 | } |
2587 | else |
2533 | else |
2588 | { |
2534 | { |
2589 | tmp->head = dst; |
2535 | tmp->head = dst; |
2590 | } |
2536 | } |
|
|
2537 | |
2591 | tmp->more = NULL; |
2538 | tmp->more = 0; |
|
|
2539 | |
2592 | if (prev) |
2540 | if (prev) |
2593 | prev->more = tmp; |
2541 | prev->more = tmp; |
|
|
2542 | |
2594 | prev = tmp; |
2543 | prev = tmp; |
2595 | } |
2544 | } |
2596 | |
2545 | |
2597 | for (item = src->inv; item; item = item->below) |
2546 | for (item = src->inv; item; item = item->below) |
2598 | insert_ob_in_ob (object_create_clone (item), dst); |
2547 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2624 | } |
2573 | } |
2625 | |
2574 | |
2626 | fprintf (tempfile, obstr); |
2575 | fprintf (tempfile, obstr); |
2627 | fclose (tempfile); |
2576 | fclose (tempfile); |
2628 | |
2577 | |
2629 | op = get_object (); |
2578 | op = object::create (); |
2630 | |
2579 | |
2631 | object_thawer thawer (filename); |
2580 | object_thawer thawer (filename); |
2632 | |
2581 | |
2633 | if (thawer) |
2582 | if (thawer) |
2634 | load_object (thawer, op, 0); |
2583 | load_object (thawer, op, 0); |