… | |
… | |
104 | _exit (1); |
104 | _exit (1); |
105 | } |
105 | } |
106 | |
106 | |
107 | uuid.seq = uid; |
107 | uuid.seq = uid; |
108 | write_uuid (); |
108 | write_uuid (); |
109 | LOG (llevDebug, "read UID: %lld\n", uid); |
109 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
110 | fclose (fp); |
110 | fclose (fp); |
111 | } |
111 | } |
112 | |
112 | |
113 | UUID |
113 | UUID |
114 | gen_uuid () |
114 | gen_uuid () |
… | |
… | |
183 | * |
183 | * |
184 | * Note that this function appears a lot longer than the macro it |
184 | * Note that this function appears a lot longer than the macro it |
185 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
185 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
186 | * reduce this to the same efficiency. |
186 | * reduce this to the same efficiency. |
187 | * |
187 | * |
188 | * Check nrof variable *before* calling CAN_MERGE() |
188 | * Check nrof variable *before* calling can_merge() |
189 | * |
189 | * |
190 | * Improvements made with merge: Better checking on potion, and also |
190 | * Improvements made with merge: Better checking on potion, and also |
191 | * check weight |
191 | * check weight |
192 | */ |
192 | */ |
193 | |
193 | |
194 | bool object::can_merge (object *ob1, object *ob2) |
194 | bool object::can_merge_slow (object *ob1, object *ob2) |
195 | { |
195 | { |
196 | /* A couple quicksanity checks */ |
196 | /* A couple quicksanity checks */ |
197 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
197 | if (ob1 == ob2 |
|
|
198 | || ob1->type != ob2->type |
|
|
199 | || ob1->speed != ob2->speed |
|
|
200 | || ob1->value != ob2->value |
|
|
201 | || ob1->name != ob2->name) |
198 | return 0; |
202 | return 0; |
199 | |
203 | |
200 | if (ob1->speed != ob2->speed) |
204 | //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 |
205 | /* 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 |
206 | * value could not be stored in a sint32 (which unfortunately sometimes is |
205 | * used to store nrof). |
207 | * used to store nrof). |
206 | */ |
208 | */ |
207 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
209 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
260 | /* if one object has inventory but the other doesn't, not equiv */ |
262 | /* if one object has inventory but the other doesn't, not equiv */ |
261 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
263 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
262 | return 0; |
264 | return 0; |
263 | |
265 | |
264 | /* Now check to see if the two inventory objects could merge */ |
266 | /* Now check to see if the two inventory objects could merge */ |
265 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
267 | if (!object::can_merge (ob1->inv, ob2->inv)) |
266 | return 0; |
268 | return 0; |
267 | |
269 | |
268 | /* inventory ok - still need to check rest of this object to see |
270 | /* inventory ok - still need to check rest of this object to see |
269 | * if it is valid. |
271 | * if it is valid. |
270 | */ |
272 | */ |
… | |
… | |
374 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
376 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
375 | * Some error messages. |
377 | * Some error messages. |
376 | * The result of the dump is stored in the static global errmsg array. |
378 | * The result of the dump is stored in the static global errmsg array. |
377 | */ |
379 | */ |
378 | |
380 | |
379 | void |
381 | char * |
380 | dump_object2 (object *op) |
|
|
381 | { |
|
|
382 | errmsg[0] = 0; |
|
|
383 | return; |
|
|
384 | //TODO//D#d# |
|
|
385 | #if 0 |
|
|
386 | char *cp; |
|
|
387 | |
|
|
388 | /* object *tmp;*/ |
|
|
389 | |
|
|
390 | if (op->arch != NULL) |
|
|
391 | { |
|
|
392 | strcat (errmsg, "arch "); |
|
|
393 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
394 | strcat (errmsg, "\n"); |
|
|
395 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
396 | strcat (errmsg, cp); |
|
|
397 | # if 0 |
|
|
398 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
399 | * will overflow the buffer. |
|
|
400 | * Changed so that we don't dump inventory either. This may |
|
|
401 | * also overflow the buffer. |
|
|
402 | */ |
|
|
403 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
404 | strcat (errmsg, cp); |
|
|
405 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
406 | dump_object2 (tmp); |
|
|
407 | # endif |
|
|
408 | strcat (errmsg, "end\n"); |
|
|
409 | } |
|
|
410 | else |
|
|
411 | { |
|
|
412 | strcat (errmsg, "Object "); |
|
|
413 | if (op->name == NULL) |
|
|
414 | strcat (errmsg, "(null)"); |
|
|
415 | else |
|
|
416 | strcat (errmsg, op->name); |
|
|
417 | strcat (errmsg, "\n"); |
|
|
418 | # if 0 |
|
|
419 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
420 | strcat (errmsg, cp); |
|
|
421 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
422 | dump_object2 (tmp); |
|
|
423 | # endif |
|
|
424 | strcat (errmsg, "end\n"); |
|
|
425 | } |
|
|
426 | #endif |
|
|
427 | } |
|
|
428 | |
|
|
429 | /* |
|
|
430 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
431 | */ |
|
|
432 | |
|
|
433 | void |
|
|
434 | dump_object (object *op) |
382 | dump_object (object *op) |
435 | { |
383 | { |
436 | if (op == NULL) |
384 | if (!op) |
437 | { |
385 | return strdup ("[NULLOBJ]"); |
438 | strcpy (errmsg, "[NULL pointer]"); |
|
|
439 | return; |
|
|
440 | } |
|
|
441 | errmsg[0] = '\0'; |
|
|
442 | dump_object2 (op); |
|
|
443 | } |
|
|
444 | |
386 | |
445 | void |
387 | object_freezer freezer; |
446 | dump_all_objects (void) |
388 | save_object (freezer, op, 3); |
447 | { |
389 | return freezer.as_string (); |
448 | object *op; |
|
|
449 | |
|
|
450 | for (op = object::first; op != NULL; op = op->next) |
|
|
451 | { |
|
|
452 | dump_object (op); |
|
|
453 | fprintf (logfile, "Object %s\n", errmsg); |
|
|
454 | } |
|
|
455 | } |
390 | } |
456 | |
391 | |
457 | /* |
392 | /* |
458 | * get_nearest_part(multi-object, object 2) returns the part of the |
393 | * get_nearest_part(multi-object, object 2) returns the part of the |
459 | * multi-object 1 which is closest to the second object. |
394 | * multi-object 1 which is closest to the second object. |
… | |
… | |
479 | */ |
414 | */ |
480 | |
415 | |
481 | object * |
416 | object * |
482 | find_object (tag_t i) |
417 | find_object (tag_t i) |
483 | { |
418 | { |
484 | object *op; |
|
|
485 | |
|
|
486 | for (op = object::first; op != NULL; op = op->next) |
419 | for (object *op = object::first; op; op = op->next) |
487 | if (op->count == i) |
420 | if (op->count == i) |
488 | break; |
421 | return op; |
489 | |
422 | |
490 | return op; |
423 | return 0; |
491 | } |
424 | } |
492 | |
425 | |
493 | /* |
426 | /* |
494 | * Returns the first object which has a name equal to the argument. |
427 | * Returns the first object which has a name equal to the argument. |
495 | * Used only by the patch command, but not all that useful. |
428 | * Used only by the patch command, but not all that useful. |
… | |
… | |
595 | |
528 | |
596 | if (settings.casting_time) |
529 | if (settings.casting_time) |
597 | casting_time = -1; |
530 | casting_time = -1; |
598 | } |
531 | } |
599 | |
532 | |
600 | void object::clone (object *destination) |
|
|
601 | { |
|
|
602 | *(object_copy *)destination = *this; |
|
|
603 | *(object_pod *)destination = *this; |
|
|
604 | |
|
|
605 | if (self || cb) |
|
|
606 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
607 | } |
|
|
608 | |
|
|
609 | /* |
533 | /* |
610 | * copy object first frees everything allocated by the second object, |
534 | * copy_to first frees everything allocated by the dst object, |
611 | * and then copies the contends of the first object into the second |
535 | * and then copies the contents of itself into the second |
612 | * object, allocating what needs to be allocated. Basically, any |
536 | * object, allocating what needs to be allocated. Basically, any |
613 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
537 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
614 | * if the first object is freed, the pointers in the new object |
538 | * if the first object is freed, the pointers in the new object |
615 | * will point at garbage. |
539 | * will point at garbage. |
616 | */ |
540 | */ |
617 | void |
541 | void |
618 | copy_object (object *op2, object *op) |
542 | object::copy_to (object *dst) |
619 | { |
543 | { |
620 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
544 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
621 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
545 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
622 | |
546 | |
623 | op2->clone (op); |
547 | *(object_copy *)dst = *this; |
|
|
548 | *(object_pod *)dst = *this; |
|
|
549 | |
|
|
550 | if (self || cb) |
|
|
551 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
624 | |
552 | |
625 | if (is_freed) |
553 | if (is_freed) |
626 | SET_FLAG (op, FLAG_FREED); |
554 | SET_FLAG (dst, FLAG_FREED); |
|
|
555 | |
627 | if (is_removed) |
556 | if (is_removed) |
628 | SET_FLAG (op, FLAG_REMOVED); |
557 | SET_FLAG (dst, FLAG_REMOVED); |
629 | |
558 | |
630 | if (op2->speed < 0) |
559 | if (speed < 0) |
631 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
560 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
632 | |
561 | |
633 | /* Copy over key_values, if any. */ |
562 | /* Copy over key_values, if any. */ |
634 | if (op2->key_values) |
563 | if (key_values) |
635 | { |
564 | { |
636 | key_value *tail = 0; |
565 | key_value *tail = 0; |
637 | key_value *i; |
566 | key_value *i; |
638 | |
567 | |
639 | op->key_values = 0; |
568 | dst->key_values = 0; |
640 | |
569 | |
641 | for (i = op2->key_values; i; i = i->next) |
570 | for (i = key_values; i; i = i->next) |
642 | { |
571 | { |
643 | key_value *new_link = new key_value; |
572 | key_value *new_link = new key_value; |
644 | |
573 | |
645 | new_link->next = 0; |
574 | new_link->next = 0; |
646 | new_link->key = i->key; |
575 | new_link->key = i->key; |
647 | new_link->value = i->value; |
576 | new_link->value = i->value; |
648 | |
577 | |
649 | /* Try and be clever here, too. */ |
578 | /* Try and be clever here, too. */ |
650 | if (!op->key_values) |
579 | if (!dst->key_values) |
651 | { |
580 | { |
652 | op->key_values = new_link; |
581 | dst->key_values = new_link; |
653 | tail = new_link; |
582 | tail = new_link; |
654 | } |
583 | } |
655 | else |
584 | else |
656 | { |
585 | { |
657 | tail->next = new_link; |
586 | tail->next = new_link; |
658 | tail = new_link; |
587 | tail = new_link; |
659 | } |
588 | } |
660 | } |
589 | } |
661 | } |
590 | } |
662 | |
591 | |
663 | update_ob_speed (op); |
592 | update_ob_speed (dst); |
|
|
593 | } |
|
|
594 | |
|
|
595 | object * |
|
|
596 | object::clone () |
|
|
597 | { |
|
|
598 | object *neu = create (); |
|
|
599 | copy_to (neu); |
|
|
600 | return neu; |
664 | } |
601 | } |
665 | |
602 | |
666 | /* |
603 | /* |
667 | * If an object with the IS_TURNABLE() flag needs to be turned due |
604 | * If an object with the IS_TURNABLE() flag needs to be turned due |
668 | * to the closest player being on the other side, this function can |
605 | * to the closest player being on the other side, this function can |
… | |
… | |
873 | update_now = 1; |
810 | update_now = 1; |
874 | |
811 | |
875 | if ((move_slow | op->move_slow) != move_slow) |
812 | if ((move_slow | op->move_slow) != move_slow) |
876 | update_now = 1; |
813 | update_now = 1; |
877 | } |
814 | } |
|
|
815 | |
878 | /* if the object is being removed, we can't make intelligent |
816 | /* if the object is being removed, we can't make intelligent |
879 | * decisions, because remove_ob can't really pass the object |
817 | * decisions, because remove_ob can't really pass the object |
880 | * that is being removed. |
818 | * that is being removed. |
881 | */ |
819 | */ |
882 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
820 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
908 | else |
846 | else |
909 | { |
847 | { |
910 | delete *i; |
848 | delete *i; |
911 | mortals.erase (i); |
849 | mortals.erase (i); |
912 | } |
850 | } |
913 | |
|
|
914 | static int lastmortals = 0;//D |
|
|
915 | |
|
|
916 | if (mortals.size() != lastmortals)//D |
|
|
917 | { |
|
|
918 | lastmortals = mortals.size ();//D |
|
|
919 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
920 | } |
|
|
921 | } |
851 | } |
922 | |
852 | |
923 | object::object () |
853 | object::object () |
924 | { |
854 | { |
925 | SET_FLAG (this, FLAG_REMOVED); |
855 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
972 | * it from the list of used objects, and puts it on the list of |
902 | * it from the list of used objects, and puts it on the list of |
973 | * free objects. The IS_FREED() flag is set in the object. |
903 | * free objects. The IS_FREED() flag is set in the object. |
974 | * The object must have been removed by remove_ob() first for |
904 | * The object must have been removed by remove_ob() first for |
975 | * this function to succeed. |
905 | * this function to succeed. |
976 | * |
906 | * |
977 | * If free_inventory is set, free inventory as well. Else drop items in |
907 | * If destroy_inventory is set, free inventory as well. Else drop items in |
978 | * inventory to the ground. |
908 | * inventory to the ground. |
979 | */ |
909 | */ |
980 | void object::free (bool free_inventory) |
910 | void object::destroy (bool destroy_inventory) |
981 | { |
911 | { |
982 | if (QUERY_FLAG (this, FLAG_FREED)) |
912 | if (QUERY_FLAG (this, FLAG_FREED)) |
983 | return; |
913 | return; |
984 | |
914 | |
985 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
915 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
986 | remove_friendly_object (this); |
916 | remove_friendly_object (this); |
987 | |
917 | |
988 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
918 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
989 | remove_ob (this); |
919 | remove (); |
990 | |
920 | |
991 | SET_FLAG (this, FLAG_FREED); |
921 | SET_FLAG (this, FLAG_FREED); |
992 | |
922 | |
993 | if (more) |
923 | if (more) |
994 | { |
924 | { |
995 | more->free (free_inventory); |
925 | more->destroy (destroy_inventory); |
996 | more = 0; |
926 | more = 0; |
997 | } |
927 | } |
998 | |
928 | |
999 | if (inv) |
929 | if (inv) |
1000 | { |
930 | { |
1001 | /* Only if the space blocks everything do we not process - |
931 | /* Only if the space blocks everything do we not process - |
1002 | * if some form of movement is allowed, let objects |
932 | * if some form of movement is allowed, let objects |
1003 | * drop on that space. |
933 | * drop on that space. |
1004 | */ |
934 | */ |
1005 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
935 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
1006 | { |
936 | { |
1007 | object *op = inv; |
937 | object *op = inv; |
1008 | |
938 | |
1009 | while (op) |
939 | while (op) |
1010 | { |
940 | { |
1011 | object *tmp = op->below; |
941 | object *tmp = op->below; |
1012 | op->free (free_inventory); |
942 | op->destroy (destroy_inventory); |
1013 | op = tmp; |
943 | op = tmp; |
1014 | } |
944 | } |
1015 | } |
945 | } |
1016 | else |
946 | else |
1017 | { /* Put objects in inventory onto this space */ |
947 | { /* Put objects in inventory onto this space */ |
… | |
… | |
1019 | |
949 | |
1020 | while (op) |
950 | while (op) |
1021 | { |
951 | { |
1022 | object *tmp = op->below; |
952 | object *tmp = op->below; |
1023 | |
953 | |
1024 | remove_ob (op); |
954 | op->remove (); |
1025 | |
955 | |
1026 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
956 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
1027 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
957 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
1028 | free_object (op); |
958 | op->destroy (); |
1029 | else |
959 | else |
1030 | { |
960 | { |
1031 | op->x = x; |
961 | op->x = x; |
1032 | op->y = y; |
962 | op->y = y; |
1033 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
963 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
1036 | op = tmp; |
966 | op = tmp; |
1037 | } |
967 | } |
1038 | } |
968 | } |
1039 | } |
969 | } |
1040 | |
970 | |
|
|
971 | // hack to ensure that freed objects still have a valid map |
|
|
972 | { |
|
|
973 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
974 | |
|
|
975 | if (!freed_map) |
|
|
976 | { |
|
|
977 | freed_map = new maptile; |
|
|
978 | |
|
|
979 | freed_map->name = "/internal/freed_objects_map"; |
|
|
980 | freed_map->width = 3; |
|
|
981 | freed_map->height = 3; |
|
|
982 | |
|
|
983 | freed_map->allocate (); |
|
|
984 | } |
|
|
985 | |
|
|
986 | map = freed_map; |
|
|
987 | x = 1; |
|
|
988 | y = 1; |
|
|
989 | } |
|
|
990 | |
1041 | // clear those pointers that likely might have circular references to us |
991 | // clear those pointers that likely might have circular references to us |
1042 | owner = 0; |
992 | owner = 0; |
1043 | enemy = 0; |
993 | enemy = 0; |
1044 | attacked_by = 0; |
994 | attacked_by = 0; |
1045 | |
995 | |
|
|
996 | // only relevant for players(?), but make sure of it anyways |
|
|
997 | contr = 0; |
|
|
998 | |
1046 | /* Remove object from the active list */ |
999 | /* Remove object from the active list */ |
1047 | speed = 0; |
1000 | speed = 0; |
1048 | update_ob_speed (this); |
1001 | update_ob_speed (this); |
1049 | |
1002 | |
1050 | unlink (); |
1003 | unlink (); |
… | |
… | |
1054 | |
1007 | |
1055 | /* |
1008 | /* |
1056 | * sub_weight() recursively (outwards) subtracts a number from the |
1009 | * sub_weight() recursively (outwards) subtracts a number from the |
1057 | * weight of an object (and what is carried by it's environment(s)). |
1010 | * weight of an object (and what is carried by it's environment(s)). |
1058 | */ |
1011 | */ |
1059 | |
|
|
1060 | void |
1012 | void |
1061 | sub_weight (object *op, signed long weight) |
1013 | sub_weight (object *op, signed long weight) |
1062 | { |
1014 | { |
1063 | while (op != NULL) |
1015 | while (op != NULL) |
1064 | { |
1016 | { |
… | |
… | |
1068 | op->carrying -= weight; |
1020 | op->carrying -= weight; |
1069 | op = op->env; |
1021 | op = op->env; |
1070 | } |
1022 | } |
1071 | } |
1023 | } |
1072 | |
1024 | |
1073 | /* remove_ob(op): |
1025 | /* op->remove (): |
1074 | * This function removes the object op from the linked list of objects |
1026 | * This function removes the object op from the linked list of objects |
1075 | * which it is currently tied to. When this function is done, the |
1027 | * which it is currently tied to. When this function is done, the |
1076 | * object will have no environment. If the object previously had an |
1028 | * object will have no environment. If the object previously had an |
1077 | * environment, the x and y coordinates will be updated to |
1029 | * environment, the x and y coordinates will be updated to |
1078 | * the previous environment. |
1030 | * the previous environment. |
1079 | * Beware: This function is called from the editor as well! |
1031 | * Beware: This function is called from the editor as well! |
1080 | */ |
1032 | */ |
1081 | |
|
|
1082 | void |
1033 | void |
1083 | remove_ob (object *op) |
1034 | object::remove () |
1084 | { |
1035 | { |
1085 | object *tmp, *last = 0; |
1036 | object *tmp, *last = 0; |
1086 | object *otmp; |
1037 | object *otmp; |
1087 | |
1038 | |
1088 | int check_walk_off; |
1039 | int check_walk_off; |
1089 | maptile *m; |
|
|
1090 | |
1040 | |
1091 | sint16 x, y; |
|
|
1092 | |
|
|
1093 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1041 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1094 | return; |
1042 | return; |
1095 | |
1043 | |
1096 | SET_FLAG (op, FLAG_REMOVED); |
1044 | SET_FLAG (this, FLAG_REMOVED); |
1097 | |
1045 | |
1098 | if (op->more != NULL) |
1046 | if (more) |
1099 | remove_ob (op->more); |
1047 | more->remove (); |
1100 | |
1048 | |
1101 | /* |
1049 | /* |
1102 | * In this case, the object to be removed is in someones |
1050 | * In this case, the object to be removed is in someones |
1103 | * inventory. |
1051 | * inventory. |
1104 | */ |
1052 | */ |
1105 | if (op->env != NULL) |
1053 | if (env) |
1106 | { |
1054 | { |
1107 | if (op->nrof) |
1055 | if (nrof) |
1108 | sub_weight (op->env, op->weight * op->nrof); |
1056 | sub_weight (env, weight * nrof); |
1109 | else |
1057 | else |
1110 | sub_weight (op->env, op->weight + op->carrying); |
1058 | sub_weight (env, weight + carrying); |
1111 | |
1059 | |
1112 | /* NO_FIX_PLAYER is set when a great many changes are being |
1060 | /* NO_FIX_PLAYER is set when a great many changes are being |
1113 | * made to players inventory. If set, avoiding the call |
1061 | * made to players inventory. If set, avoiding the call |
1114 | * to save cpu time. |
1062 | * to save cpu time. |
1115 | */ |
1063 | */ |
1116 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1064 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1117 | fix_player (otmp); |
1065 | fix_player (otmp); |
1118 | |
1066 | |
1119 | if (op->above != NULL) |
1067 | if (above != NULL) |
1120 | op->above->below = op->below; |
1068 | above->below = below; |
1121 | else |
1069 | else |
1122 | op->env->inv = op->below; |
1070 | env->inv = below; |
1123 | |
1071 | |
1124 | if (op->below != NULL) |
1072 | if (below != NULL) |
1125 | op->below->above = op->above; |
1073 | below->above = above; |
1126 | |
1074 | |
1127 | /* we set up values so that it could be inserted into |
1075 | /* we set up values so that it could be inserted into |
1128 | * the map, but we don't actually do that - it is up |
1076 | * the map, but we don't actually do that - it is up |
1129 | * to the caller to decide what we want to do. |
1077 | * to the caller to decide what we want to do. |
1130 | */ |
1078 | */ |
1131 | op->x = op->env->x, op->y = op->env->y; |
1079 | x = env->x, y = env->y; |
1132 | op->map = op->env->map; |
1080 | map = env->map; |
1133 | op->above = NULL, op->below = NULL; |
1081 | above = 0, below = 0; |
1134 | op->env = NULL; |
1082 | env = 0; |
1135 | } |
1083 | } |
1136 | else if (op->map) |
1084 | else if (map) |
1137 | { |
1085 | { |
1138 | x = op->x; |
|
|
1139 | y = op->y; |
|
|
1140 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1141 | |
|
|
1142 | if (!m) |
|
|
1143 | { |
|
|
1144 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1145 | op->map->path, op->x, op->y); |
|
|
1146 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1147 | * it seems if we get into this case, something is probablye |
|
|
1148 | * screwed up and should be fixed. |
|
|
1149 | */ |
|
|
1150 | abort (); |
|
|
1151 | } |
|
|
1152 | |
|
|
1153 | if (op->map != m) |
|
|
1154 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1155 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1156 | |
|
|
1157 | /* Re did the following section of code - it looks like it had |
1086 | /* Re did the following section of code - it looks like it had |
1158 | * lots of logic for things we no longer care about |
1087 | * lots of logic for things we no longer care about |
1159 | */ |
1088 | */ |
1160 | |
1089 | |
1161 | /* link the object above us */ |
1090 | /* link the object above us */ |
1162 | if (op->above) |
1091 | if (above) |
1163 | op->above->below = op->below; |
1092 | above->below = below; |
1164 | else |
1093 | else |
1165 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1094 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1166 | |
1095 | |
1167 | /* Relink the object below us, if there is one */ |
1096 | /* Relink the object below us, if there is one */ |
1168 | if (op->below) |
1097 | if (below) |
1169 | op->below->above = op->above; |
1098 | below->above = above; |
1170 | else |
1099 | else |
1171 | { |
1100 | { |
1172 | /* Nothing below, which means we need to relink map object for this space |
1101 | /* Nothing below, which means we need to relink map object for this space |
1173 | * use translated coordinates in case some oddness with map tiling is |
1102 | * use translated coordinates in case some oddness with map tiling is |
1174 | * evident |
1103 | * evident |
1175 | */ |
1104 | */ |
1176 | if (GET_MAP_OB (m, x, y) != op) |
1105 | if (GET_MAP_OB (map, x, y) != this) |
1177 | { |
1106 | { |
1178 | dump_object (op); |
1107 | char *dump = dump_object (this); |
1179 | LOG (llevError, |
1108 | LOG (llevError, |
1180 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1109 | "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); |
|
|
1110 | free (dump); |
1181 | dump_object (GET_MAP_OB (m, x, y)); |
1111 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1182 | LOG (llevError, "%s\n", errmsg); |
1112 | LOG (llevError, "%s\n", dump); |
|
|
1113 | free (dump); |
1183 | } |
1114 | } |
1184 | |
1115 | |
1185 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1116 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1186 | } |
1117 | } |
1187 | |
1118 | |
1188 | op->above = 0; |
1119 | above = 0; |
1189 | op->below = 0; |
1120 | below = 0; |
1190 | |
1121 | |
1191 | if (op->map->in_memory == MAP_SAVING) |
1122 | if (map->in_memory == MAP_SAVING) |
1192 | return; |
1123 | return; |
1193 | |
1124 | |
1194 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1125 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1195 | |
1126 | |
1196 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1127 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1197 | { |
1128 | { |
1198 | /* No point updating the players look faces if he is the object |
1129 | /* No point updating the players look faces if he is the object |
1199 | * being removed. |
1130 | * being removed. |
1200 | */ |
1131 | */ |
1201 | |
1132 | |
1202 | if (tmp->type == PLAYER && tmp != op) |
1133 | if (tmp->type == PLAYER && tmp != this) |
1203 | { |
1134 | { |
1204 | /* If a container that the player is currently using somehow gets |
1135 | /* If a container that the player is currently using somehow gets |
1205 | * removed (most likely destroyed), update the player view |
1136 | * removed (most likely destroyed), update the player view |
1206 | * appropriately. |
1137 | * appropriately. |
1207 | */ |
1138 | */ |
1208 | if (tmp->container == op) |
1139 | if (tmp->container == this) |
1209 | { |
1140 | { |
1210 | CLEAR_FLAG (op, FLAG_APPLIED); |
1141 | CLEAR_FLAG (this, FLAG_APPLIED); |
1211 | tmp->container = NULL; |
1142 | tmp->container = 0; |
1212 | } |
1143 | } |
1213 | |
1144 | |
1214 | tmp->contr->socket.update_look = 1; |
1145 | tmp->contr->socket.update_look = 1; |
1215 | } |
1146 | } |
1216 | |
1147 | |
1217 | /* See if player moving off should effect something */ |
1148 | /* See if player moving off should effect something */ |
1218 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1149 | if (check_walk_off |
|
|
1150 | && ((move_type & tmp->move_off) |
|
|
1151 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1219 | { |
1152 | { |
1220 | move_apply (tmp, op, NULL); |
1153 | move_apply (tmp, this, 0); |
1221 | |
1154 | |
1222 | if (op->destroyed ()); |
1155 | if (destroyed ()) |
1223 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1156 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1224 | } |
1157 | } |
1225 | |
1158 | |
1226 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1159 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1227 | |
1160 | |
1228 | if (tmp->above == tmp) |
1161 | if (tmp->above == tmp) |
1229 | tmp->above = NULL; |
1162 | tmp->above = 0; |
1230 | |
1163 | |
1231 | last = tmp; |
1164 | last = tmp; |
1232 | } |
1165 | } |
1233 | |
1166 | |
1234 | /* last == NULL of there are no objects on this space */ |
1167 | /* last == NULL of there are no objects on this space */ |
1235 | if (last == NULL) |
1168 | if (!last) |
1236 | { |
1169 | { |
1237 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1170 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1238 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1171 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1239 | * those out anyways, and if there are any flags set right now, they won't |
1172 | * those out anyways, and if there are any flags set right now, they won't |
1240 | * be correct anyways. |
1173 | * be correct anyways. |
1241 | */ |
1174 | */ |
1242 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1175 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1243 | update_position (op->map, op->x, op->y); |
1176 | update_position (map, x, y); |
1244 | } |
1177 | } |
1245 | else |
1178 | else |
1246 | update_object (last, UP_OBJ_REMOVE); |
1179 | update_object (last, UP_OBJ_REMOVE); |
1247 | |
1180 | |
1248 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1181 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1249 | update_all_los (op->map, op->x, op->y); |
1182 | update_all_los (map, x, y); |
1250 | } |
1183 | } |
1251 | } |
1184 | } |
1252 | |
1185 | |
1253 | /* |
1186 | /* |
1254 | * merge_ob(op,top): |
1187 | * merge_ob(op,top): |
… | |
… | |
1269 | |
1202 | |
1270 | for (; top != NULL; top = top->below) |
1203 | for (; top != NULL; top = top->below) |
1271 | { |
1204 | { |
1272 | if (top == op) |
1205 | if (top == op) |
1273 | continue; |
1206 | continue; |
1274 | if (CAN_MERGE (op, top)) |
1207 | |
|
|
1208 | if (object::can_merge (op, top)) |
1275 | { |
1209 | { |
1276 | top->nrof += op->nrof; |
1210 | top->nrof += op->nrof; |
1277 | |
1211 | |
1278 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1212 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1279 | op->weight = 0; /* Don't want any adjustements now */ |
1213 | op->weight = 0; /* Don't want any adjustements now */ |
1280 | remove_ob (op); |
1214 | op->destroy (); |
1281 | free_object (op); |
|
|
1282 | return top; |
1215 | return top; |
1283 | } |
1216 | } |
1284 | } |
1217 | } |
1285 | |
1218 | |
1286 | return 0; |
1219 | return 0; |
… | |
… | |
1340 | return NULL; |
1273 | return NULL; |
1341 | } |
1274 | } |
1342 | |
1275 | |
1343 | if (m == NULL) |
1276 | if (m == NULL) |
1344 | { |
1277 | { |
1345 | dump_object (op); |
1278 | char *dump = dump_object (op); |
1346 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1279 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1280 | free (dump); |
1347 | return op; |
1281 | return op; |
1348 | } |
1282 | } |
1349 | |
1283 | |
1350 | if (out_of_map (m, op->x, op->y)) |
1284 | if (out_of_map (m, op->x, op->y)) |
1351 | { |
1285 | { |
1352 | dump_object (op); |
1286 | char *dump = dump_object (op); |
1353 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1287 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1354 | #ifdef MANY_CORES |
1288 | #ifdef MANY_CORES |
1355 | /* Better to catch this here, as otherwise the next use of this object |
1289 | /* Better to catch this here, as otherwise the next use of this object |
1356 | * is likely to cause a crash. Better to find out where it is getting |
1290 | * is likely to cause a crash. Better to find out where it is getting |
1357 | * improperly inserted. |
1291 | * improperly inserted. |
1358 | */ |
1292 | */ |
1359 | abort (); |
1293 | abort (); |
1360 | #endif |
1294 | #endif |
|
|
1295 | free (dump); |
1361 | return op; |
1296 | return op; |
1362 | } |
1297 | } |
1363 | |
1298 | |
1364 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1299 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1365 | { |
1300 | { |
1366 | dump_object (op); |
1301 | char *dump = dump_object (op); |
1367 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1302 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1303 | free (dump); |
1368 | return op; |
1304 | return op; |
1369 | } |
1305 | } |
1370 | |
1306 | |
1371 | if (op->more != NULL) |
1307 | if (op->more != NULL) |
1372 | { |
1308 | { |
… | |
… | |
1410 | |
1346 | |
1411 | /* this has to be done after we translate the coordinates. |
1347 | /* this has to be done after we translate the coordinates. |
1412 | */ |
1348 | */ |
1413 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1349 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1414 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1350 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1415 | if (CAN_MERGE (op, tmp)) |
1351 | if (object::can_merge (op, tmp)) |
1416 | { |
1352 | { |
1417 | op->nrof += tmp->nrof; |
1353 | op->nrof += tmp->nrof; |
1418 | remove_ob (tmp); |
1354 | tmp->destroy (); |
1419 | free_object (tmp); |
|
|
1420 | } |
1355 | } |
1421 | |
1356 | |
1422 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1357 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1423 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1358 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1424 | |
1359 | |
… | |
… | |
1610 | tmp1; |
1545 | tmp1; |
1611 | |
1546 | |
1612 | /* first search for itself and remove any old instances */ |
1547 | /* first search for itself and remove any old instances */ |
1613 | |
1548 | |
1614 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1549 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1615 | { |
|
|
1616 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1550 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1617 | { |
1551 | tmp->destroy (); |
1618 | remove_ob (tmp); |
|
|
1619 | free_object (tmp); |
|
|
1620 | } |
|
|
1621 | } |
|
|
1622 | |
1552 | |
1623 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1553 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1624 | |
1554 | |
1625 | tmp1->x = op->x; |
1555 | tmp1->x = op->x; |
1626 | tmp1->y = op->y; |
1556 | tmp1->y = op->y; |
… | |
… | |
1636 | */ |
1566 | */ |
1637 | |
1567 | |
1638 | object * |
1568 | object * |
1639 | get_split_ob (object *orig_ob, uint32 nr) |
1569 | get_split_ob (object *orig_ob, uint32 nr) |
1640 | { |
1570 | { |
1641 | object * |
1571 | object *newob; |
1642 | newob; |
|
|
1643 | int |
|
|
1644 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1572 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1645 | |
1573 | |
1646 | if (orig_ob->nrof < nr) |
1574 | if (orig_ob->nrof < nr) |
1647 | { |
1575 | { |
1648 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1576 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1649 | return NULL; |
1577 | return NULL; |
1650 | } |
1578 | } |
1651 | |
1579 | |
1652 | newob = object_create_clone (orig_ob); |
1580 | newob = object_create_clone (orig_ob); |
1653 | |
1581 | |
1654 | if ((orig_ob->nrof -= nr) < 1) |
1582 | if ((orig_ob->nrof -= nr) < 1) |
1655 | { |
1583 | orig_ob->destroy (1); |
1656 | if (!is_removed) |
|
|
1657 | remove_ob (orig_ob); |
|
|
1658 | free_object2 (orig_ob, 1); |
|
|
1659 | } |
|
|
1660 | else if (!is_removed) |
1584 | else if (!is_removed) |
1661 | { |
1585 | { |
1662 | if (orig_ob->env != NULL) |
1586 | if (orig_ob->env != NULL) |
1663 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1587 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1664 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1588 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1728 | esrv_send_item (tmp, op); |
1652 | esrv_send_item (tmp, op); |
1729 | } |
1653 | } |
1730 | } |
1654 | } |
1731 | else |
1655 | else |
1732 | { |
1656 | { |
1733 | remove_ob (op); |
1657 | op->remove (); |
1734 | op->nrof = 0; |
1658 | op->nrof = 0; |
1735 | if (tmp) |
1659 | if (tmp) |
1736 | { |
1660 | { |
1737 | esrv_del_item (tmp->contr, op->count); |
1661 | esrv_del_item (tmp->contr, op->count); |
1738 | } |
1662 | } |
… | |
… | |
1744 | |
1668 | |
1745 | if (i < op->nrof) |
1669 | if (i < op->nrof) |
1746 | op->nrof -= i; |
1670 | op->nrof -= i; |
1747 | else |
1671 | else |
1748 | { |
1672 | { |
1749 | remove_ob (op); |
1673 | op->remove (); |
1750 | op->nrof = 0; |
1674 | op->nrof = 0; |
1751 | } |
1675 | } |
1752 | |
1676 | |
1753 | /* Since we just removed op, op->above is null */ |
1677 | /* Since we just removed op, op->above is null */ |
1754 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1678 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
… | |
… | |
1763 | |
1687 | |
1764 | if (op->nrof) |
1688 | if (op->nrof) |
1765 | return op; |
1689 | return op; |
1766 | else |
1690 | else |
1767 | { |
1691 | { |
1768 | free_object (op); |
1692 | op->destroy (); |
1769 | return NULL; |
1693 | return NULL; |
1770 | } |
1694 | } |
1771 | } |
1695 | } |
1772 | |
1696 | |
1773 | /* |
1697 | /* |
… | |
… | |
1786 | op->carrying += weight; |
1710 | op->carrying += weight; |
1787 | op = op->env; |
1711 | op = op->env; |
1788 | } |
1712 | } |
1789 | } |
1713 | } |
1790 | |
1714 | |
|
|
1715 | object * |
|
|
1716 | insert_ob_in_ob (object *op, object *where) |
|
|
1717 | { |
|
|
1718 | if (!where) |
|
|
1719 | { |
|
|
1720 | char *dump = dump_object (op); |
|
|
1721 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1722 | free (dump); |
|
|
1723 | return op; |
|
|
1724 | } |
|
|
1725 | |
|
|
1726 | if (where->head) |
|
|
1727 | { |
|
|
1728 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1729 | where = where->head; |
|
|
1730 | } |
|
|
1731 | |
|
|
1732 | return where->insert (op); |
|
|
1733 | } |
|
|
1734 | |
1791 | /* |
1735 | /* |
1792 | * insert_ob_in_ob(op,environment): |
1736 | * env->insert (op) |
1793 | * This function inserts the object op in the linked list |
1737 | * This function inserts the object op in the linked list |
1794 | * inside the object environment. |
1738 | * inside the object environment. |
1795 | * |
1739 | * |
1796 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1797 | * the inventory at the last position or next to other objects of the same |
|
|
1798 | * type. |
|
|
1799 | * Frank: Now sorted by type, archetype and magic! |
|
|
1800 | * |
|
|
1801 | * The function returns now pointer to inserted item, and return value can |
1740 | * The function returns now pointer to inserted item, and return value can |
1802 | * be != op, if items are merged. -Tero |
1741 | * be != op, if items are merged. -Tero |
1803 | */ |
1742 | */ |
1804 | |
1743 | |
1805 | object * |
1744 | object * |
1806 | insert_ob_in_ob (object *op, object *where) |
1745 | object::insert (object *op) |
1807 | { |
1746 | { |
1808 | object * |
1747 | object *tmp, *otmp; |
1809 | tmp, * |
|
|
1810 | otmp; |
|
|
1811 | |
1748 | |
1812 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1749 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1813 | { |
1750 | op->remove (); |
1814 | dump_object (op); |
|
|
1815 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1816 | return op; |
|
|
1817 | } |
|
|
1818 | |
|
|
1819 | if (where == NULL) |
|
|
1820 | { |
|
|
1821 | dump_object (op); |
|
|
1822 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1823 | return op; |
|
|
1824 | } |
|
|
1825 | |
|
|
1826 | if (where->head) |
|
|
1827 | { |
|
|
1828 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1829 | where = where->head; |
|
|
1830 | } |
|
|
1831 | |
1751 | |
1832 | if (op->more) |
1752 | if (op->more) |
1833 | { |
1753 | { |
1834 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1754 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1835 | return op; |
1755 | return op; |
… | |
… | |
1837 | |
1757 | |
1838 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1758 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1839 | CLEAR_FLAG (op, FLAG_REMOVED); |
1759 | CLEAR_FLAG (op, FLAG_REMOVED); |
1840 | if (op->nrof) |
1760 | if (op->nrof) |
1841 | { |
1761 | { |
1842 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1762 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1843 | if (CAN_MERGE (tmp, op)) |
1763 | if (object::can_merge (tmp, op)) |
1844 | { |
1764 | { |
1845 | /* return the original object and remove inserted object |
1765 | /* return the original object and remove inserted object |
1846 | (client needs the original object) */ |
1766 | (client needs the original object) */ |
1847 | tmp->nrof += op->nrof; |
1767 | tmp->nrof += op->nrof; |
1848 | /* Weight handling gets pretty funky. Since we are adding to |
1768 | /* Weight handling gets pretty funky. Since we are adding to |
1849 | * tmp->nrof, we need to increase the weight. |
1769 | * tmp->nrof, we need to increase the weight. |
1850 | */ |
1770 | */ |
1851 | add_weight (where, op->weight * op->nrof); |
1771 | add_weight (this, op->weight * op->nrof); |
1852 | SET_FLAG (op, FLAG_REMOVED); |
1772 | SET_FLAG (op, FLAG_REMOVED); |
1853 | free_object (op); /* free the inserted object */ |
1773 | op->destroy (); /* free the inserted object */ |
1854 | op = tmp; |
1774 | op = tmp; |
1855 | remove_ob (op); /* and fix old object's links */ |
1775 | op->remove (); /* and fix old object's links */ |
1856 | CLEAR_FLAG (op, FLAG_REMOVED); |
1776 | CLEAR_FLAG (op, FLAG_REMOVED); |
1857 | break; |
1777 | break; |
1858 | } |
1778 | } |
1859 | |
1779 | |
1860 | /* I assume combined objects have no inventory |
1780 | /* I assume combined objects have no inventory |
1861 | * We add the weight - this object could have just been removed |
1781 | * We add the weight - this object could have just been removed |
1862 | * (if it was possible to merge). calling remove_ob will subtract |
1782 | * (if it was possible to merge). calling remove_ob will subtract |
1863 | * the weight, so we need to add it in again, since we actually do |
1783 | * the weight, so we need to add it in again, since we actually do |
1864 | * the linking below |
1784 | * the linking below |
1865 | */ |
1785 | */ |
1866 | add_weight (where, op->weight * op->nrof); |
1786 | add_weight (this, op->weight * op->nrof); |
1867 | } |
1787 | } |
1868 | else |
1788 | else |
1869 | add_weight (where, (op->weight + op->carrying)); |
1789 | add_weight (this, (op->weight + op->carrying)); |
1870 | |
1790 | |
1871 | otmp = is_player_inv (where); |
1791 | otmp = is_player_inv (this); |
1872 | if (otmp && otmp->contr != NULL) |
1792 | if (otmp && otmp->contr) |
1873 | { |
|
|
1874 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1793 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1875 | fix_player (otmp); |
1794 | fix_player (otmp); |
1876 | } |
|
|
1877 | |
1795 | |
1878 | op->map = NULL; |
1796 | op->map = NULL; |
1879 | op->env = where; |
1797 | op->env = this; |
1880 | op->above = NULL; |
1798 | op->above = NULL; |
1881 | op->below = NULL; |
1799 | op->below = NULL; |
1882 | op->x = 0, op->y = 0; |
1800 | op->x = 0, op->y = 0; |
1883 | |
1801 | |
1884 | /* reset the light list and los of the players on the map */ |
1802 | /* reset the light list and los of the players on the map */ |
1885 | if ((op->glow_radius != 0) && where->map) |
1803 | if ((op->glow_radius != 0) && map) |
1886 | { |
1804 | { |
1887 | #ifdef DEBUG_LIGHTS |
1805 | #ifdef DEBUG_LIGHTS |
1888 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1806 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1889 | #endif /* DEBUG_LIGHTS */ |
1807 | #endif /* DEBUG_LIGHTS */ |
1890 | if (MAP_DARKNESS (where->map)) |
1808 | if (MAP_DARKNESS (map)) |
1891 | update_all_los (where->map, where->x, where->y); |
1809 | update_all_los (map, x, y); |
1892 | } |
1810 | } |
1893 | |
1811 | |
1894 | /* Client has no idea of ordering so lets not bother ordering it here. |
1812 | /* Client has no idea of ordering so lets not bother ordering it here. |
1895 | * It sure simplifies this function... |
1813 | * It sure simplifies this function... |
1896 | */ |
1814 | */ |
1897 | if (where->inv == NULL) |
1815 | if (!inv) |
1898 | where->inv = op; |
1816 | inv = op; |
1899 | else |
1817 | else |
1900 | { |
1818 | { |
1901 | op->below = where->inv; |
1819 | op->below = inv; |
1902 | op->below->above = op; |
1820 | op->below->above = op; |
1903 | where->inv = op; |
1821 | inv = op; |
1904 | } |
1822 | } |
|
|
1823 | |
1905 | return op; |
1824 | return op; |
1906 | } |
1825 | } |
1907 | |
1826 | |
1908 | /* |
1827 | /* |
1909 | * Checks if any objects has a move_type that matches objects |
1828 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
2598 | * create clone from object to another |
2517 | * create clone from object to another |
2599 | */ |
2518 | */ |
2600 | object * |
2519 | object * |
2601 | object_create_clone (object *asrc) |
2520 | object_create_clone (object *asrc) |
2602 | { |
2521 | { |
2603 | object * |
|
|
2604 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2522 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2605 | |
2523 | |
2606 | if (!asrc) |
2524 | if (!asrc) |
2607 | return NULL; |
2525 | return 0; |
|
|
2526 | |
2608 | src = asrc; |
2527 | src = asrc; |
2609 | if (src->head) |
2528 | if (src->head) |
2610 | src = src->head; |
2529 | src = src->head; |
2611 | |
2530 | |
2612 | prev = NULL; |
2531 | prev = 0; |
2613 | for (part = src; part; part = part->more) |
2532 | for (part = src; part; part = part->more) |
2614 | { |
2533 | { |
2615 | tmp = get_object (); |
2534 | tmp = part->clone (); |
2616 | copy_object (part, tmp); |
|
|
2617 | tmp->x -= src->x; |
2535 | tmp->x -= src->x; |
2618 | tmp->y -= src->y; |
2536 | tmp->y -= src->y; |
|
|
2537 | |
2619 | if (!part->head) |
2538 | if (!part->head) |
2620 | { |
2539 | { |
2621 | dst = tmp; |
2540 | dst = tmp; |
2622 | tmp->head = NULL; |
2541 | tmp->head = 0; |
2623 | } |
2542 | } |
2624 | else |
2543 | else |
2625 | { |
2544 | { |
2626 | tmp->head = dst; |
2545 | tmp->head = dst; |
2627 | } |
2546 | } |
|
|
2547 | |
2628 | tmp->more = NULL; |
2548 | tmp->more = 0; |
|
|
2549 | |
2629 | if (prev) |
2550 | if (prev) |
2630 | prev->more = tmp; |
2551 | prev->more = tmp; |
|
|
2552 | |
2631 | prev = tmp; |
2553 | prev = tmp; |
2632 | } |
2554 | } |
2633 | |
2555 | |
2634 | for (item = src->inv; item; item = item->below) |
2556 | for (item = src->inv; item; item = item->below) |
2635 | insert_ob_in_ob (object_create_clone (item), dst); |
2557 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2661 | } |
2583 | } |
2662 | |
2584 | |
2663 | fprintf (tempfile, obstr); |
2585 | fprintf (tempfile, obstr); |
2664 | fclose (tempfile); |
2586 | fclose (tempfile); |
2665 | |
2587 | |
2666 | op = get_object (); |
2588 | op = object::create (); |
2667 | |
2589 | |
2668 | object_thawer thawer (filename); |
2590 | object_thawer thawer (filename); |
2669 | |
2591 | |
2670 | if (thawer) |
2592 | if (thawer) |
2671 | load_object (thawer, op, 0); |
2593 | load_object (thawer, op, 0); |