… | |
… | |
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 | */ |
… | |
… | |
412 | */ |
410 | */ |
413 | |
411 | |
414 | object * |
412 | object * |
415 | find_object (tag_t i) |
413 | find_object (tag_t i) |
416 | { |
414 | { |
417 | object *op; |
|
|
418 | |
|
|
419 | for (op = object::first; op != NULL; op = op->next) |
415 | for (object *op = object::first; op; op = op->next) |
420 | if (op->count == i) |
416 | if (op->count == i) |
421 | break; |
417 | return op; |
422 | |
418 | |
423 | return op; |
419 | return 0; |
424 | } |
420 | } |
425 | |
421 | |
426 | /* |
422 | /* |
427 | * Returns the first object which has a name equal to the argument. |
423 | * Returns the first object which has a name equal to the argument. |
428 | * Used only by the patch command, but not all that useful. |
424 | * Used only by the patch command, but not all that useful. |
… | |
… | |
528 | |
524 | |
529 | if (settings.casting_time) |
525 | if (settings.casting_time) |
530 | casting_time = -1; |
526 | casting_time = -1; |
531 | } |
527 | } |
532 | |
528 | |
533 | void object::clone (object *destination) |
|
|
534 | { |
|
|
535 | *(object_copy *)destination = *this; |
|
|
536 | *(object_pod *)destination = *this; |
|
|
537 | |
|
|
538 | if (self || cb) |
|
|
539 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
540 | } |
|
|
541 | |
|
|
542 | /* |
529 | /* |
543 | * copy object first frees everything allocated by the second object, |
530 | * copy_to first frees everything allocated by the dst object, |
544 | * and then copies the contends of the first object into the second |
531 | * and then copies the contents of itself into the second |
545 | * object, allocating what needs to be allocated. Basically, any |
532 | * object, allocating what needs to be allocated. Basically, any |
546 | * 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, |
547 | * 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 |
548 | * will point at garbage. |
535 | * will point at garbage. |
549 | */ |
536 | */ |
550 | void |
537 | void |
551 | copy_object (object *op2, object *op) |
538 | object::copy_to (object *dst) |
552 | { |
539 | { |
553 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
540 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
554 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
541 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
555 | |
542 | |
556 | 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)); |
557 | |
548 | |
558 | if (is_freed) |
549 | if (is_freed) |
559 | SET_FLAG (op, FLAG_FREED); |
550 | SET_FLAG (dst, FLAG_FREED); |
|
|
551 | |
560 | if (is_removed) |
552 | if (is_removed) |
561 | SET_FLAG (op, FLAG_REMOVED); |
553 | SET_FLAG (dst, FLAG_REMOVED); |
562 | |
554 | |
563 | if (op2->speed < 0) |
555 | if (speed < 0) |
564 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
556 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
565 | |
557 | |
566 | /* Copy over key_values, if any. */ |
558 | /* Copy over key_values, if any. */ |
567 | if (op2->key_values) |
559 | if (key_values) |
568 | { |
560 | { |
569 | key_value *tail = 0; |
561 | key_value *tail = 0; |
570 | key_value *i; |
562 | key_value *i; |
571 | |
563 | |
572 | op->key_values = 0; |
564 | dst->key_values = 0; |
573 | |
565 | |
574 | for (i = op2->key_values; i; i = i->next) |
566 | for (i = key_values; i; i = i->next) |
575 | { |
567 | { |
576 | key_value *new_link = new key_value; |
568 | key_value *new_link = new key_value; |
577 | |
569 | |
578 | new_link->next = 0; |
570 | new_link->next = 0; |
579 | new_link->key = i->key; |
571 | new_link->key = i->key; |
580 | new_link->value = i->value; |
572 | new_link->value = i->value; |
581 | |
573 | |
582 | /* Try and be clever here, too. */ |
574 | /* Try and be clever here, too. */ |
583 | if (!op->key_values) |
575 | if (!dst->key_values) |
584 | { |
576 | { |
585 | op->key_values = new_link; |
577 | dst->key_values = new_link; |
586 | tail = new_link; |
578 | tail = new_link; |
587 | } |
579 | } |
588 | else |
580 | else |
589 | { |
581 | { |
590 | tail->next = new_link; |
582 | tail->next = new_link; |
591 | tail = new_link; |
583 | tail = new_link; |
592 | } |
584 | } |
593 | } |
585 | } |
594 | } |
586 | } |
595 | |
587 | |
596 | 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; |
597 | } |
597 | } |
598 | |
598 | |
599 | /* |
599 | /* |
600 | * 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 |
601 | * 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 |
… | |
… | |
806 | update_now = 1; |
806 | update_now = 1; |
807 | |
807 | |
808 | if ((move_slow | op->move_slow) != move_slow) |
808 | if ((move_slow | op->move_slow) != move_slow) |
809 | update_now = 1; |
809 | update_now = 1; |
810 | } |
810 | } |
|
|
811 | |
811 | /* if the object is being removed, we can't make intelligent |
812 | /* if the object is being removed, we can't make intelligent |
812 | * decisions, because remove_ob can't really pass the object |
813 | * decisions, because remove_ob can't really pass the object |
813 | * that is being removed. |
814 | * that is being removed. |
814 | */ |
815 | */ |
815 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
816 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
841 | else |
842 | else |
842 | { |
843 | { |
843 | delete *i; |
844 | delete *i; |
844 | mortals.erase (i); |
845 | mortals.erase (i); |
845 | } |
846 | } |
846 | |
|
|
847 | static int lastmortals = 0;//D |
|
|
848 | |
|
|
849 | if (mortals.size() != lastmortals && lastmortals > 100)//D |
|
|
850 | { |
|
|
851 | lastmortals = mortals.size ();//D |
|
|
852 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
853 | } |
|
|
854 | } |
847 | } |
855 | |
848 | |
856 | object::object () |
849 | object::object () |
857 | { |
850 | { |
858 | SET_FLAG (this, FLAG_REMOVED); |
851 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
917 | |
910 | |
918 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
911 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
919 | remove_friendly_object (this); |
912 | remove_friendly_object (this); |
920 | |
913 | |
921 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
914 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
922 | remove_ob (this); |
915 | remove (); |
923 | |
916 | |
924 | SET_FLAG (this, FLAG_FREED); |
917 | SET_FLAG (this, FLAG_FREED); |
925 | |
918 | |
926 | if (more) |
919 | if (more) |
927 | { |
920 | { |
… | |
… | |
952 | |
945 | |
953 | while (op) |
946 | while (op) |
954 | { |
947 | { |
955 | object *tmp = op->below; |
948 | object *tmp = op->below; |
956 | |
949 | |
957 | remove_ob (op); |
950 | op->remove (); |
958 | |
951 | |
959 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
952 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
960 | || 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)) |
961 | free_object (op); |
954 | op->destroy (); |
962 | else |
955 | else |
963 | { |
956 | { |
964 | op->x = x; |
957 | op->x = x; |
965 | op->y = y; |
958 | op->y = y; |
966 | 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 */ |
… | |
… | |
969 | op = tmp; |
962 | op = tmp; |
970 | } |
963 | } |
971 | } |
964 | } |
972 | } |
965 | } |
973 | |
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 | |
974 | // clear those pointers that likely might have circular references to us |
987 | // clear those pointers that likely might have circular references to us |
975 | owner = 0; |
988 | owner = 0; |
976 | enemy = 0; |
989 | enemy = 0; |
977 | attacked_by = 0; |
990 | attacked_by = 0; |
978 | |
991 | |
… | |
… | |
990 | |
1003 | |
991 | /* |
1004 | /* |
992 | * sub_weight() recursively (outwards) subtracts a number from the |
1005 | * sub_weight() recursively (outwards) subtracts a number from the |
993 | * 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)). |
994 | */ |
1007 | */ |
995 | |
|
|
996 | void |
1008 | void |
997 | sub_weight (object *op, signed long weight) |
1009 | sub_weight (object *op, signed long weight) |
998 | { |
1010 | { |
999 | while (op != NULL) |
1011 | while (op != NULL) |
1000 | { |
1012 | { |
… | |
… | |
1004 | op->carrying -= weight; |
1016 | op->carrying -= weight; |
1005 | op = op->env; |
1017 | op = op->env; |
1006 | } |
1018 | } |
1007 | } |
1019 | } |
1008 | |
1020 | |
1009 | /* remove_ob(op): |
1021 | /* op->remove (): |
1010 | * 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 |
1011 | * 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 |
1012 | * object will have no environment. If the object previously had an |
1024 | * object will have no environment. If the object previously had an |
1013 | * environment, the x and y coordinates will be updated to |
1025 | * environment, the x and y coordinates will be updated to |
1014 | * the previous environment. |
1026 | * the previous environment. |
1015 | * Beware: This function is called from the editor as well! |
1027 | * Beware: This function is called from the editor as well! |
1016 | */ |
1028 | */ |
1017 | |
|
|
1018 | void |
1029 | void |
1019 | remove_ob (object *op) |
1030 | object::remove () |
1020 | { |
1031 | { |
1021 | object *tmp, *last = 0; |
1032 | object *tmp, *last = 0; |
1022 | object *otmp; |
1033 | object *otmp; |
1023 | |
1034 | |
1024 | int check_walk_off; |
1035 | int check_walk_off; |
1025 | maptile *m; |
|
|
1026 | |
1036 | |
1027 | sint16 x, y; |
|
|
1028 | |
|
|
1029 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1037 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1030 | return; |
1038 | return; |
1031 | |
1039 | |
1032 | SET_FLAG (op, FLAG_REMOVED); |
1040 | SET_FLAG (this, FLAG_REMOVED); |
1033 | |
1041 | |
1034 | if (op->more != NULL) |
1042 | if (more) |
1035 | remove_ob (op->more); |
1043 | more->remove (); |
1036 | |
1044 | |
1037 | /* |
1045 | /* |
1038 | * In this case, the object to be removed is in someones |
1046 | * In this case, the object to be removed is in someones |
1039 | * inventory. |
1047 | * inventory. |
1040 | */ |
1048 | */ |
1041 | if (op->env != NULL) |
1049 | if (env) |
1042 | { |
1050 | { |
1043 | if (op->nrof) |
1051 | if (nrof) |
1044 | sub_weight (op->env, op->weight * op->nrof); |
1052 | sub_weight (env, weight * nrof); |
1045 | else |
1053 | else |
1046 | sub_weight (op->env, op->weight + op->carrying); |
1054 | sub_weight (env, weight + carrying); |
1047 | |
1055 | |
1048 | /* 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 |
1049 | * made to players inventory. If set, avoiding the call |
1057 | * made to players inventory. If set, avoiding the call |
1050 | * to save cpu time. |
1058 | * to save cpu time. |
1051 | */ |
1059 | */ |
1052 | 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)) |
1053 | fix_player (otmp); |
1061 | fix_player (otmp); |
1054 | |
1062 | |
1055 | if (op->above != NULL) |
1063 | if (above != NULL) |
1056 | op->above->below = op->below; |
1064 | above->below = below; |
1057 | else |
1065 | else |
1058 | op->env->inv = op->below; |
1066 | env->inv = below; |
1059 | |
1067 | |
1060 | if (op->below != NULL) |
1068 | if (below != NULL) |
1061 | op->below->above = op->above; |
1069 | below->above = above; |
1062 | |
1070 | |
1063 | /* we set up values so that it could be inserted into |
1071 | /* we set up values so that it could be inserted into |
1064 | * 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 |
1065 | * to the caller to decide what we want to do. |
1073 | * to the caller to decide what we want to do. |
1066 | */ |
1074 | */ |
1067 | op->x = op->env->x, op->y = op->env->y; |
1075 | x = env->x, y = env->y; |
1068 | op->map = op->env->map; |
1076 | map = env->map; |
1069 | op->above = NULL, op->below = NULL; |
1077 | above = 0, below = 0; |
1070 | op->env = NULL; |
1078 | env = 0; |
1071 | } |
1079 | } |
1072 | else if (op->map) |
1080 | else if (map) |
1073 | { |
1081 | { |
1074 | x = op->x; |
|
|
1075 | y = op->y; |
|
|
1076 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1077 | |
|
|
1078 | if (!m) |
|
|
1079 | { |
|
|
1080 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1081 | op->map->path, op->x, op->y); |
|
|
1082 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1083 | * it seems if we get into this case, something is probablye |
|
|
1084 | * screwed up and should be fixed. |
|
|
1085 | */ |
|
|
1086 | abort (); |
|
|
1087 | } |
|
|
1088 | |
|
|
1089 | if (op->map != m) |
|
|
1090 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1091 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1092 | |
|
|
1093 | /* Re did the following section of code - it looks like it had |
1082 | /* Re did the following section of code - it looks like it had |
1094 | * lots of logic for things we no longer care about |
1083 | * lots of logic for things we no longer care about |
1095 | */ |
1084 | */ |
1096 | |
1085 | |
1097 | /* link the object above us */ |
1086 | /* link the object above us */ |
1098 | if (op->above) |
1087 | if (above) |
1099 | op->above->below = op->below; |
1088 | above->below = below; |
1100 | else |
1089 | else |
1101 | 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 */ |
1102 | |
1091 | |
1103 | /* Relink the object below us, if there is one */ |
1092 | /* Relink the object below us, if there is one */ |
1104 | if (op->below) |
1093 | if (below) |
1105 | op->below->above = op->above; |
1094 | below->above = above; |
1106 | else |
1095 | else |
1107 | { |
1096 | { |
1108 | /* 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 |
1109 | * use translated coordinates in case some oddness with map tiling is |
1098 | * use translated coordinates in case some oddness with map tiling is |
1110 | * evident |
1099 | * evident |
1111 | */ |
1100 | */ |
1112 | if (GET_MAP_OB (m, x, y) != op) |
1101 | if (GET_MAP_OB (map, x, y) != this) |
1113 | { |
1102 | { |
1114 | char *dump = dump_object (op); |
1103 | char *dump = dump_object (this); |
1115 | LOG (llevError, |
1104 | LOG (llevError, |
1116 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
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); |
1117 | free (dump); |
1106 | free (dump); |
1118 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1107 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1119 | LOG (llevError, "%s\n", dump); |
1108 | LOG (llevError, "%s\n", dump); |
1120 | free (dump); |
1109 | free (dump); |
1121 | } |
1110 | } |
1122 | |
1111 | |
1123 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1112 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1124 | } |
1113 | } |
1125 | |
1114 | |
1126 | op->above = 0; |
1115 | above = 0; |
1127 | op->below = 0; |
1116 | below = 0; |
1128 | |
1117 | |
1129 | if (op->map->in_memory == MAP_SAVING) |
1118 | if (map->in_memory == MAP_SAVING) |
1130 | return; |
1119 | return; |
1131 | |
1120 | |
1132 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1121 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1133 | |
1122 | |
1134 | 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) |
1135 | { |
1124 | { |
1136 | /* 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 |
1137 | * being removed. |
1126 | * being removed. |
1138 | */ |
1127 | */ |
1139 | |
1128 | |
1140 | if (tmp->type == PLAYER && tmp != op) |
1129 | if (tmp->type == PLAYER && tmp != this) |
1141 | { |
1130 | { |
1142 | /* If a container that the player is currently using somehow gets |
1131 | /* If a container that the player is currently using somehow gets |
1143 | * removed (most likely destroyed), update the player view |
1132 | * removed (most likely destroyed), update the player view |
1144 | * appropriately. |
1133 | * appropriately. |
1145 | */ |
1134 | */ |
1146 | if (tmp->container == op) |
1135 | if (tmp->container == this) |
1147 | { |
1136 | { |
1148 | CLEAR_FLAG (op, FLAG_APPLIED); |
1137 | CLEAR_FLAG (this, FLAG_APPLIED); |
1149 | tmp->container = NULL; |
1138 | tmp->container = 0; |
1150 | } |
1139 | } |
1151 | |
1140 | |
1152 | tmp->contr->socket.update_look = 1; |
1141 | tmp->contr->socket->floorbox_update (); |
1153 | } |
1142 | } |
1154 | |
1143 | |
1155 | /* See if player moving off should effect something */ |
1144 | /* See if player moving off should effect something */ |
1156 | if (check_walk_off |
1145 | if (check_walk_off |
1157 | && ((op->move_type & tmp->move_off) |
1146 | && ((move_type & tmp->move_off) |
1158 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1147 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1159 | { |
1148 | { |
1160 | move_apply (tmp, op, NULL); |
1149 | move_apply (tmp, this, 0); |
1161 | |
1150 | |
1162 | if (op->destroyed ()) |
1151 | if (destroyed ()) |
1163 | 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 ()); |
1164 | } |
1153 | } |
1165 | |
1154 | |
1166 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1155 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1167 | |
1156 | |
1168 | if (tmp->above == tmp) |
1157 | if (tmp->above == tmp) |
1169 | tmp->above = NULL; |
1158 | tmp->above = 0; |
1170 | |
1159 | |
1171 | last = tmp; |
1160 | last = tmp; |
1172 | } |
1161 | } |
1173 | |
1162 | |
1174 | /* last == NULL of there are no objects on this space */ |
1163 | /* last == NULL of there are no objects on this space */ |
1175 | if (last == NULL) |
1164 | if (!last) |
1176 | { |
1165 | { |
1177 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1166 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1178 | * 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 |
1179 | * 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 |
1180 | * be correct anyways. |
1169 | * be correct anyways. |
1181 | */ |
1170 | */ |
1182 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1171 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1183 | update_position (op->map, op->x, op->y); |
1172 | update_position (map, x, y); |
1184 | } |
1173 | } |
1185 | else |
1174 | else |
1186 | update_object (last, UP_OBJ_REMOVE); |
1175 | update_object (last, UP_OBJ_REMOVE); |
1187 | |
1176 | |
1188 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1177 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1189 | update_all_los (op->map, op->x, op->y); |
1178 | update_all_los (map, x, y); |
1190 | } |
1179 | } |
1191 | } |
1180 | } |
1192 | |
1181 | |
1193 | /* |
1182 | /* |
1194 | * merge_ob(op,top): |
1183 | * merge_ob(op,top): |
… | |
… | |
1209 | |
1198 | |
1210 | for (; top != NULL; top = top->below) |
1199 | for (; top != NULL; top = top->below) |
1211 | { |
1200 | { |
1212 | if (top == op) |
1201 | if (top == op) |
1213 | continue; |
1202 | continue; |
1214 | if (CAN_MERGE (op, top)) |
1203 | |
|
|
1204 | if (object::can_merge (op, top)) |
1215 | { |
1205 | { |
1216 | top->nrof += op->nrof; |
1206 | top->nrof += op->nrof; |
1217 | |
1207 | |
1218 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1208 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1219 | op->weight = 0; /* Don't want any adjustements now */ |
1209 | op->weight = 0; /* Don't want any adjustements now */ |
1220 | remove_ob (op); |
1210 | op->destroy (); |
1221 | free_object (op); |
|
|
1222 | return top; |
1211 | return top; |
1223 | } |
1212 | } |
1224 | } |
1213 | } |
1225 | |
1214 | |
1226 | return 0; |
1215 | return 0; |
… | |
… | |
1353 | |
1342 | |
1354 | /* this has to be done after we translate the coordinates. |
1343 | /* this has to be done after we translate the coordinates. |
1355 | */ |
1344 | */ |
1356 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1345 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1357 | 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) |
1358 | if (CAN_MERGE (op, tmp)) |
1347 | if (object::can_merge (op, tmp)) |
1359 | { |
1348 | { |
1360 | op->nrof += tmp->nrof; |
1349 | op->nrof += tmp->nrof; |
1361 | remove_ob (tmp); |
1350 | tmp->destroy (); |
1362 | free_object (tmp); |
|
|
1363 | } |
1351 | } |
1364 | |
1352 | |
1365 | 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 */ |
1366 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1354 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1367 | |
1355 | |
… | |
… | |
1495 | * it, so save a few ticks and start from there. |
1483 | * it, so save a few ticks and start from there. |
1496 | */ |
1484 | */ |
1497 | if (!(flag & INS_MAP_LOAD)) |
1485 | if (!(flag & INS_MAP_LOAD)) |
1498 | 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) |
1499 | if (tmp->type == PLAYER) |
1487 | if (tmp->type == PLAYER) |
1500 | tmp->contr->socket.update_look = 1; |
1488 | tmp->contr->socket->floorbox_update (); |
1501 | |
1489 | |
1502 | /* If this object glows, it may affect lighting conditions that are |
1490 | /* If this object glows, it may affect lighting conditions that are |
1503 | * 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 |
1504 | * 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 |
1505 | * on the map will get recalculated. The players could very well |
1493 | * on the map will get recalculated. The players could very well |
… | |
… | |
1513 | |
1501 | |
1514 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1502 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1515 | update_object (op, UP_OBJ_INSERT); |
1503 | update_object (op, UP_OBJ_INSERT); |
1516 | |
1504 | |
1517 | /* Don't know if moving this to the end will break anything. However, |
1505 | /* Don't know if moving this to the end will break anything. However, |
1518 | * we want to have update_look set above before calling this. |
1506 | * we want to have floorbox_update called before calling this. |
1519 | * |
1507 | * |
1520 | * check_move_on() must be after this because code called from |
1508 | * check_move_on() must be after this because code called from |
1521 | * check_move_on() depends on correct map flags (so functions like |
1509 | * check_move_on() depends on correct map flags (so functions like |
1522 | * blocked() and wall() work properly), and these flags are updated by |
1510 | * blocked() and wall() work properly), and these flags are updated by |
1523 | * update_object(). |
1511 | * update_object(). |
… | |
… | |
1553 | tmp1; |
1541 | tmp1; |
1554 | |
1542 | |
1555 | /* first search for itself and remove any old instances */ |
1543 | /* first search for itself and remove any old instances */ |
1556 | |
1544 | |
1557 | 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) |
1558 | { |
|
|
1559 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1546 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1560 | { |
1547 | tmp->destroy (); |
1561 | remove_ob (tmp); |
|
|
1562 | free_object (tmp); |
|
|
1563 | } |
|
|
1564 | } |
|
|
1565 | |
1548 | |
1566 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1549 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1567 | |
1550 | |
1568 | tmp1->x = op->x; |
1551 | tmp1->x = op->x; |
1569 | tmp1->y = op->y; |
1552 | tmp1->y = op->y; |
… | |
… | |
1579 | */ |
1562 | */ |
1580 | |
1563 | |
1581 | object * |
1564 | object * |
1582 | get_split_ob (object *orig_ob, uint32 nr) |
1565 | get_split_ob (object *orig_ob, uint32 nr) |
1583 | { |
1566 | { |
1584 | object * |
1567 | object *newob; |
1585 | newob; |
|
|
1586 | int |
|
|
1587 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1568 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1588 | |
1569 | |
1589 | if (orig_ob->nrof < nr) |
1570 | if (orig_ob->nrof < nr) |
1590 | { |
1571 | { |
1591 | 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); |
1592 | return NULL; |
1573 | return NULL; |
1593 | } |
1574 | } |
1594 | |
1575 | |
1595 | newob = object_create_clone (orig_ob); |
1576 | newob = object_create_clone (orig_ob); |
1596 | |
1577 | |
1597 | if ((orig_ob->nrof -= nr) < 1) |
1578 | if ((orig_ob->nrof -= nr) < 1) |
1598 | { |
1579 | orig_ob->destroy (1); |
1599 | if (!is_removed) |
|
|
1600 | remove_ob (orig_ob); |
|
|
1601 | free_object2 (orig_ob, 1); |
|
|
1602 | } |
|
|
1603 | else if (!is_removed) |
1580 | else if (!is_removed) |
1604 | { |
1581 | { |
1605 | if (orig_ob->env != NULL) |
1582 | if (orig_ob->env != NULL) |
1606 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1583 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1607 | 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) |
… | |
… | |
1637 | if (i > op->nrof) |
1614 | if (i > op->nrof) |
1638 | i = op->nrof; |
1615 | i = op->nrof; |
1639 | |
1616 | |
1640 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1617 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1641 | op->nrof -= i; |
1618 | op->nrof -= i; |
1642 | else if (op->env != NULL) |
1619 | else if (op->env) |
1643 | { |
1620 | { |
1644 | /* is this object in the players inventory, or sub container |
1621 | /* is this object in the players inventory, or sub container |
1645 | * therein? |
1622 | * therein? |
1646 | */ |
1623 | */ |
1647 | tmp = is_player_inv (op->env); |
1624 | tmp = is_player_inv (op->env); |
… | |
… | |
1653 | */ |
1630 | */ |
1654 | if (!tmp) |
1631 | if (!tmp) |
1655 | { |
1632 | { |
1656 | for (pl = first_player; pl; pl = pl->next) |
1633 | for (pl = first_player; pl; pl = pl->next) |
1657 | if (pl->ob->container == op->env) |
1634 | if (pl->ob->container == op->env) |
|
|
1635 | { |
|
|
1636 | tmp = pl->ob; |
1658 | break; |
1637 | break; |
1659 | if (pl) |
1638 | } |
1660 | tmp = pl->ob; |
|
|
1661 | else |
|
|
1662 | tmp = NULL; |
|
|
1663 | } |
1639 | } |
1664 | |
1640 | |
1665 | if (i < op->nrof) |
1641 | if (i < op->nrof) |
1666 | { |
1642 | { |
1667 | sub_weight (op->env, op->weight * i); |
1643 | sub_weight (op->env, op->weight * i); |
1668 | op->nrof -= i; |
1644 | op->nrof -= i; |
1669 | if (tmp) |
1645 | if (tmp) |
1670 | { |
|
|
1671 | esrv_send_item (tmp, op); |
1646 | esrv_send_item (tmp, op); |
1672 | } |
|
|
1673 | } |
1647 | } |
1674 | else |
1648 | else |
1675 | { |
1649 | { |
1676 | remove_ob (op); |
1650 | op->remove (); |
1677 | op->nrof = 0; |
1651 | op->nrof = 0; |
1678 | if (tmp) |
1652 | if (tmp) |
1679 | { |
|
|
1680 | esrv_del_item (tmp->contr, op->count); |
1653 | esrv_del_item (tmp->contr, op->count); |
1681 | } |
|
|
1682 | } |
1654 | } |
1683 | } |
1655 | } |
1684 | else |
1656 | else |
1685 | { |
1657 | { |
1686 | object *above = op->above; |
1658 | object *above = op->above; |
1687 | |
1659 | |
1688 | if (i < op->nrof) |
1660 | if (i < op->nrof) |
1689 | op->nrof -= i; |
1661 | op->nrof -= i; |
1690 | else |
1662 | else |
1691 | { |
1663 | { |
1692 | remove_ob (op); |
1664 | op->remove (); |
1693 | op->nrof = 0; |
1665 | op->nrof = 0; |
1694 | } |
1666 | } |
1695 | |
1667 | |
1696 | /* Since we just removed op, op->above is null */ |
1668 | /* Since we just removed op, op->above is null */ |
1697 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1669 | for (tmp = above; tmp; tmp = tmp->above) |
1698 | if (tmp->type == PLAYER) |
1670 | if (tmp->type == PLAYER) |
1699 | { |
1671 | { |
1700 | if (op->nrof) |
1672 | if (op->nrof) |
1701 | esrv_send_item (tmp, op); |
1673 | esrv_send_item (tmp, op); |
1702 | else |
1674 | else |
… | |
… | |
1706 | |
1678 | |
1707 | if (op->nrof) |
1679 | if (op->nrof) |
1708 | return op; |
1680 | return op; |
1709 | else |
1681 | else |
1710 | { |
1682 | { |
1711 | free_object (op); |
1683 | op->destroy (); |
1712 | return NULL; |
1684 | return 0; |
1713 | } |
1685 | } |
1714 | } |
1686 | } |
1715 | |
1687 | |
1716 | /* |
1688 | /* |
1717 | * add_weight(object, weight) adds the specified weight to an object, |
1689 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1729 | op->carrying += weight; |
1701 | op->carrying += weight; |
1730 | op = op->env; |
1702 | op = op->env; |
1731 | } |
1703 | } |
1732 | } |
1704 | } |
1733 | |
1705 | |
1734 | /* |
|
|
1735 | * insert_ob_in_ob(op,environment): |
|
|
1736 | * This function inserts the object op in the linked list |
|
|
1737 | * inside the object environment. |
|
|
1738 | * |
|
|
1739 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1740 | * the inventory at the last position or next to other objects of the same |
|
|
1741 | * type. |
|
|
1742 | * Frank: Now sorted by type, archetype and magic! |
|
|
1743 | * |
|
|
1744 | * The function returns now pointer to inserted item, and return value can |
|
|
1745 | * be != op, if items are merged. -Tero |
|
|
1746 | */ |
|
|
1747 | |
|
|
1748 | object * |
1706 | object * |
1749 | insert_ob_in_ob (object *op, object *where) |
1707 | insert_ob_in_ob (object *op, object *where) |
1750 | { |
1708 | { |
1751 | object * |
1709 | if (!where) |
1752 | tmp, * |
|
|
1753 | otmp; |
|
|
1754 | |
|
|
1755 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1756 | { |
|
|
1757 | char *dump = dump_object (op); |
|
|
1758 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); |
|
|
1759 | free (dump); |
|
|
1760 | return op; |
|
|
1761 | } |
|
|
1762 | |
|
|
1763 | if (where == NULL) |
|
|
1764 | { |
1710 | { |
1765 | char *dump = dump_object (op); |
1711 | char *dump = dump_object (op); |
1766 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1712 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1767 | free (dump); |
1713 | free (dump); |
1768 | return op; |
1714 | return op; |
1769 | } |
1715 | } |
1770 | |
1716 | |
1771 | if (where->head) |
1717 | if (where->head) |
1772 | { |
1718 | { |
1773 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1719 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1774 | where = where->head; |
1720 | where = where->head; |
1775 | } |
1721 | } |
|
|
1722 | |
|
|
1723 | return where->insert (op); |
|
|
1724 | } |
|
|
1725 | |
|
|
1726 | /* |
|
|
1727 | * env->insert (op) |
|
|
1728 | * This function inserts the object op in the linked list |
|
|
1729 | * inside the object environment. |
|
|
1730 | * |
|
|
1731 | * The function returns now pointer to inserted item, and return value can |
|
|
1732 | * be != op, if items are merged. -Tero |
|
|
1733 | */ |
|
|
1734 | |
|
|
1735 | object * |
|
|
1736 | object::insert (object *op) |
|
|
1737 | { |
|
|
1738 | object *tmp, *otmp; |
|
|
1739 | |
|
|
1740 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1741 | op->remove (); |
1776 | |
1742 | |
1777 | if (op->more) |
1743 | if (op->more) |
1778 | { |
1744 | { |
1779 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1745 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1780 | return op; |
1746 | return op; |
… | |
… | |
1782 | |
1748 | |
1783 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1749 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1784 | CLEAR_FLAG (op, FLAG_REMOVED); |
1750 | CLEAR_FLAG (op, FLAG_REMOVED); |
1785 | if (op->nrof) |
1751 | if (op->nrof) |
1786 | { |
1752 | { |
1787 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1753 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1788 | if (CAN_MERGE (tmp, op)) |
1754 | if (object::can_merge (tmp, op)) |
1789 | { |
1755 | { |
1790 | /* return the original object and remove inserted object |
1756 | /* return the original object and remove inserted object |
1791 | (client needs the original object) */ |
1757 | (client needs the original object) */ |
1792 | tmp->nrof += op->nrof; |
1758 | tmp->nrof += op->nrof; |
1793 | /* Weight handling gets pretty funky. Since we are adding to |
1759 | /* Weight handling gets pretty funky. Since we are adding to |
1794 | * tmp->nrof, we need to increase the weight. |
1760 | * tmp->nrof, we need to increase the weight. |
1795 | */ |
1761 | */ |
1796 | add_weight (where, op->weight * op->nrof); |
1762 | add_weight (this, op->weight * op->nrof); |
1797 | SET_FLAG (op, FLAG_REMOVED); |
1763 | SET_FLAG (op, FLAG_REMOVED); |
1798 | free_object (op); /* free the inserted object */ |
1764 | op->destroy (); /* free the inserted object */ |
1799 | op = tmp; |
1765 | op = tmp; |
1800 | remove_ob (op); /* and fix old object's links */ |
1766 | op->remove (); /* and fix old object's links */ |
1801 | CLEAR_FLAG (op, FLAG_REMOVED); |
1767 | CLEAR_FLAG (op, FLAG_REMOVED); |
1802 | break; |
1768 | break; |
1803 | } |
1769 | } |
1804 | |
1770 | |
1805 | /* I assume combined objects have no inventory |
1771 | /* I assume combined objects have no inventory |
1806 | * We add the weight - this object could have just been removed |
1772 | * We add the weight - this object could have just been removed |
1807 | * (if it was possible to merge). calling remove_ob will subtract |
1773 | * (if it was possible to merge). calling remove_ob will subtract |
1808 | * the weight, so we need to add it in again, since we actually do |
1774 | * the weight, so we need to add it in again, since we actually do |
1809 | * the linking below |
1775 | * the linking below |
1810 | */ |
1776 | */ |
1811 | add_weight (where, op->weight * op->nrof); |
1777 | add_weight (this, op->weight * op->nrof); |
1812 | } |
1778 | } |
1813 | else |
1779 | else |
1814 | add_weight (where, (op->weight + op->carrying)); |
1780 | add_weight (this, (op->weight + op->carrying)); |
1815 | |
1781 | |
1816 | otmp = is_player_inv (where); |
1782 | otmp = is_player_inv (this); |
1817 | if (otmp && otmp->contr != NULL) |
1783 | if (otmp && otmp->contr) |
1818 | { |
|
|
1819 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1784 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1820 | fix_player (otmp); |
1785 | fix_player (otmp); |
1821 | } |
|
|
1822 | |
1786 | |
1823 | op->map = NULL; |
1787 | op->map = NULL; |
1824 | op->env = where; |
1788 | op->env = this; |
1825 | op->above = NULL; |
1789 | op->above = NULL; |
1826 | op->below = NULL; |
1790 | op->below = NULL; |
1827 | op->x = 0, op->y = 0; |
1791 | op->x = 0, op->y = 0; |
1828 | |
1792 | |
1829 | /* reset the light list and los of the players on the map */ |
1793 | /* reset the light list and los of the players on the map */ |
1830 | if ((op->glow_radius != 0) && where->map) |
1794 | if ((op->glow_radius != 0) && map) |
1831 | { |
1795 | { |
1832 | #ifdef DEBUG_LIGHTS |
1796 | #ifdef DEBUG_LIGHTS |
1833 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1797 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1834 | #endif /* DEBUG_LIGHTS */ |
1798 | #endif /* DEBUG_LIGHTS */ |
1835 | if (MAP_DARKNESS (where->map)) |
1799 | if (MAP_DARKNESS (map)) |
1836 | update_all_los (where->map, where->x, where->y); |
1800 | update_all_los (map, x, y); |
1837 | } |
1801 | } |
1838 | |
1802 | |
1839 | /* Client has no idea of ordering so lets not bother ordering it here. |
1803 | /* Client has no idea of ordering so lets not bother ordering it here. |
1840 | * It sure simplifies this function... |
1804 | * It sure simplifies this function... |
1841 | */ |
1805 | */ |
1842 | if (where->inv == NULL) |
1806 | if (!inv) |
1843 | where->inv = op; |
1807 | inv = op; |
1844 | else |
1808 | else |
1845 | { |
1809 | { |
1846 | op->below = where->inv; |
1810 | op->below = inv; |
1847 | op->below->above = op; |
1811 | op->below->above = op; |
1848 | where->inv = op; |
1812 | inv = op; |
1849 | } |
1813 | } |
|
|
1814 | |
1850 | return op; |
1815 | return op; |
1851 | } |
1816 | } |
1852 | |
1817 | |
1853 | /* |
1818 | /* |
1854 | * Checks if any objects has a move_type that matches objects |
1819 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
2543 | * create clone from object to another |
2508 | * create clone from object to another |
2544 | */ |
2509 | */ |
2545 | object * |
2510 | object * |
2546 | object_create_clone (object *asrc) |
2511 | object_create_clone (object *asrc) |
2547 | { |
2512 | { |
2548 | object * |
|
|
2549 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2513 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2550 | |
2514 | |
2551 | if (!asrc) |
2515 | if (!asrc) |
2552 | return NULL; |
2516 | return 0; |
|
|
2517 | |
2553 | src = asrc; |
2518 | src = asrc; |
2554 | if (src->head) |
2519 | if (src->head) |
2555 | src = src->head; |
2520 | src = src->head; |
2556 | |
2521 | |
2557 | prev = NULL; |
2522 | prev = 0; |
2558 | for (part = src; part; part = part->more) |
2523 | for (part = src; part; part = part->more) |
2559 | { |
2524 | { |
2560 | tmp = get_object (); |
2525 | tmp = part->clone (); |
2561 | copy_object (part, tmp); |
|
|
2562 | tmp->x -= src->x; |
2526 | tmp->x -= src->x; |
2563 | tmp->y -= src->y; |
2527 | tmp->y -= src->y; |
|
|
2528 | |
2564 | if (!part->head) |
2529 | if (!part->head) |
2565 | { |
2530 | { |
2566 | dst = tmp; |
2531 | dst = tmp; |
2567 | tmp->head = NULL; |
2532 | tmp->head = 0; |
2568 | } |
2533 | } |
2569 | else |
2534 | else |
2570 | { |
2535 | { |
2571 | tmp->head = dst; |
2536 | tmp->head = dst; |
2572 | } |
2537 | } |
|
|
2538 | |
2573 | tmp->more = NULL; |
2539 | tmp->more = 0; |
|
|
2540 | |
2574 | if (prev) |
2541 | if (prev) |
2575 | prev->more = tmp; |
2542 | prev->more = tmp; |
|
|
2543 | |
2576 | prev = tmp; |
2544 | prev = tmp; |
2577 | } |
2545 | } |
2578 | |
2546 | |
2579 | for (item = src->inv; item; item = item->below) |
2547 | for (item = src->inv; item; item = item->below) |
2580 | insert_ob_in_ob (object_create_clone (item), dst); |
2548 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2606 | } |
2574 | } |
2607 | |
2575 | |
2608 | fprintf (tempfile, obstr); |
2576 | fprintf (tempfile, obstr); |
2609 | fclose (tempfile); |
2577 | fclose (tempfile); |
2610 | |
2578 | |
2611 | op = get_object (); |
2579 | op = object::create (); |
2612 | |
2580 | |
2613 | object_thawer thawer (filename); |
2581 | object_thawer thawer (filename); |
2614 | |
2582 | |
2615 | if (thawer) |
2583 | if (thawer) |
2616 | load_object (thawer, op, 0); |
2584 | load_object (thawer, op, 0); |