1 | |
|
|
2 | /* |
1 | /* |
3 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
4 | |
3 | |
5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
5 | Copyright (C) 1992 Frank Tore Johansen |
… | |
… | |
17 | |
16 | |
18 | You should have received a copy of the GNU General Public License |
17 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software |
18 | along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
20 | |
22 | The authors can be reached via e-mail at crossfire-devel@real-time.com |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
25 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
26 | variable. */ |
… | |
… | |
35 | |
34 | |
36 | int nrofallocobjects = 0; |
35 | int nrofallocobjects = 0; |
37 | static UUID uuid; |
36 | static UUID uuid; |
38 | const uint64 UUID_SKIP = 1<<19; |
37 | const uint64 UUID_SKIP = 1<<19; |
39 | |
38 | |
40 | object *objects; /* Pointer to the list of used objects */ |
|
|
41 | object *active_objects; /* List of active objects that need to be processed */ |
39 | object *active_objects; /* List of active objects that need to be processed */ |
42 | |
40 | |
43 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
41 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
42 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
45 | }; |
43 | }; |
… | |
… | |
106 | _exit (1); |
104 | _exit (1); |
107 | } |
105 | } |
108 | |
106 | |
109 | uuid.seq = uid; |
107 | uuid.seq = uid; |
110 | write_uuid (); |
108 | write_uuid (); |
111 | LOG (llevDebug, "read UID: %lld\n", uid); |
109 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
112 | fclose (fp); |
110 | fclose (fp); |
113 | } |
111 | } |
114 | |
112 | |
115 | UUID |
113 | UUID |
116 | gen_uuid () |
114 | gen_uuid () |
… | |
… | |
376 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
374 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
377 | * Some error messages. |
375 | * Some error messages. |
378 | * The result of the dump is stored in the static global errmsg array. |
376 | * The result of the dump is stored in the static global errmsg array. |
379 | */ |
377 | */ |
380 | |
378 | |
381 | void |
379 | char * |
382 | dump_object2 (object *op) |
|
|
383 | { |
|
|
384 | errmsg[0] = 0; |
|
|
385 | return; |
|
|
386 | //TODO//D#d# |
|
|
387 | #if 0 |
|
|
388 | char *cp; |
|
|
389 | |
|
|
390 | /* object *tmp;*/ |
|
|
391 | |
|
|
392 | if (op->arch != NULL) |
|
|
393 | { |
|
|
394 | strcat (errmsg, "arch "); |
|
|
395 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
396 | strcat (errmsg, "\n"); |
|
|
397 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
398 | strcat (errmsg, cp); |
|
|
399 | # if 0 |
|
|
400 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
401 | * will overflow the buffer. |
|
|
402 | * Changed so that we don't dump inventory either. This may |
|
|
403 | * also overflow the buffer. |
|
|
404 | */ |
|
|
405 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
406 | strcat (errmsg, cp); |
|
|
407 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
408 | dump_object2 (tmp); |
|
|
409 | # endif |
|
|
410 | strcat (errmsg, "end\n"); |
|
|
411 | } |
|
|
412 | else |
|
|
413 | { |
|
|
414 | strcat (errmsg, "Object "); |
|
|
415 | if (op->name == NULL) |
|
|
416 | strcat (errmsg, "(null)"); |
|
|
417 | else |
|
|
418 | strcat (errmsg, op->name); |
|
|
419 | strcat (errmsg, "\n"); |
|
|
420 | # if 0 |
|
|
421 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
422 | strcat (errmsg, cp); |
|
|
423 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
424 | dump_object2 (tmp); |
|
|
425 | # endif |
|
|
426 | strcat (errmsg, "end\n"); |
|
|
427 | } |
|
|
428 | #endif |
|
|
429 | } |
|
|
430 | |
|
|
431 | /* |
|
|
432 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
433 | */ |
|
|
434 | |
|
|
435 | void |
|
|
436 | dump_object (object *op) |
380 | dump_object (object *op) |
437 | { |
381 | { |
438 | if (op == NULL) |
382 | if (!op) |
439 | { |
383 | return strdup ("[NULLOBJ]"); |
440 | strcpy (errmsg, "[NULL pointer]"); |
|
|
441 | return; |
|
|
442 | } |
|
|
443 | errmsg[0] = '\0'; |
|
|
444 | dump_object2 (op); |
|
|
445 | } |
|
|
446 | |
384 | |
447 | void |
385 | object_freezer freezer; |
448 | dump_all_objects (void) |
386 | save_object (freezer, op, 3); |
449 | { |
387 | return freezer.as_string (); |
450 | object *op; |
|
|
451 | |
|
|
452 | for (op = objects; op != NULL; op = op->next) |
|
|
453 | { |
|
|
454 | dump_object (op); |
|
|
455 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
|
|
456 | } |
|
|
457 | } |
388 | } |
458 | |
389 | |
459 | /* |
390 | /* |
460 | * get_nearest_part(multi-object, object 2) returns the part of the |
391 | * get_nearest_part(multi-object, object 2) returns the part of the |
461 | * multi-object 1 which is closest to the second object. |
392 | * multi-object 1 which is closest to the second object. |
… | |
… | |
481 | */ |
412 | */ |
482 | |
413 | |
483 | object * |
414 | object * |
484 | find_object (tag_t i) |
415 | find_object (tag_t i) |
485 | { |
416 | { |
486 | object *op; |
417 | for (object *op = object::first; op; op = op->next) |
487 | |
|
|
488 | for (op = objects; op != NULL; op = op->next) |
|
|
489 | if (op->count == i) |
418 | if (op->count == i) |
490 | break; |
419 | return op; |
|
|
420 | |
491 | return op; |
421 | return 0; |
492 | } |
422 | } |
493 | |
423 | |
494 | /* |
424 | /* |
495 | * Returns the first object which has a name equal to the argument. |
425 | * Returns the first object which has a name equal to the argument. |
496 | * Used only by the patch command, but not all that useful. |
426 | * Used only by the patch command, but not all that useful. |
… | |
… | |
501 | find_object_name (const char *str) |
431 | find_object_name (const char *str) |
502 | { |
432 | { |
503 | shstr_cmp str_ (str); |
433 | shstr_cmp str_ (str); |
504 | object *op; |
434 | object *op; |
505 | |
435 | |
506 | for (op = objects; op != NULL; op = op->next) |
436 | for (op = object::first; op != NULL; op = op->next) |
507 | if (op->name == str_) |
437 | if (op->name == str_) |
508 | break; |
438 | break; |
509 | |
439 | |
510 | return op; |
440 | return op; |
511 | } |
441 | } |
… | |
… | |
596 | |
526 | |
597 | if (settings.casting_time) |
527 | if (settings.casting_time) |
598 | casting_time = -1; |
528 | casting_time = -1; |
599 | } |
529 | } |
600 | |
530 | |
601 | void object::clone (object *destination) |
|
|
602 | { |
|
|
603 | *(object_copy *)destination = *this; |
|
|
604 | *(object_pod *)destination = *this; |
|
|
605 | |
|
|
606 | if (self || cb) |
|
|
607 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
608 | } |
|
|
609 | |
|
|
610 | /* |
531 | /* |
611 | * copy object first frees everything allocated by the second object, |
532 | * copy_to first frees everything allocated by the dst object, |
612 | * and then copies the contends of the first object into the second |
533 | * and then copies the contents of itself into the second |
613 | * object, allocating what needs to be allocated. Basically, any |
534 | * object, allocating what needs to be allocated. Basically, any |
614 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
535 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
615 | * if the first object is freed, the pointers in the new object |
536 | * if the first object is freed, the pointers in the new object |
616 | * will point at garbage. |
537 | * will point at garbage. |
617 | */ |
538 | */ |
618 | void |
539 | void |
619 | copy_object (object *op2, object *op) |
540 | object::copy_to (object *dst) |
620 | { |
541 | { |
621 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
542 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
622 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
543 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
623 | |
544 | |
624 | op2->clone (op); |
545 | *(object_copy *)dst = *this; |
|
|
546 | *(object_pod *)dst = *this; |
|
|
547 | |
|
|
548 | if (self || cb) |
|
|
549 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
625 | |
550 | |
626 | if (is_freed) |
551 | if (is_freed) |
627 | SET_FLAG (op, FLAG_FREED); |
552 | SET_FLAG (dst, FLAG_FREED); |
|
|
553 | |
628 | if (is_removed) |
554 | if (is_removed) |
629 | SET_FLAG (op, FLAG_REMOVED); |
555 | SET_FLAG (dst, FLAG_REMOVED); |
630 | |
556 | |
631 | if (op2->speed < 0) |
557 | if (speed < 0) |
632 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
558 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
633 | |
559 | |
634 | /* Copy over key_values, if any. */ |
560 | /* Copy over key_values, if any. */ |
635 | if (op2->key_values) |
561 | if (key_values) |
636 | { |
562 | { |
637 | key_value *tail = 0; |
563 | key_value *tail = 0; |
638 | key_value *i; |
564 | key_value *i; |
639 | |
565 | |
640 | op->key_values = 0; |
566 | dst->key_values = 0; |
641 | |
567 | |
642 | for (i = op2->key_values; i; i = i->next) |
568 | for (i = key_values; i; i = i->next) |
643 | { |
569 | { |
644 | key_value *new_link = new key_value; |
570 | key_value *new_link = new key_value; |
645 | |
571 | |
646 | new_link->next = 0; |
572 | new_link->next = 0; |
647 | new_link->key = i->key; |
573 | new_link->key = i->key; |
648 | new_link->value = i->value; |
574 | new_link->value = i->value; |
649 | |
575 | |
650 | /* Try and be clever here, too. */ |
576 | /* Try and be clever here, too. */ |
651 | if (!op->key_values) |
577 | if (!dst->key_values) |
652 | { |
578 | { |
653 | op->key_values = new_link; |
579 | dst->key_values = new_link; |
654 | tail = new_link; |
580 | tail = new_link; |
655 | } |
581 | } |
656 | else |
582 | else |
657 | { |
583 | { |
658 | tail->next = new_link; |
584 | tail->next = new_link; |
659 | tail = new_link; |
585 | tail = new_link; |
660 | } |
586 | } |
661 | } |
587 | } |
662 | } |
588 | } |
663 | |
589 | |
664 | update_ob_speed (op); |
590 | update_ob_speed (dst); |
|
|
591 | } |
|
|
592 | |
|
|
593 | object * |
|
|
594 | object::clone () |
|
|
595 | { |
|
|
596 | object *neu = create (); |
|
|
597 | copy_to (neu); |
|
|
598 | return neu; |
665 | } |
599 | } |
666 | |
600 | |
667 | /* |
601 | /* |
668 | * If an object with the IS_TURNABLE() flag needs to be turned due |
602 | * If an object with the IS_TURNABLE() flag needs to be turned due |
669 | * to the closest player being on the other side, this function can |
603 | * to the closest player being on the other side, this function can |
… | |
… | |
874 | update_now = 1; |
808 | update_now = 1; |
875 | |
809 | |
876 | if ((move_slow | op->move_slow) != move_slow) |
810 | if ((move_slow | op->move_slow) != move_slow) |
877 | update_now = 1; |
811 | update_now = 1; |
878 | } |
812 | } |
|
|
813 | |
879 | /* if the object is being removed, we can't make intelligent |
814 | /* if the object is being removed, we can't make intelligent |
880 | * decisions, because remove_ob can't really pass the object |
815 | * decisions, because remove_ob can't really pass the object |
881 | * that is being removed. |
816 | * that is being removed. |
882 | */ |
817 | */ |
883 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
818 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
895 | |
830 | |
896 | if (op->more != NULL) |
831 | if (op->more != NULL) |
897 | update_object (op->more, action); |
832 | update_object (op->more, action); |
898 | } |
833 | } |
899 | |
834 | |
900 | static unordered_vector<object *> mortals; |
835 | object::vector object::mortals; |
|
|
836 | object::vector object::objects; // not yet used |
|
|
837 | object *object::first; |
901 | |
838 | |
902 | void object::free_mortals () |
839 | void object::free_mortals () |
903 | { |
840 | { |
904 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) |
841 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
905 | if ((*i)->refcnt) |
842 | if ((*i)->refcnt) |
906 | ++i; // further delay freeing |
843 | ++i; // further delay freeing |
907 | else |
844 | else |
908 | { |
845 | { |
909 | delete *i; |
846 | delete *i; |
910 | mortals.erase (i); |
847 | mortals.erase (i); |
911 | } |
848 | } |
912 | |
|
|
913 | static int lastmortals = 0;//D |
|
|
914 | |
|
|
915 | if (mortals.size() != lastmortals)//D |
|
|
916 | { |
|
|
917 | lastmortals = mortals.size ();//D |
|
|
918 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
919 | } |
|
|
920 | } |
849 | } |
921 | |
850 | |
922 | object::object () |
851 | object::object () |
923 | { |
852 | { |
924 | SET_FLAG (this, FLAG_REMOVED); |
853 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
936 | { |
865 | { |
937 | count = ++ob_count; |
866 | count = ++ob_count; |
938 | uuid = gen_uuid (); |
867 | uuid = gen_uuid (); |
939 | |
868 | |
940 | prev = 0; |
869 | prev = 0; |
941 | next = objects; |
870 | next = object::first; |
942 | |
871 | |
943 | if (objects) |
872 | if (object::first) |
944 | objects->prev = this; |
873 | object::first->prev = this; |
945 | |
874 | |
946 | objects = this; |
875 | object::first = this; |
947 | } |
876 | } |
948 | |
877 | |
949 | void object::unlink () |
878 | void object::unlink () |
950 | { |
879 | { |
951 | //count = 0;//D |
|
|
952 | if (!prev && !next) return;//D |
|
|
953 | |
|
|
954 | if (this == objects) |
880 | if (this == object::first) |
955 | objects = next; |
881 | object::first = next; |
956 | |
882 | |
957 | /* Remove this object from the list of used objects */ |
883 | /* Remove this object from the list of used objects */ |
958 | if (prev) prev->next = next; |
884 | if (prev) prev->next = next; |
959 | if (next) next->prev = prev; |
885 | if (next) next->prev = prev; |
960 | |
886 | |
… | |
… | |
974 | * it from the list of used objects, and puts it on the list of |
900 | * it from the list of used objects, and puts it on the list of |
975 | * free objects. The IS_FREED() flag is set in the object. |
901 | * free objects. The IS_FREED() flag is set in the object. |
976 | * The object must have been removed by remove_ob() first for |
902 | * The object must have been removed by remove_ob() first for |
977 | * this function to succeed. |
903 | * this function to succeed. |
978 | * |
904 | * |
979 | * If free_inventory is set, free inventory as well. Else drop items in |
905 | * If destroy_inventory is set, free inventory as well. Else drop items in |
980 | * inventory to the ground. |
906 | * inventory to the ground. |
981 | */ |
907 | */ |
982 | void object::free (bool free_inventory) |
908 | void object::destroy (bool destroy_inventory) |
983 | { |
909 | { |
984 | if (QUERY_FLAG (this, FLAG_FREED)) |
910 | if (QUERY_FLAG (this, FLAG_FREED)) |
985 | return; |
911 | return; |
986 | |
912 | |
987 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
913 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
988 | remove_friendly_object (this); |
914 | remove_friendly_object (this); |
989 | |
915 | |
990 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
916 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
991 | remove_ob (this); |
917 | remove (); |
992 | |
918 | |
993 | SET_FLAG (this, FLAG_FREED); |
919 | SET_FLAG (this, FLAG_FREED); |
994 | |
920 | |
995 | if (more) |
921 | if (more) |
996 | { |
922 | { |
997 | more->free (free_inventory); |
923 | more->destroy (destroy_inventory); |
998 | more = 0; |
924 | more = 0; |
999 | } |
925 | } |
1000 | |
926 | |
1001 | if (inv) |
927 | if (inv) |
1002 | { |
928 | { |
1003 | /* Only if the space blocks everything do we not process - |
929 | /* Only if the space blocks everything do we not process - |
1004 | * if some form of movement is allowed, let objects |
930 | * if some form of movement is allowed, let objects |
1005 | * drop on that space. |
931 | * drop on that space. |
1006 | */ |
932 | */ |
1007 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
933 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
1008 | { |
934 | { |
1009 | object *op = inv; |
935 | object *op = inv; |
1010 | |
936 | |
1011 | while (op) |
937 | while (op) |
1012 | { |
938 | { |
1013 | object *tmp = op->below; |
939 | object *tmp = op->below; |
1014 | op->free (free_inventory); |
940 | op->destroy (destroy_inventory); |
1015 | op = tmp; |
941 | op = tmp; |
1016 | } |
942 | } |
1017 | } |
943 | } |
1018 | else |
944 | else |
1019 | { /* Put objects in inventory onto this space */ |
945 | { /* Put objects in inventory onto this space */ |
… | |
… | |
1021 | |
947 | |
1022 | while (op) |
948 | while (op) |
1023 | { |
949 | { |
1024 | object *tmp = op->below; |
950 | object *tmp = op->below; |
1025 | |
951 | |
1026 | remove_ob (op); |
952 | op->remove (); |
1027 | |
953 | |
1028 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
954 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
1029 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
955 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
1030 | free_object (op); |
956 | op->destroy (); |
1031 | else |
957 | else |
1032 | { |
958 | { |
1033 | op->x = x; |
959 | op->x = x; |
1034 | op->y = y; |
960 | op->y = y; |
1035 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
961 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
1038 | op = tmp; |
964 | op = tmp; |
1039 | } |
965 | } |
1040 | } |
966 | } |
1041 | } |
967 | } |
1042 | |
968 | |
|
|
969 | // hack to ensure that freed objects still have a valid map |
|
|
970 | { |
|
|
971 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
972 | |
|
|
973 | if (!freed_map) |
|
|
974 | { |
|
|
975 | freed_map = new maptile; |
|
|
976 | |
|
|
977 | freed_map->name = "/internal/freed_objects_map"; |
|
|
978 | freed_map->width = 3; |
|
|
979 | freed_map->height = 3; |
|
|
980 | |
|
|
981 | freed_map->allocate (); |
|
|
982 | } |
|
|
983 | |
|
|
984 | map = freed_map; |
|
|
985 | x = 1; |
|
|
986 | y = 1; |
|
|
987 | } |
|
|
988 | |
1043 | // clear those pointers that likely might have circular references to us |
989 | // clear those pointers that likely might have circular references to us |
1044 | owner = 0; |
990 | owner = 0; |
1045 | enemy = 0; |
991 | enemy = 0; |
1046 | attacked_by = 0; |
992 | attacked_by = 0; |
1047 | |
993 | |
|
|
994 | // only relevant for players(?), but make sure of it anyways |
|
|
995 | contr = 0; |
|
|
996 | |
1048 | /* Remove object from the active list */ |
997 | /* Remove object from the active list */ |
1049 | speed = 0; |
998 | speed = 0; |
1050 | update_ob_speed (this); |
999 | update_ob_speed (this); |
1051 | |
1000 | |
1052 | unlink (); |
1001 | unlink (); |
… | |
… | |
1056 | |
1005 | |
1057 | /* |
1006 | /* |
1058 | * sub_weight() recursively (outwards) subtracts a number from the |
1007 | * sub_weight() recursively (outwards) subtracts a number from the |
1059 | * weight of an object (and what is carried by it's environment(s)). |
1008 | * weight of an object (and what is carried by it's environment(s)). |
1060 | */ |
1009 | */ |
1061 | |
|
|
1062 | void |
1010 | void |
1063 | sub_weight (object *op, signed long weight) |
1011 | sub_weight (object *op, signed long weight) |
1064 | { |
1012 | { |
1065 | while (op != NULL) |
1013 | while (op != NULL) |
1066 | { |
1014 | { |
1067 | if (op->type == CONTAINER) |
1015 | if (op->type == CONTAINER) |
1068 | { |
|
|
1069 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1016 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1070 | } |
1017 | |
1071 | op->carrying -= weight; |
1018 | op->carrying -= weight; |
1072 | op = op->env; |
1019 | op = op->env; |
1073 | } |
1020 | } |
1074 | } |
1021 | } |
1075 | |
1022 | |
1076 | /* remove_ob(op): |
1023 | /* op->remove (): |
1077 | * This function removes the object op from the linked list of objects |
1024 | * This function removes the object op from the linked list of objects |
1078 | * which it is currently tied to. When this function is done, the |
1025 | * which it is currently tied to. When this function is done, the |
1079 | * object will have no environment. If the object previously had an |
1026 | * object will have no environment. If the object previously had an |
1080 | * environment, the x and y coordinates will be updated to |
1027 | * environment, the x and y coordinates will be updated to |
1081 | * the previous environment. |
1028 | * the previous environment. |
1082 | * Beware: This function is called from the editor as well! |
1029 | * Beware: This function is called from the editor as well! |
1083 | */ |
1030 | */ |
1084 | |
|
|
1085 | void |
1031 | void |
1086 | remove_ob (object *op) |
1032 | object::remove () |
1087 | { |
1033 | { |
|
|
1034 | object *tmp, *last = 0; |
1088 | object * |
1035 | object *otmp; |
1089 | tmp, * |
|
|
1090 | last = NULL; |
|
|
1091 | object * |
|
|
1092 | otmp; |
|
|
1093 | |
1036 | |
1094 | tag_t |
|
|
1095 | tag; |
|
|
1096 | int |
|
|
1097 | check_walk_off; |
1037 | int check_walk_off; |
1098 | mapstruct * |
|
|
1099 | m; |
|
|
1100 | |
1038 | |
1101 | sint16 |
|
|
1102 | x, |
|
|
1103 | y; |
|
|
1104 | |
|
|
1105 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1039 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1106 | return; |
1040 | return; |
1107 | |
1041 | |
1108 | SET_FLAG (op, FLAG_REMOVED); |
1042 | SET_FLAG (this, FLAG_REMOVED); |
1109 | |
1043 | |
1110 | if (op->more != NULL) |
1044 | if (more) |
1111 | remove_ob (op->more); |
1045 | more->remove (); |
1112 | |
1046 | |
1113 | /* |
1047 | /* |
1114 | * In this case, the object to be removed is in someones |
1048 | * In this case, the object to be removed is in someones |
1115 | * inventory. |
1049 | * inventory. |
1116 | */ |
1050 | */ |
1117 | if (op->env != NULL) |
1051 | if (env) |
1118 | { |
1052 | { |
1119 | if (op->nrof) |
1053 | if (nrof) |
1120 | sub_weight (op->env, op->weight * op->nrof); |
1054 | sub_weight (env, weight * nrof); |
1121 | else |
1055 | else |
1122 | sub_weight (op->env, op->weight + op->carrying); |
1056 | sub_weight (env, weight + carrying); |
1123 | |
1057 | |
1124 | /* NO_FIX_PLAYER is set when a great many changes are being |
1058 | /* NO_FIX_PLAYER is set when a great many changes are being |
1125 | * made to players inventory. If set, avoiding the call |
1059 | * made to players inventory. If set, avoiding the call |
1126 | * to save cpu time. |
1060 | * to save cpu time. |
1127 | */ |
1061 | */ |
1128 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1062 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1129 | fix_player (otmp); |
1063 | fix_player (otmp); |
1130 | |
1064 | |
1131 | if (op->above != NULL) |
1065 | if (above != NULL) |
1132 | op->above->below = op->below; |
1066 | above->below = below; |
1133 | else |
1067 | else |
1134 | op->env->inv = op->below; |
1068 | env->inv = below; |
1135 | |
1069 | |
1136 | if (op->below != NULL) |
1070 | if (below != NULL) |
1137 | op->below->above = op->above; |
1071 | below->above = above; |
1138 | |
1072 | |
1139 | /* we set up values so that it could be inserted into |
1073 | /* we set up values so that it could be inserted into |
1140 | * the map, but we don't actually do that - it is up |
1074 | * the map, but we don't actually do that - it is up |
1141 | * to the caller to decide what we want to do. |
1075 | * to the caller to decide what we want to do. |
1142 | */ |
1076 | */ |
1143 | op->x = op->env->x, op->y = op->env->y; |
1077 | x = env->x, y = env->y; |
1144 | op->map = op->env->map; |
1078 | map = env->map; |
1145 | op->above = NULL, op->below = NULL; |
1079 | above = 0, below = 0; |
1146 | op->env = NULL; |
1080 | env = 0; |
1147 | } |
1081 | } |
1148 | else if (op->map) |
1082 | else if (map) |
1149 | { |
1083 | { |
1150 | x = op->x; |
|
|
1151 | y = op->y; |
|
|
1152 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1153 | |
|
|
1154 | if (!m) |
|
|
1155 | { |
|
|
1156 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1157 | op->map->path, op->x, op->y); |
|
|
1158 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1159 | * it seems if we get into this case, something is probablye |
|
|
1160 | * screwed up and should be fixed. |
|
|
1161 | */ |
|
|
1162 | abort (); |
|
|
1163 | } |
|
|
1164 | |
|
|
1165 | if (op->map != m) |
|
|
1166 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1167 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1168 | |
|
|
1169 | /* Re did the following section of code - it looks like it had |
1084 | /* Re did the following section of code - it looks like it had |
1170 | * lots of logic for things we no longer care about |
1085 | * lots of logic for things we no longer care about |
1171 | */ |
1086 | */ |
1172 | |
1087 | |
1173 | /* link the object above us */ |
1088 | /* link the object above us */ |
1174 | if (op->above) |
1089 | if (above) |
1175 | op->above->below = op->below; |
1090 | above->below = below; |
1176 | else |
1091 | else |
1177 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1092 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1178 | |
1093 | |
1179 | /* Relink the object below us, if there is one */ |
1094 | /* Relink the object below us, if there is one */ |
1180 | if (op->below) |
1095 | if (below) |
1181 | op->below->above = op->above; |
1096 | below->above = above; |
1182 | else |
1097 | else |
1183 | { |
1098 | { |
1184 | /* Nothing below, which means we need to relink map object for this space |
1099 | /* Nothing below, which means we need to relink map object for this space |
1185 | * use translated coordinates in case some oddness with map tiling is |
1100 | * use translated coordinates in case some oddness with map tiling is |
1186 | * evident |
1101 | * evident |
1187 | */ |
1102 | */ |
1188 | if (GET_MAP_OB (m, x, y) != op) |
1103 | if (GET_MAP_OB (map, x, y) != this) |
1189 | { |
1104 | { |
1190 | dump_object (op); |
1105 | char *dump = dump_object (this); |
1191 | LOG (llevError, |
1106 | LOG (llevError, |
1192 | "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); |
1107 | "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); |
|
|
1108 | free (dump); |
1193 | dump_object (GET_MAP_OB (m, x, y)); |
1109 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1194 | LOG (llevError, "%s\n", errmsg); |
1110 | LOG (llevError, "%s\n", dump); |
|
|
1111 | free (dump); |
1195 | } |
1112 | } |
1196 | |
1113 | |
1197 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1114 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1198 | } |
1115 | } |
1199 | |
1116 | |
1200 | op->above = 0; |
1117 | above = 0; |
1201 | op->below = 0; |
1118 | below = 0; |
1202 | |
1119 | |
1203 | if (op->map->in_memory == MAP_SAVING) |
1120 | if (map->in_memory == MAP_SAVING) |
1204 | return; |
1121 | return; |
1205 | |
1122 | |
1206 | tag = op->count; |
|
|
1207 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1123 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1208 | |
1124 | |
1209 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1125 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1210 | { |
1126 | { |
1211 | /* No point updating the players look faces if he is the object |
1127 | /* No point updating the players look faces if he is the object |
1212 | * being removed. |
1128 | * being removed. |
1213 | */ |
1129 | */ |
1214 | |
1130 | |
1215 | if (tmp->type == PLAYER && tmp != op) |
1131 | if (tmp->type == PLAYER && tmp != this) |
1216 | { |
1132 | { |
1217 | /* If a container that the player is currently using somehow gets |
1133 | /* If a container that the player is currently using somehow gets |
1218 | * removed (most likely destroyed), update the player view |
1134 | * removed (most likely destroyed), update the player view |
1219 | * appropriately. |
1135 | * appropriately. |
1220 | */ |
1136 | */ |
1221 | if (tmp->container == op) |
1137 | if (tmp->container == this) |
1222 | { |
1138 | { |
1223 | CLEAR_FLAG (op, FLAG_APPLIED); |
1139 | CLEAR_FLAG (this, FLAG_APPLIED); |
1224 | tmp->container = NULL; |
1140 | tmp->container = 0; |
1225 | } |
1141 | } |
1226 | |
1142 | |
1227 | tmp->contr->socket.update_look = 1; |
1143 | tmp->contr->socket.update_look = 1; |
1228 | } |
1144 | } |
1229 | |
1145 | |
1230 | /* See if player moving off should effect something */ |
1146 | /* See if player moving off should effect something */ |
1231 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1147 | if (check_walk_off |
|
|
1148 | && ((move_type & tmp->move_off) |
|
|
1149 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1232 | { |
1150 | { |
1233 | move_apply (tmp, op, NULL); |
1151 | move_apply (tmp, this, 0); |
1234 | |
1152 | |
1235 | if (was_destroyed (op, tag)) |
1153 | if (destroyed ()) |
1236 | { |
|
|
1237 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1154 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1238 | } |
|
|
1239 | } |
1155 | } |
1240 | |
1156 | |
1241 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1157 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1242 | |
1158 | |
1243 | if (tmp->above == tmp) |
1159 | if (tmp->above == tmp) |
1244 | tmp->above = NULL; |
1160 | tmp->above = 0; |
1245 | |
1161 | |
1246 | last = tmp; |
1162 | last = tmp; |
1247 | } |
1163 | } |
1248 | |
1164 | |
1249 | /* last == NULL of there are no objects on this space */ |
1165 | /* last == NULL of there are no objects on this space */ |
1250 | if (last == NULL) |
1166 | if (!last) |
1251 | { |
1167 | { |
1252 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1168 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1253 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1169 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1254 | * those out anyways, and if there are any flags set right now, they won't |
1170 | * those out anyways, and if there are any flags set right now, they won't |
1255 | * be correct anyways. |
1171 | * be correct anyways. |
1256 | */ |
1172 | */ |
1257 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1173 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1258 | update_position (op->map, op->x, op->y); |
1174 | update_position (map, x, y); |
1259 | } |
1175 | } |
1260 | else |
1176 | else |
1261 | update_object (last, UP_OBJ_REMOVE); |
1177 | update_object (last, UP_OBJ_REMOVE); |
1262 | |
1178 | |
1263 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1179 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1264 | update_all_los (op->map, op->x, op->y); |
1180 | update_all_los (map, x, y); |
1265 | } |
1181 | } |
1266 | } |
1182 | } |
1267 | |
1183 | |
1268 | /* |
1184 | /* |
1269 | * merge_ob(op,top): |
1185 | * merge_ob(op,top): |
… | |
… | |
1290 | { |
1206 | { |
1291 | top->nrof += op->nrof; |
1207 | top->nrof += op->nrof; |
1292 | |
1208 | |
1293 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1209 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1294 | op->weight = 0; /* Don't want any adjustements now */ |
1210 | op->weight = 0; /* Don't want any adjustements now */ |
1295 | remove_ob (op); |
1211 | op->destroy (); |
1296 | free_object (op); |
|
|
1297 | return top; |
1212 | return top; |
1298 | } |
1213 | } |
1299 | } |
1214 | } |
1300 | |
1215 | |
1301 | return NULL; |
1216 | return 0; |
1302 | } |
1217 | } |
1303 | |
1218 | |
1304 | /* |
1219 | /* |
1305 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1220 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1306 | * job preparing multi-part monsters |
1221 | * job preparing multi-part monsters |
1307 | */ |
1222 | */ |
1308 | object * |
1223 | object * |
1309 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1224 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1310 | { |
1225 | { |
1311 | object *tmp; |
1226 | object *tmp; |
1312 | |
1227 | |
1313 | if (op->head) |
1228 | if (op->head) |
1314 | op = op->head; |
1229 | op = op->head; |
… | |
… | |
1342 | * NULL if 'op' was destroyed |
1257 | * NULL if 'op' was destroyed |
1343 | * just 'op' otherwise |
1258 | * just 'op' otherwise |
1344 | */ |
1259 | */ |
1345 | |
1260 | |
1346 | object * |
1261 | object * |
1347 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1262 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1348 | { |
1263 | { |
1349 | object *tmp, *top, *floor = NULL; |
1264 | object *tmp, *top, *floor = NULL; |
1350 | sint16 x, y; |
1265 | sint16 x, y; |
1351 | |
1266 | |
1352 | if (QUERY_FLAG (op, FLAG_FREED)) |
1267 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1355 | return NULL; |
1270 | return NULL; |
1356 | } |
1271 | } |
1357 | |
1272 | |
1358 | if (m == NULL) |
1273 | if (m == NULL) |
1359 | { |
1274 | { |
1360 | dump_object (op); |
1275 | char *dump = dump_object (op); |
1361 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1276 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1277 | free (dump); |
1362 | return op; |
1278 | return op; |
1363 | } |
1279 | } |
1364 | |
1280 | |
1365 | if (out_of_map (m, op->x, op->y)) |
1281 | if (out_of_map (m, op->x, op->y)) |
1366 | { |
1282 | { |
1367 | dump_object (op); |
1283 | char *dump = dump_object (op); |
1368 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1284 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1369 | #ifdef MANY_CORES |
1285 | #ifdef MANY_CORES |
1370 | /* Better to catch this here, as otherwise the next use of this object |
1286 | /* Better to catch this here, as otherwise the next use of this object |
1371 | * is likely to cause a crash. Better to find out where it is getting |
1287 | * is likely to cause a crash. Better to find out where it is getting |
1372 | * improperly inserted. |
1288 | * improperly inserted. |
1373 | */ |
1289 | */ |
1374 | abort (); |
1290 | abort (); |
1375 | #endif |
1291 | #endif |
|
|
1292 | free (dump); |
1376 | return op; |
1293 | return op; |
1377 | } |
1294 | } |
1378 | |
1295 | |
1379 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1296 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1380 | { |
1297 | { |
1381 | dump_object (op); |
1298 | char *dump = dump_object (op); |
1382 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1299 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1300 | free (dump); |
1383 | return op; |
1301 | return op; |
1384 | } |
1302 | } |
1385 | |
1303 | |
1386 | if (op->more != NULL) |
1304 | if (op->more != NULL) |
1387 | { |
1305 | { |
… | |
… | |
1428 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1346 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1429 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1347 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1430 | if (CAN_MERGE (op, tmp)) |
1348 | if (CAN_MERGE (op, tmp)) |
1431 | { |
1349 | { |
1432 | op->nrof += tmp->nrof; |
1350 | op->nrof += tmp->nrof; |
1433 | remove_ob (tmp); |
1351 | tmp->destroy (); |
1434 | free_object (tmp); |
|
|
1435 | } |
1352 | } |
1436 | |
1353 | |
1437 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1354 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1438 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1355 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1439 | |
1356 | |
… | |
… | |
1625 | tmp1; |
1542 | tmp1; |
1626 | |
1543 | |
1627 | /* first search for itself and remove any old instances */ |
1544 | /* first search for itself and remove any old instances */ |
1628 | |
1545 | |
1629 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1546 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1630 | { |
|
|
1631 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1547 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1632 | { |
1548 | tmp->destroy (); |
1633 | remove_ob (tmp); |
|
|
1634 | free_object (tmp); |
|
|
1635 | } |
|
|
1636 | } |
|
|
1637 | |
1549 | |
1638 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1550 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1639 | |
1551 | |
1640 | tmp1->x = op->x; |
1552 | tmp1->x = op->x; |
1641 | tmp1->y = op->y; |
1553 | tmp1->y = op->y; |
1642 | insert_ob_in_map (tmp1, op->map, op, 0); |
1554 | insert_ob_in_map (tmp1, op->map, op, 0); |
1643 | } |
1555 | } |
… | |
… | |
1651 | */ |
1563 | */ |
1652 | |
1564 | |
1653 | object * |
1565 | object * |
1654 | get_split_ob (object *orig_ob, uint32 nr) |
1566 | get_split_ob (object *orig_ob, uint32 nr) |
1655 | { |
1567 | { |
1656 | object * |
1568 | object *newob; |
1657 | newob; |
|
|
1658 | int |
|
|
1659 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1569 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1660 | |
1570 | |
1661 | if (orig_ob->nrof < nr) |
1571 | if (orig_ob->nrof < nr) |
1662 | { |
1572 | { |
1663 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1573 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1664 | return NULL; |
1574 | return NULL; |
1665 | } |
1575 | } |
1666 | |
1576 | |
1667 | newob = object_create_clone (orig_ob); |
1577 | newob = object_create_clone (orig_ob); |
1668 | |
1578 | |
1669 | if ((orig_ob->nrof -= nr) < 1) |
1579 | if ((orig_ob->nrof -= nr) < 1) |
1670 | { |
1580 | orig_ob->destroy (1); |
1671 | if (!is_removed) |
|
|
1672 | remove_ob (orig_ob); |
|
|
1673 | free_object2 (orig_ob, 1); |
|
|
1674 | } |
|
|
1675 | else if (!is_removed) |
1581 | else if (!is_removed) |
1676 | { |
1582 | { |
1677 | if (orig_ob->env != NULL) |
1583 | if (orig_ob->env != NULL) |
1678 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1584 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1679 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1585 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1743 | esrv_send_item (tmp, op); |
1649 | esrv_send_item (tmp, op); |
1744 | } |
1650 | } |
1745 | } |
1651 | } |
1746 | else |
1652 | else |
1747 | { |
1653 | { |
1748 | remove_ob (op); |
1654 | op->remove (); |
1749 | op->nrof = 0; |
1655 | op->nrof = 0; |
1750 | if (tmp) |
1656 | if (tmp) |
1751 | { |
1657 | { |
1752 | esrv_del_item (tmp->contr, op->count); |
1658 | esrv_del_item (tmp->contr, op->count); |
1753 | } |
1659 | } |
… | |
… | |
1759 | |
1665 | |
1760 | if (i < op->nrof) |
1666 | if (i < op->nrof) |
1761 | op->nrof -= i; |
1667 | op->nrof -= i; |
1762 | else |
1668 | else |
1763 | { |
1669 | { |
1764 | remove_ob (op); |
1670 | op->remove (); |
1765 | op->nrof = 0; |
1671 | op->nrof = 0; |
1766 | } |
1672 | } |
1767 | |
1673 | |
1768 | /* Since we just removed op, op->above is null */ |
1674 | /* Since we just removed op, op->above is null */ |
1769 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1675 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
… | |
… | |
1778 | |
1684 | |
1779 | if (op->nrof) |
1685 | if (op->nrof) |
1780 | return op; |
1686 | return op; |
1781 | else |
1687 | else |
1782 | { |
1688 | { |
1783 | free_object (op); |
1689 | op->destroy (); |
1784 | return NULL; |
1690 | return NULL; |
1785 | } |
1691 | } |
1786 | } |
1692 | } |
1787 | |
1693 | |
1788 | /* |
1694 | /* |
… | |
… | |
1801 | op->carrying += weight; |
1707 | op->carrying += weight; |
1802 | op = op->env; |
1708 | op = op->env; |
1803 | } |
1709 | } |
1804 | } |
1710 | } |
1805 | |
1711 | |
|
|
1712 | object * |
|
|
1713 | insert_ob_in_ob (object *op, object *where) |
|
|
1714 | { |
|
|
1715 | if (!where) |
|
|
1716 | { |
|
|
1717 | char *dump = dump_object (op); |
|
|
1718 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1719 | free (dump); |
|
|
1720 | return op; |
|
|
1721 | } |
|
|
1722 | |
|
|
1723 | if (where->head) |
|
|
1724 | { |
|
|
1725 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1726 | where = where->head; |
|
|
1727 | } |
|
|
1728 | |
|
|
1729 | return where->insert (op); |
|
|
1730 | } |
|
|
1731 | |
1806 | /* |
1732 | /* |
1807 | * insert_ob_in_ob(op,environment): |
1733 | * env->insert (op) |
1808 | * This function inserts the object op in the linked list |
1734 | * This function inserts the object op in the linked list |
1809 | * inside the object environment. |
1735 | * inside the object environment. |
1810 | * |
1736 | * |
1811 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1812 | * the inventory at the last position or next to other objects of the same |
|
|
1813 | * type. |
|
|
1814 | * Frank: Now sorted by type, archetype and magic! |
|
|
1815 | * |
|
|
1816 | * The function returns now pointer to inserted item, and return value can |
1737 | * The function returns now pointer to inserted item, and return value can |
1817 | * be != op, if items are merged. -Tero |
1738 | * be != op, if items are merged. -Tero |
1818 | */ |
1739 | */ |
1819 | |
1740 | |
1820 | object * |
1741 | object * |
1821 | insert_ob_in_ob (object *op, object *where) |
1742 | object::insert (object *op) |
1822 | { |
1743 | { |
1823 | object * |
1744 | object *tmp, *otmp; |
1824 | tmp, * |
|
|
1825 | otmp; |
|
|
1826 | |
1745 | |
1827 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1746 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1828 | { |
1747 | op->remove (); |
1829 | dump_object (op); |
|
|
1830 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1831 | return op; |
|
|
1832 | } |
|
|
1833 | |
|
|
1834 | if (where == NULL) |
|
|
1835 | { |
|
|
1836 | dump_object (op); |
|
|
1837 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1838 | return op; |
|
|
1839 | } |
|
|
1840 | |
|
|
1841 | if (where->head) |
|
|
1842 | { |
|
|
1843 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1844 | where = where->head; |
|
|
1845 | } |
|
|
1846 | |
1748 | |
1847 | if (op->more) |
1749 | if (op->more) |
1848 | { |
1750 | { |
1849 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1751 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1850 | return op; |
1752 | return op; |
… | |
… | |
1852 | |
1754 | |
1853 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1755 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1854 | CLEAR_FLAG (op, FLAG_REMOVED); |
1756 | CLEAR_FLAG (op, FLAG_REMOVED); |
1855 | if (op->nrof) |
1757 | if (op->nrof) |
1856 | { |
1758 | { |
1857 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1759 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1858 | if (CAN_MERGE (tmp, op)) |
1760 | if (CAN_MERGE (tmp, op)) |
1859 | { |
1761 | { |
1860 | /* return the original object and remove inserted object |
1762 | /* return the original object and remove inserted object |
1861 | (client needs the original object) */ |
1763 | (client needs the original object) */ |
1862 | tmp->nrof += op->nrof; |
1764 | tmp->nrof += op->nrof; |
1863 | /* Weight handling gets pretty funky. Since we are adding to |
1765 | /* Weight handling gets pretty funky. Since we are adding to |
1864 | * tmp->nrof, we need to increase the weight. |
1766 | * tmp->nrof, we need to increase the weight. |
1865 | */ |
1767 | */ |
1866 | add_weight (where, op->weight * op->nrof); |
1768 | add_weight (this, op->weight * op->nrof); |
1867 | SET_FLAG (op, FLAG_REMOVED); |
1769 | SET_FLAG (op, FLAG_REMOVED); |
1868 | free_object (op); /* free the inserted object */ |
1770 | op->destroy (); /* free the inserted object */ |
1869 | op = tmp; |
1771 | op = tmp; |
1870 | remove_ob (op); /* and fix old object's links */ |
1772 | op->remove (); /* and fix old object's links */ |
1871 | CLEAR_FLAG (op, FLAG_REMOVED); |
1773 | CLEAR_FLAG (op, FLAG_REMOVED); |
1872 | break; |
1774 | break; |
1873 | } |
1775 | } |
1874 | |
1776 | |
1875 | /* I assume combined objects have no inventory |
1777 | /* I assume combined objects have no inventory |
1876 | * We add the weight - this object could have just been removed |
1778 | * We add the weight - this object could have just been removed |
1877 | * (if it was possible to merge). calling remove_ob will subtract |
1779 | * (if it was possible to merge). calling remove_ob will subtract |
1878 | * the weight, so we need to add it in again, since we actually do |
1780 | * the weight, so we need to add it in again, since we actually do |
1879 | * the linking below |
1781 | * the linking below |
1880 | */ |
1782 | */ |
1881 | add_weight (where, op->weight * op->nrof); |
1783 | add_weight (this, op->weight * op->nrof); |
1882 | } |
1784 | } |
1883 | else |
1785 | else |
1884 | add_weight (where, (op->weight + op->carrying)); |
1786 | add_weight (this, (op->weight + op->carrying)); |
1885 | |
1787 | |
1886 | otmp = is_player_inv (where); |
1788 | otmp = is_player_inv (this); |
1887 | if (otmp && otmp->contr != NULL) |
1789 | if (otmp && otmp->contr) |
1888 | { |
|
|
1889 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1790 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1890 | fix_player (otmp); |
1791 | fix_player (otmp); |
1891 | } |
|
|
1892 | |
1792 | |
1893 | op->map = NULL; |
1793 | op->map = NULL; |
1894 | op->env = where; |
1794 | op->env = this; |
1895 | op->above = NULL; |
1795 | op->above = NULL; |
1896 | op->below = NULL; |
1796 | op->below = NULL; |
1897 | op->x = 0, op->y = 0; |
1797 | op->x = 0, op->y = 0; |
1898 | |
1798 | |
1899 | /* reset the light list and los of the players on the map */ |
1799 | /* reset the light list and los of the players on the map */ |
1900 | if ((op->glow_radius != 0) && where->map) |
1800 | if ((op->glow_radius != 0) && map) |
1901 | { |
1801 | { |
1902 | #ifdef DEBUG_LIGHTS |
1802 | #ifdef DEBUG_LIGHTS |
1903 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1803 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1904 | #endif /* DEBUG_LIGHTS */ |
1804 | #endif /* DEBUG_LIGHTS */ |
1905 | if (MAP_DARKNESS (where->map)) |
1805 | if (MAP_DARKNESS (map)) |
1906 | update_all_los (where->map, where->x, where->y); |
1806 | update_all_los (map, x, y); |
1907 | } |
1807 | } |
1908 | |
1808 | |
1909 | /* Client has no idea of ordering so lets not bother ordering it here. |
1809 | /* Client has no idea of ordering so lets not bother ordering it here. |
1910 | * It sure simplifies this function... |
1810 | * It sure simplifies this function... |
1911 | */ |
1811 | */ |
1912 | if (where->inv == NULL) |
1812 | if (!inv) |
1913 | where->inv = op; |
1813 | inv = op; |
1914 | else |
1814 | else |
1915 | { |
1815 | { |
1916 | op->below = where->inv; |
1816 | op->below = inv; |
1917 | op->below->above = op; |
1817 | op->below->above = op; |
1918 | where->inv = op; |
1818 | inv = op; |
1919 | } |
1819 | } |
|
|
1820 | |
1920 | return op; |
1821 | return op; |
1921 | } |
1822 | } |
1922 | |
1823 | |
1923 | /* |
1824 | /* |
1924 | * Checks if any objects has a move_type that matches objects |
1825 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1942 | */ |
1843 | */ |
1943 | |
1844 | |
1944 | int |
1845 | int |
1945 | check_move_on (object *op, object *originator) |
1846 | check_move_on (object *op, object *originator) |
1946 | { |
1847 | { |
1947 | object * |
1848 | object *tmp; |
1948 | tmp; |
1849 | maptile *m = op->map; |
1949 | tag_t |
|
|
1950 | tag; |
|
|
1951 | mapstruct * |
|
|
1952 | m = op->map; |
|
|
1953 | int |
|
|
1954 | x = op->x, y = op->y; |
1850 | int x = op->x, y = op->y; |
1955 | |
1851 | |
1956 | MoveType |
1852 | MoveType move_on, move_slow, move_block; |
1957 | move_on, |
|
|
1958 | move_slow, |
|
|
1959 | move_block; |
|
|
1960 | |
1853 | |
1961 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1854 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1962 | return 0; |
1855 | return 0; |
1963 | |
|
|
1964 | tag = op->count; |
|
|
1965 | |
1856 | |
1966 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1857 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1967 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1858 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1968 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1859 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1969 | |
1860 | |
… | |
… | |
2030 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1921 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2031 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1922 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
2032 | { |
1923 | { |
2033 | move_apply (tmp, op, originator); |
1924 | move_apply (tmp, op, originator); |
2034 | |
1925 | |
2035 | if (was_destroyed (op, tag)) |
1926 | if (op->destroyed ()) |
2036 | return 1; |
1927 | return 1; |
2037 | |
1928 | |
2038 | /* what the person/creature stepped onto has moved the object |
1929 | /* what the person/creature stepped onto has moved the object |
2039 | * someplace new. Don't process any further - if we did, |
1930 | * someplace new. Don't process any further - if we did, |
2040 | * have a feeling strange problems would result. |
1931 | * have a feeling strange problems would result. |
… | |
… | |
2052 | * a matching archetype at the given map and coordinates. |
1943 | * a matching archetype at the given map and coordinates. |
2053 | * The first matching object is returned, or NULL if none. |
1944 | * The first matching object is returned, or NULL if none. |
2054 | */ |
1945 | */ |
2055 | |
1946 | |
2056 | object * |
1947 | object * |
2057 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1948 | present_arch (const archetype *at, maptile *m, int x, int y) |
2058 | { |
1949 | { |
2059 | object * |
1950 | object * |
2060 | tmp; |
1951 | tmp; |
2061 | |
1952 | |
2062 | if (m == NULL || out_of_map (m, x, y)) |
1953 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2075 | * a matching type variable at the given map and coordinates. |
1966 | * a matching type variable at the given map and coordinates. |
2076 | * The first matching object is returned, or NULL if none. |
1967 | * The first matching object is returned, or NULL if none. |
2077 | */ |
1968 | */ |
2078 | |
1969 | |
2079 | object * |
1970 | object * |
2080 | present (unsigned char type, mapstruct *m, int x, int y) |
1971 | present (unsigned char type, maptile *m, int x, int y) |
2081 | { |
1972 | { |
2082 | object * |
1973 | object * |
2083 | tmp; |
1974 | tmp; |
2084 | |
1975 | |
2085 | if (out_of_map (m, x, y)) |
1976 | if (out_of_map (m, x, y)) |
… | |
… | |
2225 | * the archetype because that isn't correct if the monster has been |
2116 | * the archetype because that isn't correct if the monster has been |
2226 | * customized, changed states, etc. |
2117 | * customized, changed states, etc. |
2227 | */ |
2118 | */ |
2228 | |
2119 | |
2229 | int |
2120 | int |
2230 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2121 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2231 | { |
2122 | { |
2232 | int |
2123 | int |
2233 | i, |
2124 | i, |
2234 | index = 0, flag; |
2125 | index = 0, flag; |
2235 | static int |
2126 | static int |
… | |
… | |
2256 | return -1; |
2147 | return -1; |
2257 | return altern[RANDOM () % index]; |
2148 | return altern[RANDOM () % index]; |
2258 | } |
2149 | } |
2259 | |
2150 | |
2260 | /* |
2151 | /* |
2261 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2152 | * find_first_free_spot(archetype, maptile, x, y) works like |
2262 | * find_free_spot(), but it will search max number of squares. |
2153 | * find_free_spot(), but it will search max number of squares. |
2263 | * But it will return the first available spot, not a random choice. |
2154 | * But it will return the first available spot, not a random choice. |
2264 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2155 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2265 | */ |
2156 | */ |
2266 | |
2157 | |
2267 | int |
2158 | int |
2268 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2159 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2269 | { |
2160 | { |
2270 | int |
2161 | int |
2271 | i; |
2162 | i; |
2272 | |
2163 | |
2273 | for (i = 0; i < SIZEOFFREE; i++) |
2164 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2337 | * because we have to know what movement the thing looking to move |
2228 | * because we have to know what movement the thing looking to move |
2338 | * there is capable of. |
2229 | * there is capable of. |
2339 | */ |
2230 | */ |
2340 | |
2231 | |
2341 | int |
2232 | int |
2342 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2233 | find_dir (maptile *m, int x, int y, object *exclude) |
2343 | { |
2234 | { |
2344 | int |
2235 | int |
2345 | i, |
2236 | i, |
2346 | max = SIZEOFFREE, mflags; |
2237 | max = SIZEOFFREE, mflags; |
2347 | |
2238 | |
2348 | sint16 nx, ny; |
2239 | sint16 nx, ny; |
2349 | object * |
2240 | object * |
2350 | tmp; |
2241 | tmp; |
2351 | mapstruct * |
2242 | maptile * |
2352 | mp; |
2243 | mp; |
2353 | |
2244 | |
2354 | MoveType blocked, move_type; |
2245 | MoveType blocked, move_type; |
2355 | |
2246 | |
2356 | if (exclude && exclude->head) |
2247 | if (exclude && exclude->head) |
… | |
… | |
2564 | * Modified to be map tile aware -.MSW |
2455 | * Modified to be map tile aware -.MSW |
2565 | */ |
2456 | */ |
2566 | |
2457 | |
2567 | |
2458 | |
2568 | int |
2459 | int |
2569 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2460 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2570 | { |
2461 | { |
2571 | sint16 dx, dy; |
2462 | sint16 dx, dy; |
2572 | int |
2463 | int |
2573 | mflags; |
2464 | mflags; |
2574 | |
2465 | |
… | |
… | |
2623 | * create clone from object to another |
2514 | * create clone from object to another |
2624 | */ |
2515 | */ |
2625 | object * |
2516 | object * |
2626 | object_create_clone (object *asrc) |
2517 | object_create_clone (object *asrc) |
2627 | { |
2518 | { |
2628 | object * |
|
|
2629 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2519 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2630 | |
2520 | |
2631 | if (!asrc) |
2521 | if (!asrc) |
2632 | return NULL; |
2522 | return 0; |
|
|
2523 | |
2633 | src = asrc; |
2524 | src = asrc; |
2634 | if (src->head) |
2525 | if (src->head) |
2635 | src = src->head; |
2526 | src = src->head; |
2636 | |
2527 | |
2637 | prev = NULL; |
2528 | prev = 0; |
2638 | for (part = src; part; part = part->more) |
2529 | for (part = src; part; part = part->more) |
2639 | { |
2530 | { |
2640 | tmp = get_object (); |
2531 | tmp = part->clone (); |
2641 | copy_object (part, tmp); |
|
|
2642 | tmp->x -= src->x; |
2532 | tmp->x -= src->x; |
2643 | tmp->y -= src->y; |
2533 | tmp->y -= src->y; |
|
|
2534 | |
2644 | if (!part->head) |
2535 | if (!part->head) |
2645 | { |
2536 | { |
2646 | dst = tmp; |
2537 | dst = tmp; |
2647 | tmp->head = NULL; |
2538 | tmp->head = 0; |
2648 | } |
2539 | } |
2649 | else |
2540 | else |
2650 | { |
2541 | { |
2651 | tmp->head = dst; |
2542 | tmp->head = dst; |
2652 | } |
2543 | } |
|
|
2544 | |
2653 | tmp->more = NULL; |
2545 | tmp->more = 0; |
|
|
2546 | |
2654 | if (prev) |
2547 | if (prev) |
2655 | prev->more = tmp; |
2548 | prev->more = tmp; |
|
|
2549 | |
2656 | prev = tmp; |
2550 | prev = tmp; |
2657 | } |
2551 | } |
2658 | |
2552 | |
2659 | /*** copy inventory ***/ |
|
|
2660 | for (item = src->inv; item; item = item->below) |
2553 | for (item = src->inv; item; item = item->below) |
2661 | { |
|
|
2662 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2554 | insert_ob_in_ob (object_create_clone (item), dst); |
2663 | } |
|
|
2664 | |
2555 | |
2665 | return dst; |
2556 | return dst; |
2666 | } |
2557 | } |
2667 | |
2558 | |
2668 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2669 | int |
|
|
2670 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2671 | { |
|
|
2672 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2673 | * robust */ |
|
|
2674 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2675 | } |
|
|
2676 | |
|
|
2677 | /* GROS - Creates an object using a string representing its content. */ |
2559 | /* GROS - Creates an object using a string representing its content. */ |
2678 | |
|
|
2679 | /* Basically, we save the content of the string to a temp file, then call */ |
2560 | /* Basically, we save the content of the string to a temp file, then call */ |
2680 | |
|
|
2681 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2561 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2682 | |
|
|
2683 | /* but it was simple to make and allows reusing the load_object function. */ |
2562 | /* but it was simple to make and allows reusing the load_object function. */ |
2684 | |
|
|
2685 | /* Remember not to use load_object_str in a time-critical situation. */ |
2563 | /* Remember not to use load_object_str in a time-critical situation. */ |
2686 | |
|
|
2687 | /* Also remember that multiparts objects are not supported for now. */ |
2564 | /* Also remember that multiparts objects are not supported for now. */ |
2688 | |
2565 | |
2689 | object * |
2566 | object * |
2690 | load_object_str (const char *obstr) |
2567 | load_object_str (const char *obstr) |
2691 | { |
2568 | { |
2692 | object * |
2569 | object *op; |
2693 | op; |
|
|
2694 | char |
|
|
2695 | filename[MAX_BUF]; |
2570 | char filename[MAX_BUF]; |
2696 | |
2571 | |
2697 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2572 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2698 | |
2573 | |
2699 | FILE * |
|
|
2700 | tempfile = fopen (filename, "w"); |
2574 | FILE *tempfile = fopen (filename, "w"); |
2701 | |
2575 | |
2702 | if (tempfile == NULL) |
2576 | if (tempfile == NULL) |
2703 | { |
2577 | { |
2704 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2578 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2705 | return NULL; |
2579 | return NULL; |
2706 | } |
2580 | } |
2707 | |
2581 | |
2708 | fprintf (tempfile, obstr); |
2582 | fprintf (tempfile, obstr); |
2709 | fclose (tempfile); |
2583 | fclose (tempfile); |
2710 | |
2584 | |
2711 | op = get_object (); |
2585 | op = object::create (); |
2712 | |
2586 | |
2713 | object_thawer thawer (filename); |
2587 | object_thawer thawer (filename); |
2714 | |
2588 | |
2715 | if (thawer) |
2589 | if (thawer) |
2716 | load_object (thawer, op, 0); |
2590 | load_object (thawer, op, 0); |
… | |
… | |
2726 | * returns NULL if no match. |
2600 | * returns NULL if no match. |
2727 | */ |
2601 | */ |
2728 | object * |
2602 | object * |
2729 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2603 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2730 | { |
2604 | { |
2731 | object * |
2605 | object *tmp; |
2732 | tmp; |
|
|
2733 | |
2606 | |
2734 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2607 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2735 | if (tmp->type == type && tmp->subtype == subtype) |
2608 | if (tmp->type == type && tmp->subtype == subtype) |
2736 | return tmp; |
2609 | return tmp; |
2737 | |
2610 | |
… | |
… | |
2745 | * do the desired thing. |
2618 | * do the desired thing. |
2746 | */ |
2619 | */ |
2747 | key_value * |
2620 | key_value * |
2748 | get_ob_key_link (const object *ob, const char *key) |
2621 | get_ob_key_link (const object *ob, const char *key) |
2749 | { |
2622 | { |
2750 | key_value * |
2623 | key_value *link; |
2751 | link; |
|
|
2752 | |
2624 | |
2753 | for (link = ob->key_values; link != NULL; link = link->next) |
2625 | for (link = ob->key_values; link != NULL; link = link->next) |
2754 | { |
|
|
2755 | if (link->key == key) |
2626 | if (link->key == key) |
2756 | { |
|
|
2757 | return link; |
2627 | return link; |
2758 | } |
|
|
2759 | } |
|
|
2760 | |
2628 | |
2761 | return NULL; |
2629 | return NULL; |
2762 | } |
2630 | } |
2763 | |
2631 | |
2764 | /* |
2632 | /* |