… | |
… | |
29 | #include <sys/types.h> |
29 | #include <sys/types.h> |
30 | #include <sys/uio.h> |
30 | #include <sys/uio.h> |
31 | #include <object.h> |
31 | #include <object.h> |
32 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
33 | #include <loader.h> |
33 | #include <loader.h> |
|
|
34 | |
|
|
35 | #include <bitset> |
34 | |
36 | |
35 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
36 | static UUID uuid; |
38 | static UUID uuid; |
37 | const uint64 UUID_SKIP = 1<<19; |
39 | const uint64 UUID_SKIP = 1<<19; |
38 | |
40 | |
… | |
… | |
104 | _exit (1); |
106 | _exit (1); |
105 | } |
107 | } |
106 | |
108 | |
107 | uuid.seq = uid; |
109 | uuid.seq = uid; |
108 | write_uuid (); |
110 | write_uuid (); |
109 | LOG (llevDebug, "read UID: %lld\n", uid); |
111 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
110 | fclose (fp); |
112 | fclose (fp); |
111 | } |
113 | } |
112 | |
114 | |
113 | UUID |
115 | UUID |
114 | gen_uuid () |
116 | gen_uuid () |
… | |
… | |
183 | * |
185 | * |
184 | * Note that this function appears a lot longer than the macro it |
186 | * Note that this function appears a lot longer than the macro it |
185 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
186 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
187 | * |
189 | * |
188 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
189 | * |
191 | * |
190 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
191 | * check weight |
193 | * check weight |
192 | */ |
194 | */ |
193 | |
195 | |
194 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
195 | { |
197 | { |
196 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
197 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
199 | if (ob1 == ob2 |
|
|
200 | || ob1->type != ob2->type |
|
|
201 | || ob1->speed != ob2->speed |
|
|
202 | || ob1->value != ob2->value |
|
|
203 | || ob1->name != ob2->name) |
198 | return 0; |
204 | return 0; |
199 | |
205 | |
200 | if (ob1->speed != ob2->speed) |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
201 | return 0; |
|
|
202 | |
|
|
203 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
207 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
204 | * value could not be stored in a sint32 (which unfortunately sometimes is |
208 | * value could not be stored in a sint32 (which unfortunately sometimes is |
205 | * used to store nrof). |
209 | * used to store nrof). |
206 | */ |
210 | */ |
207 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
217 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
218 | |
222 | |
219 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
220 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
221 | |
225 | |
222 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
223 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
224 | * being locked in inventory should prevent merging. |
|
|
225 | * 0x4 in flags3 is CLIENT_SENT |
|
|
226 | */ |
|
|
227 | if ((ob1->arch != ob2->arch) || |
|
|
228 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
229 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
230 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
231 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
232 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
233 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
234 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
235 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
236 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
237 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
238 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
239 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
240 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
241 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
242 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
243 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
244 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
245 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
246 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
247 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
248 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
249 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
250 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
251 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
252 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
253 | return 0; |
251 | return 0; |
254 | |
252 | |
255 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
256 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
257 | */ |
255 | */ |
… | |
… | |
260 | /* if one object has inventory but the other doesn't, not equiv */ |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
261 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
262 | return 0; |
260 | return 0; |
263 | |
261 | |
264 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
265 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
266 | return 0; |
264 | return 0; |
267 | |
265 | |
268 | /* inventory ok - still need to check rest of this object to see |
266 | /* inventory ok - still need to check rest of this object to see |
269 | * if it is valid. |
267 | * if it is valid. |
270 | */ |
268 | */ |
… | |
… | |
526 | |
524 | |
527 | if (settings.casting_time) |
525 | if (settings.casting_time) |
528 | casting_time = -1; |
526 | casting_time = -1; |
529 | } |
527 | } |
530 | |
528 | |
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 | /* |
529 | /* |
541 | * copy object first frees everything allocated by the second object, |
530 | * copy_to first frees everything allocated by the dst object, |
542 | * and then copies the contends of the first object into the second |
531 | * and then copies the contents of itself into the second |
543 | * object, allocating what needs to be allocated. Basically, any |
532 | * object, allocating what needs to be allocated. Basically, any |
544 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
533 | * 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 |
534 | * if the first object is freed, the pointers in the new object |
546 | * will point at garbage. |
535 | * will point at garbage. |
547 | */ |
536 | */ |
548 | void |
537 | void |
549 | copy_object (object *op2, object *op) |
538 | object::copy_to (object *dst) |
550 | { |
539 | { |
551 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
540 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
552 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
541 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
553 | |
542 | |
554 | op2->clone (op); |
543 | *(object_copy *)dst = *this; |
|
|
544 | *(object_pod *)dst = *this; |
|
|
545 | |
|
|
546 | if (self || cb) |
|
|
547 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
555 | |
548 | |
556 | if (is_freed) |
549 | if (is_freed) |
557 | SET_FLAG (op, FLAG_FREED); |
550 | SET_FLAG (dst, FLAG_FREED); |
|
|
551 | |
558 | if (is_removed) |
552 | if (is_removed) |
559 | SET_FLAG (op, FLAG_REMOVED); |
553 | SET_FLAG (dst, FLAG_REMOVED); |
560 | |
554 | |
561 | if (op2->speed < 0) |
555 | if (speed < 0) |
562 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
556 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
563 | |
557 | |
564 | /* Copy over key_values, if any. */ |
558 | /* Copy over key_values, if any. */ |
565 | if (op2->key_values) |
559 | if (key_values) |
566 | { |
560 | { |
567 | key_value *tail = 0; |
561 | key_value *tail = 0; |
568 | key_value *i; |
562 | key_value *i; |
569 | |
563 | |
570 | op->key_values = 0; |
564 | dst->key_values = 0; |
571 | |
565 | |
572 | for (i = op2->key_values; i; i = i->next) |
566 | for (i = key_values; i; i = i->next) |
573 | { |
567 | { |
574 | key_value *new_link = new key_value; |
568 | key_value *new_link = new key_value; |
575 | |
569 | |
576 | new_link->next = 0; |
570 | new_link->next = 0; |
577 | new_link->key = i->key; |
571 | new_link->key = i->key; |
578 | new_link->value = i->value; |
572 | new_link->value = i->value; |
579 | |
573 | |
580 | /* Try and be clever here, too. */ |
574 | /* Try and be clever here, too. */ |
581 | if (!op->key_values) |
575 | if (!dst->key_values) |
582 | { |
576 | { |
583 | op->key_values = new_link; |
577 | dst->key_values = new_link; |
584 | tail = new_link; |
578 | tail = new_link; |
585 | } |
579 | } |
586 | else |
580 | else |
587 | { |
581 | { |
588 | tail->next = new_link; |
582 | tail->next = new_link; |
589 | tail = new_link; |
583 | tail = new_link; |
590 | } |
584 | } |
591 | } |
585 | } |
592 | } |
586 | } |
593 | |
587 | |
594 | update_ob_speed (op); |
588 | update_ob_speed (dst); |
|
|
589 | } |
|
|
590 | |
|
|
591 | object * |
|
|
592 | object::clone () |
|
|
593 | { |
|
|
594 | object *neu = create (); |
|
|
595 | copy_to (neu); |
|
|
596 | return neu; |
595 | } |
597 | } |
596 | |
598 | |
597 | /* |
599 | /* |
598 | * If an object with the IS_TURNABLE() flag needs to be turned due |
600 | * 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 |
601 | * to the closest player being on the other side, this function can |
… | |
… | |
804 | update_now = 1; |
806 | update_now = 1; |
805 | |
807 | |
806 | if ((move_slow | op->move_slow) != move_slow) |
808 | if ((move_slow | op->move_slow) != move_slow) |
807 | update_now = 1; |
809 | update_now = 1; |
808 | } |
810 | } |
|
|
811 | |
809 | /* if the object is being removed, we can't make intelligent |
812 | /* if the object is being removed, we can't make intelligent |
810 | * decisions, because remove_ob can't really pass the object |
813 | * decisions, because remove_ob can't really pass the object |
811 | * that is being removed. |
814 | * that is being removed. |
812 | */ |
815 | */ |
813 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
816 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
839 | else |
842 | else |
840 | { |
843 | { |
841 | delete *i; |
844 | delete *i; |
842 | mortals.erase (i); |
845 | mortals.erase (i); |
843 | } |
846 | } |
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 | } |
847 | } |
853 | |
848 | |
854 | object::object () |
849 | object::object () |
855 | { |
850 | { |
856 | SET_FLAG (this, FLAG_REMOVED); |
851 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
915 | |
910 | |
916 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
911 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
917 | remove_friendly_object (this); |
912 | remove_friendly_object (this); |
918 | |
913 | |
919 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
914 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
920 | remove_ob (this); |
915 | remove (); |
921 | |
916 | |
922 | SET_FLAG (this, FLAG_FREED); |
917 | 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 | |
918 | |
940 | if (more) |
919 | if (more) |
941 | { |
920 | { |
942 | more->destroy (destroy_inventory); |
921 | more->destroy (destroy_inventory); |
943 | more = 0; |
922 | more = 0; |
… | |
… | |
966 | |
945 | |
967 | while (op) |
946 | while (op) |
968 | { |
947 | { |
969 | object *tmp = op->below; |
948 | object *tmp = op->below; |
970 | |
949 | |
971 | remove_ob (op); |
950 | op->remove (); |
972 | |
951 | |
973 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
952 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
974 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
953 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
975 | free_object (op); |
954 | op->destroy (); |
976 | else |
955 | else |
977 | { |
956 | { |
978 | op->x = x; |
957 | op->x = x; |
979 | op->y = y; |
958 | op->y = y; |
980 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
959 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
983 | op = tmp; |
962 | op = tmp; |
984 | } |
963 | } |
985 | } |
964 | } |
986 | } |
965 | } |
987 | |
966 | |
|
|
967 | // hack to ensure that freed objects still have a valid map |
|
|
968 | { |
|
|
969 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
970 | |
|
|
971 | if (!freed_map) |
|
|
972 | { |
|
|
973 | freed_map = new maptile; |
|
|
974 | |
|
|
975 | freed_map->name = "/internal/freed_objects_map"; |
|
|
976 | freed_map->width = 3; |
|
|
977 | freed_map->height = 3; |
|
|
978 | |
|
|
979 | freed_map->allocate (); |
|
|
980 | } |
|
|
981 | |
|
|
982 | map = freed_map; |
|
|
983 | x = 1; |
|
|
984 | y = 1; |
|
|
985 | } |
|
|
986 | |
988 | // clear those pointers that likely might have circular references to us |
987 | // clear those pointers that likely might have circular references to us |
989 | owner = 0; |
988 | owner = 0; |
990 | enemy = 0; |
989 | enemy = 0; |
991 | attacked_by = 0; |
990 | attacked_by = 0; |
992 | |
991 | |
… | |
… | |
1004 | |
1003 | |
1005 | /* |
1004 | /* |
1006 | * sub_weight() recursively (outwards) subtracts a number from the |
1005 | * sub_weight() recursively (outwards) subtracts a number from the |
1007 | * weight of an object (and what is carried by it's environment(s)). |
1006 | * weight of an object (and what is carried by it's environment(s)). |
1008 | */ |
1007 | */ |
1009 | |
|
|
1010 | void |
1008 | void |
1011 | sub_weight (object *op, signed long weight) |
1009 | sub_weight (object *op, signed long weight) |
1012 | { |
1010 | { |
1013 | while (op != NULL) |
1011 | while (op != NULL) |
1014 | { |
1012 | { |
… | |
… | |
1018 | op->carrying -= weight; |
1016 | op->carrying -= weight; |
1019 | op = op->env; |
1017 | op = op->env; |
1020 | } |
1018 | } |
1021 | } |
1019 | } |
1022 | |
1020 | |
1023 | /* remove_ob(op): |
1021 | /* op->remove (): |
1024 | * This function removes the object op from the linked list of objects |
1022 | * This function removes the object op from the linked list of objects |
1025 | * which it is currently tied to. When this function is done, the |
1023 | * which it is currently tied to. When this function is done, the |
1026 | * object will have no environment. If the object previously had an |
1024 | * object will have no environment. If the object previously had an |
1027 | * environment, the x and y coordinates will be updated to |
1025 | * environment, the x and y coordinates will be updated to |
1028 | * the previous environment. |
1026 | * the previous environment. |
1029 | * Beware: This function is called from the editor as well! |
1027 | * Beware: This function is called from the editor as well! |
1030 | */ |
1028 | */ |
1031 | |
|
|
1032 | void |
1029 | void |
1033 | remove_ob (object *op) |
1030 | object::remove () |
1034 | { |
1031 | { |
1035 | object *tmp, *last = 0; |
1032 | object *tmp, *last = 0; |
1036 | object *otmp; |
1033 | object *otmp; |
1037 | |
1034 | |
1038 | int check_walk_off; |
1035 | int check_walk_off; |
1039 | maptile *m; |
|
|
1040 | |
1036 | |
1041 | sint16 x, y; |
|
|
1042 | |
|
|
1043 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1037 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1044 | return; |
1038 | return; |
1045 | |
1039 | |
1046 | SET_FLAG (op, FLAG_REMOVED); |
1040 | SET_FLAG (this, FLAG_REMOVED); |
1047 | |
1041 | |
1048 | if (op->more != NULL) |
1042 | if (more) |
1049 | remove_ob (op->more); |
1043 | more->remove (); |
1050 | |
1044 | |
1051 | /* |
1045 | /* |
1052 | * In this case, the object to be removed is in someones |
1046 | * In this case, the object to be removed is in someones |
1053 | * inventory. |
1047 | * inventory. |
1054 | */ |
1048 | */ |
1055 | if (op->env != NULL) |
1049 | if (env) |
1056 | { |
1050 | { |
1057 | if (op->nrof) |
1051 | if (nrof) |
1058 | sub_weight (op->env, op->weight * op->nrof); |
1052 | sub_weight (env, weight * nrof); |
1059 | else |
1053 | else |
1060 | sub_weight (op->env, op->weight + op->carrying); |
1054 | sub_weight (env, weight + carrying); |
1061 | |
1055 | |
1062 | /* NO_FIX_PLAYER is set when a great many changes are being |
1056 | /* NO_FIX_PLAYER is set when a great many changes are being |
1063 | * made to players inventory. If set, avoiding the call |
1057 | * made to players inventory. If set, avoiding the call |
1064 | * to save cpu time. |
1058 | * to save cpu time. |
1065 | */ |
1059 | */ |
1066 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1060 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1067 | fix_player (otmp); |
1061 | fix_player (otmp); |
1068 | |
1062 | |
1069 | if (op->above != NULL) |
1063 | if (above != NULL) |
1070 | op->above->below = op->below; |
1064 | above->below = below; |
1071 | else |
1065 | else |
1072 | op->env->inv = op->below; |
1066 | env->inv = below; |
1073 | |
1067 | |
1074 | if (op->below != NULL) |
1068 | if (below != NULL) |
1075 | op->below->above = op->above; |
1069 | below->above = above; |
1076 | |
1070 | |
1077 | /* we set up values so that it could be inserted into |
1071 | /* we set up values so that it could be inserted into |
1078 | * the map, but we don't actually do that - it is up |
1072 | * the map, but we don't actually do that - it is up |
1079 | * to the caller to decide what we want to do. |
1073 | * to the caller to decide what we want to do. |
1080 | */ |
1074 | */ |
1081 | op->x = op->env->x, op->y = op->env->y; |
1075 | x = env->x, y = env->y; |
1082 | op->map = op->env->map; |
1076 | map = env->map; |
1083 | op->above = NULL, op->below = NULL; |
1077 | above = 0, below = 0; |
1084 | op->env = NULL; |
1078 | env = 0; |
1085 | } |
1079 | } |
1086 | else if (op->map) |
1080 | else if (map) |
1087 | { |
1081 | { |
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 |
1082 | /* Re did the following section of code - it looks like it had |
1108 | * lots of logic for things we no longer care about |
1083 | * lots of logic for things we no longer care about |
1109 | */ |
1084 | */ |
1110 | |
1085 | |
1111 | /* link the object above us */ |
1086 | /* link the object above us */ |
1112 | if (op->above) |
1087 | if (above) |
1113 | op->above->below = op->below; |
1088 | above->below = below; |
1114 | else |
1089 | else |
1115 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1090 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1116 | |
1091 | |
1117 | /* Relink the object below us, if there is one */ |
1092 | /* Relink the object below us, if there is one */ |
1118 | if (op->below) |
1093 | if (below) |
1119 | op->below->above = op->above; |
1094 | below->above = above; |
1120 | else |
1095 | else |
1121 | { |
1096 | { |
1122 | /* Nothing below, which means we need to relink map object for this space |
1097 | /* 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 |
1098 | * use translated coordinates in case some oddness with map tiling is |
1124 | * evident |
1099 | * evident |
1125 | */ |
1100 | */ |
1126 | if (GET_MAP_OB (m, x, y) != op) |
1101 | if (GET_MAP_OB (map, x, y) != this) |
1127 | { |
1102 | { |
1128 | char *dump = dump_object (op); |
1103 | char *dump = dump_object (this); |
1129 | LOG (llevError, |
1104 | 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); |
1105 | "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); |
1106 | free (dump); |
1132 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1107 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1133 | LOG (llevError, "%s\n", dump); |
1108 | LOG (llevError, "%s\n", dump); |
1134 | free (dump); |
1109 | free (dump); |
1135 | } |
1110 | } |
1136 | |
1111 | |
1137 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1112 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1138 | } |
1113 | } |
1139 | |
1114 | |
1140 | op->above = 0; |
1115 | above = 0; |
1141 | op->below = 0; |
1116 | below = 0; |
1142 | |
1117 | |
1143 | if (op->map->in_memory == MAP_SAVING) |
1118 | if (map->in_memory == MAP_SAVING) |
1144 | return; |
1119 | return; |
1145 | |
1120 | |
1146 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1121 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1147 | |
1122 | |
1148 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1123 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1149 | { |
1124 | { |
1150 | /* No point updating the players look faces if he is the object |
1125 | /* No point updating the players look faces if he is the object |
1151 | * being removed. |
1126 | * being removed. |
1152 | */ |
1127 | */ |
1153 | |
1128 | |
1154 | if (tmp->type == PLAYER && tmp != op) |
1129 | if (tmp->type == PLAYER && tmp != this) |
1155 | { |
1130 | { |
1156 | /* If a container that the player is currently using somehow gets |
1131 | /* If a container that the player is currently using somehow gets |
1157 | * removed (most likely destroyed), update the player view |
1132 | * removed (most likely destroyed), update the player view |
1158 | * appropriately. |
1133 | * appropriately. |
1159 | */ |
1134 | */ |
1160 | if (tmp->container == op) |
1135 | if (tmp->container == this) |
1161 | { |
1136 | { |
1162 | CLEAR_FLAG (op, FLAG_APPLIED); |
1137 | CLEAR_FLAG (this, FLAG_APPLIED); |
1163 | tmp->container = NULL; |
1138 | tmp->container = 0; |
1164 | } |
1139 | } |
1165 | |
1140 | |
1166 | tmp->contr->socket.update_look = 1; |
1141 | tmp->contr->socket->update_look = 1; |
1167 | } |
1142 | } |
1168 | |
1143 | |
1169 | /* See if player moving off should effect something */ |
1144 | /* See if player moving off should effect something */ |
1170 | if (check_walk_off |
1145 | if (check_walk_off |
1171 | && ((op->move_type & tmp->move_off) |
1146 | && ((move_type & tmp->move_off) |
1172 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1147 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1173 | { |
1148 | { |
1174 | move_apply (tmp, op, NULL); |
1149 | move_apply (tmp, this, 0); |
1175 | |
1150 | |
1176 | if (op->destroyed ()) |
1151 | if (destroyed ()) |
1177 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1152 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1178 | } |
1153 | } |
1179 | |
1154 | |
1180 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1155 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1181 | |
1156 | |
1182 | if (tmp->above == tmp) |
1157 | if (tmp->above == tmp) |
1183 | tmp->above = NULL; |
1158 | tmp->above = 0; |
1184 | |
1159 | |
1185 | last = tmp; |
1160 | last = tmp; |
1186 | } |
1161 | } |
1187 | |
1162 | |
1188 | /* last == NULL of there are no objects on this space */ |
1163 | /* last == NULL of there are no objects on this space */ |
1189 | if (last == NULL) |
1164 | if (!last) |
1190 | { |
1165 | { |
1191 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1166 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1192 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1167 | * 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 |
1168 | * those out anyways, and if there are any flags set right now, they won't |
1194 | * be correct anyways. |
1169 | * be correct anyways. |
1195 | */ |
1170 | */ |
1196 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1171 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1197 | update_position (op->map, op->x, op->y); |
1172 | update_position (map, x, y); |
1198 | } |
1173 | } |
1199 | else |
1174 | else |
1200 | update_object (last, UP_OBJ_REMOVE); |
1175 | update_object (last, UP_OBJ_REMOVE); |
1201 | |
1176 | |
1202 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1177 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1203 | update_all_los (op->map, op->x, op->y); |
1178 | update_all_los (map, x, y); |
1204 | } |
1179 | } |
1205 | } |
1180 | } |
1206 | |
1181 | |
1207 | /* |
1182 | /* |
1208 | * merge_ob(op,top): |
1183 | * merge_ob(op,top): |
… | |
… | |
1223 | |
1198 | |
1224 | for (; top != NULL; top = top->below) |
1199 | for (; top != NULL; top = top->below) |
1225 | { |
1200 | { |
1226 | if (top == op) |
1201 | if (top == op) |
1227 | continue; |
1202 | continue; |
1228 | if (CAN_MERGE (op, top)) |
1203 | |
|
|
1204 | if (object::can_merge (op, top)) |
1229 | { |
1205 | { |
1230 | top->nrof += op->nrof; |
1206 | top->nrof += op->nrof; |
1231 | |
1207 | |
1232 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1208 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1233 | op->weight = 0; /* Don't want any adjustements now */ |
1209 | op->weight = 0; /* Don't want any adjustements now */ |
1234 | remove_ob (op); |
1210 | op->destroy (); |
1235 | free_object (op); |
|
|
1236 | return top; |
1211 | return top; |
1237 | } |
1212 | } |
1238 | } |
1213 | } |
1239 | |
1214 | |
1240 | return 0; |
1215 | return 0; |
… | |
… | |
1367 | |
1342 | |
1368 | /* this has to be done after we translate the coordinates. |
1343 | /* this has to be done after we translate the coordinates. |
1369 | */ |
1344 | */ |
1370 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1345 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1371 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1346 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1372 | if (CAN_MERGE (op, tmp)) |
1347 | if (object::can_merge (op, tmp)) |
1373 | { |
1348 | { |
1374 | op->nrof += tmp->nrof; |
1349 | op->nrof += tmp->nrof; |
1375 | remove_ob (tmp); |
1350 | tmp->destroy (); |
1376 | free_object (tmp); |
|
|
1377 | } |
1351 | } |
1378 | |
1352 | |
1379 | 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 */ |
1380 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1354 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1381 | |
1355 | |
… | |
… | |
1509 | * it, so save a few ticks and start from there. |
1483 | * it, so save a few ticks and start from there. |
1510 | */ |
1484 | */ |
1511 | if (!(flag & INS_MAP_LOAD)) |
1485 | if (!(flag & INS_MAP_LOAD)) |
1512 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1486 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1513 | if (tmp->type == PLAYER) |
1487 | if (tmp->type == PLAYER) |
1514 | tmp->contr->socket.update_look = 1; |
1488 | tmp->contr->socket->update_look = 1; |
1515 | |
1489 | |
1516 | /* If this object glows, it may affect lighting conditions that are |
1490 | /* If this object glows, it may affect lighting conditions that are |
1517 | * visible to others on this map. But update_all_los is really |
1491 | * visible to others on this map. But update_all_los is really |
1518 | * an inefficient way to do this, as it means los for all players |
1492 | * an inefficient way to do this, as it means los for all players |
1519 | * on the map will get recalculated. The players could very well |
1493 | * on the map will get recalculated. The players could very well |
… | |
… | |
1567 | tmp1; |
1541 | tmp1; |
1568 | |
1542 | |
1569 | /* first search for itself and remove any old instances */ |
1543 | /* first search for itself and remove any old instances */ |
1570 | |
1544 | |
1571 | 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) |
1572 | { |
|
|
1573 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1546 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1574 | { |
1547 | tmp->destroy (); |
1575 | remove_ob (tmp); |
|
|
1576 | free_object (tmp); |
|
|
1577 | } |
|
|
1578 | } |
|
|
1579 | |
1548 | |
1580 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1549 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1581 | |
1550 | |
1582 | tmp1->x = op->x; |
1551 | tmp1->x = op->x; |
1583 | tmp1->y = op->y; |
1552 | tmp1->y = op->y; |
… | |
… | |
1593 | */ |
1562 | */ |
1594 | |
1563 | |
1595 | object * |
1564 | object * |
1596 | get_split_ob (object *orig_ob, uint32 nr) |
1565 | get_split_ob (object *orig_ob, uint32 nr) |
1597 | { |
1566 | { |
1598 | object * |
1567 | object *newob; |
1599 | newob; |
|
|
1600 | int |
|
|
1601 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1568 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1602 | |
1569 | |
1603 | if (orig_ob->nrof < nr) |
1570 | if (orig_ob->nrof < nr) |
1604 | { |
1571 | { |
1605 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1572 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1606 | return NULL; |
1573 | return NULL; |
1607 | } |
1574 | } |
1608 | |
1575 | |
1609 | newob = object_create_clone (orig_ob); |
1576 | newob = object_create_clone (orig_ob); |
1610 | |
1577 | |
1611 | if ((orig_ob->nrof -= nr) < 1) |
1578 | if ((orig_ob->nrof -= nr) < 1) |
1612 | { |
1579 | orig_ob->destroy (1); |
1613 | if (!is_removed) |
|
|
1614 | remove_ob (orig_ob); |
|
|
1615 | free_object2 (orig_ob, 1); |
|
|
1616 | } |
|
|
1617 | else if (!is_removed) |
1580 | else if (!is_removed) |
1618 | { |
1581 | { |
1619 | if (orig_ob->env != NULL) |
1582 | if (orig_ob->env != NULL) |
1620 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1583 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1621 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1584 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1685 | esrv_send_item (tmp, op); |
1648 | esrv_send_item (tmp, op); |
1686 | } |
1649 | } |
1687 | } |
1650 | } |
1688 | else |
1651 | else |
1689 | { |
1652 | { |
1690 | remove_ob (op); |
1653 | op->remove (); |
1691 | op->nrof = 0; |
1654 | op->nrof = 0; |
1692 | if (tmp) |
1655 | if (tmp) |
1693 | { |
1656 | { |
1694 | esrv_del_item (tmp->contr, op->count); |
1657 | esrv_del_item (tmp->contr, op->count); |
1695 | } |
1658 | } |
… | |
… | |
1701 | |
1664 | |
1702 | if (i < op->nrof) |
1665 | if (i < op->nrof) |
1703 | op->nrof -= i; |
1666 | op->nrof -= i; |
1704 | else |
1667 | else |
1705 | { |
1668 | { |
1706 | remove_ob (op); |
1669 | op->remove (); |
1707 | op->nrof = 0; |
1670 | op->nrof = 0; |
1708 | } |
1671 | } |
1709 | |
1672 | |
1710 | /* Since we just removed op, op->above is null */ |
1673 | /* Since we just removed op, op->above is null */ |
1711 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1674 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
… | |
… | |
1720 | |
1683 | |
1721 | if (op->nrof) |
1684 | if (op->nrof) |
1722 | return op; |
1685 | return op; |
1723 | else |
1686 | else |
1724 | { |
1687 | { |
1725 | free_object (op); |
1688 | op->destroy (); |
1726 | return NULL; |
1689 | return NULL; |
1727 | } |
1690 | } |
1728 | } |
1691 | } |
1729 | |
1692 | |
1730 | /* |
1693 | /* |
… | |
… | |
1743 | op->carrying += weight; |
1706 | op->carrying += weight; |
1744 | op = op->env; |
1707 | op = op->env; |
1745 | } |
1708 | } |
1746 | } |
1709 | } |
1747 | |
1710 | |
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 * |
1711 | object * |
1763 | insert_ob_in_ob (object *op, object *where) |
1712 | insert_ob_in_ob (object *op, object *where) |
1764 | { |
1713 | { |
1765 | object * |
1714 | 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 | { |
1715 | { |
1779 | char *dump = dump_object (op); |
1716 | char *dump = dump_object (op); |
1780 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1717 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1781 | free (dump); |
1718 | free (dump); |
1782 | return op; |
1719 | return op; |
1783 | } |
1720 | } |
1784 | |
1721 | |
1785 | if (where->head) |
1722 | if (where->head) |
1786 | { |
1723 | { |
1787 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1724 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1788 | where = where->head; |
1725 | where = where->head; |
1789 | } |
1726 | } |
|
|
1727 | |
|
|
1728 | return where->insert (op); |
|
|
1729 | } |
|
|
1730 | |
|
|
1731 | /* |
|
|
1732 | * env->insert (op) |
|
|
1733 | * This function inserts the object op in the linked list |
|
|
1734 | * inside the object environment. |
|
|
1735 | * |
|
|
1736 | * The function returns now pointer to inserted item, and return value can |
|
|
1737 | * be != op, if items are merged. -Tero |
|
|
1738 | */ |
|
|
1739 | |
|
|
1740 | object * |
|
|
1741 | object::insert (object *op) |
|
|
1742 | { |
|
|
1743 | object *tmp, *otmp; |
|
|
1744 | |
|
|
1745 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1746 | op->remove (); |
1790 | |
1747 | |
1791 | if (op->more) |
1748 | if (op->more) |
1792 | { |
1749 | { |
1793 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1750 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1794 | return op; |
1751 | return op; |
… | |
… | |
1796 | |
1753 | |
1797 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1754 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1798 | CLEAR_FLAG (op, FLAG_REMOVED); |
1755 | CLEAR_FLAG (op, FLAG_REMOVED); |
1799 | if (op->nrof) |
1756 | if (op->nrof) |
1800 | { |
1757 | { |
1801 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1758 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1802 | if (CAN_MERGE (tmp, op)) |
1759 | if (object::can_merge (tmp, op)) |
1803 | { |
1760 | { |
1804 | /* return the original object and remove inserted object |
1761 | /* return the original object and remove inserted object |
1805 | (client needs the original object) */ |
1762 | (client needs the original object) */ |
1806 | tmp->nrof += op->nrof; |
1763 | tmp->nrof += op->nrof; |
1807 | /* Weight handling gets pretty funky. Since we are adding to |
1764 | /* Weight handling gets pretty funky. Since we are adding to |
1808 | * tmp->nrof, we need to increase the weight. |
1765 | * tmp->nrof, we need to increase the weight. |
1809 | */ |
1766 | */ |
1810 | add_weight (where, op->weight * op->nrof); |
1767 | add_weight (this, op->weight * op->nrof); |
1811 | SET_FLAG (op, FLAG_REMOVED); |
1768 | SET_FLAG (op, FLAG_REMOVED); |
1812 | free_object (op); /* free the inserted object */ |
1769 | op->destroy (); /* free the inserted object */ |
1813 | op = tmp; |
1770 | op = tmp; |
1814 | remove_ob (op); /* and fix old object's links */ |
1771 | op->remove (); /* and fix old object's links */ |
1815 | CLEAR_FLAG (op, FLAG_REMOVED); |
1772 | CLEAR_FLAG (op, FLAG_REMOVED); |
1816 | break; |
1773 | break; |
1817 | } |
1774 | } |
1818 | |
1775 | |
1819 | /* I assume combined objects have no inventory |
1776 | /* I assume combined objects have no inventory |
1820 | * We add the weight - this object could have just been removed |
1777 | * We add the weight - this object could have just been removed |
1821 | * (if it was possible to merge). calling remove_ob will subtract |
1778 | * (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 |
1779 | * the weight, so we need to add it in again, since we actually do |
1823 | * the linking below |
1780 | * the linking below |
1824 | */ |
1781 | */ |
1825 | add_weight (where, op->weight * op->nrof); |
1782 | add_weight (this, op->weight * op->nrof); |
1826 | } |
1783 | } |
1827 | else |
1784 | else |
1828 | add_weight (where, (op->weight + op->carrying)); |
1785 | add_weight (this, (op->weight + op->carrying)); |
1829 | |
1786 | |
1830 | otmp = is_player_inv (where); |
1787 | otmp = is_player_inv (this); |
1831 | if (otmp && otmp->contr != NULL) |
1788 | if (otmp && otmp->contr) |
1832 | { |
|
|
1833 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1789 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1834 | fix_player (otmp); |
1790 | fix_player (otmp); |
1835 | } |
|
|
1836 | |
1791 | |
1837 | op->map = NULL; |
1792 | op->map = NULL; |
1838 | op->env = where; |
1793 | op->env = this; |
1839 | op->above = NULL; |
1794 | op->above = NULL; |
1840 | op->below = NULL; |
1795 | op->below = NULL; |
1841 | op->x = 0, op->y = 0; |
1796 | op->x = 0, op->y = 0; |
1842 | |
1797 | |
1843 | /* reset the light list and los of the players on the map */ |
1798 | /* reset the light list and los of the players on the map */ |
1844 | if ((op->glow_radius != 0) && where->map) |
1799 | if ((op->glow_radius != 0) && map) |
1845 | { |
1800 | { |
1846 | #ifdef DEBUG_LIGHTS |
1801 | #ifdef DEBUG_LIGHTS |
1847 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1802 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1848 | #endif /* DEBUG_LIGHTS */ |
1803 | #endif /* DEBUG_LIGHTS */ |
1849 | if (MAP_DARKNESS (where->map)) |
1804 | if (MAP_DARKNESS (map)) |
1850 | update_all_los (where->map, where->x, where->y); |
1805 | update_all_los (map, x, y); |
1851 | } |
1806 | } |
1852 | |
1807 | |
1853 | /* Client has no idea of ordering so lets not bother ordering it here. |
1808 | /* Client has no idea of ordering so lets not bother ordering it here. |
1854 | * It sure simplifies this function... |
1809 | * It sure simplifies this function... |
1855 | */ |
1810 | */ |
1856 | if (where->inv == NULL) |
1811 | if (!inv) |
1857 | where->inv = op; |
1812 | inv = op; |
1858 | else |
1813 | else |
1859 | { |
1814 | { |
1860 | op->below = where->inv; |
1815 | op->below = inv; |
1861 | op->below->above = op; |
1816 | op->below->above = op; |
1862 | where->inv = op; |
1817 | inv = op; |
1863 | } |
1818 | } |
|
|
1819 | |
1864 | return op; |
1820 | return op; |
1865 | } |
1821 | } |
1866 | |
1822 | |
1867 | /* |
1823 | /* |
1868 | * Checks if any objects has a move_type that matches objects |
1824 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
2557 | * create clone from object to another |
2513 | * create clone from object to another |
2558 | */ |
2514 | */ |
2559 | object * |
2515 | object * |
2560 | object_create_clone (object *asrc) |
2516 | object_create_clone (object *asrc) |
2561 | { |
2517 | { |
2562 | object * |
|
|
2563 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2518 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2564 | |
2519 | |
2565 | if (!asrc) |
2520 | if (!asrc) |
2566 | return NULL; |
2521 | return 0; |
|
|
2522 | |
2567 | src = asrc; |
2523 | src = asrc; |
2568 | if (src->head) |
2524 | if (src->head) |
2569 | src = src->head; |
2525 | src = src->head; |
2570 | |
2526 | |
2571 | prev = NULL; |
2527 | prev = 0; |
2572 | for (part = src; part; part = part->more) |
2528 | for (part = src; part; part = part->more) |
2573 | { |
2529 | { |
2574 | tmp = get_object (); |
2530 | tmp = part->clone (); |
2575 | copy_object (part, tmp); |
|
|
2576 | tmp->x -= src->x; |
2531 | tmp->x -= src->x; |
2577 | tmp->y -= src->y; |
2532 | tmp->y -= src->y; |
|
|
2533 | |
2578 | if (!part->head) |
2534 | if (!part->head) |
2579 | { |
2535 | { |
2580 | dst = tmp; |
2536 | dst = tmp; |
2581 | tmp->head = NULL; |
2537 | tmp->head = 0; |
2582 | } |
2538 | } |
2583 | else |
2539 | else |
2584 | { |
2540 | { |
2585 | tmp->head = dst; |
2541 | tmp->head = dst; |
2586 | } |
2542 | } |
|
|
2543 | |
2587 | tmp->more = NULL; |
2544 | tmp->more = 0; |
|
|
2545 | |
2588 | if (prev) |
2546 | if (prev) |
2589 | prev->more = tmp; |
2547 | prev->more = tmp; |
|
|
2548 | |
2590 | prev = tmp; |
2549 | prev = tmp; |
2591 | } |
2550 | } |
2592 | |
2551 | |
2593 | for (item = src->inv; item; item = item->below) |
2552 | for (item = src->inv; item; item = item->below) |
2594 | insert_ob_in_ob (object_create_clone (item), dst); |
2553 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2620 | } |
2579 | } |
2621 | |
2580 | |
2622 | fprintf (tempfile, obstr); |
2581 | fprintf (tempfile, obstr); |
2623 | fclose (tempfile); |
2582 | fclose (tempfile); |
2624 | |
2583 | |
2625 | op = get_object (); |
2584 | op = object::create (); |
2626 | |
2585 | |
2627 | object_thawer thawer (filename); |
2586 | object_thawer thawer (filename); |
2628 | |
2587 | |
2629 | if (thawer) |
2588 | if (thawer) |
2630 | load_object (thawer, op, 0); |
2589 | load_object (thawer, op, 0); |