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 | } |
512 | |
442 | |
513 | void |
443 | void |
514 | free_all_object_data () |
444 | free_all_object_data () |
515 | { |
445 | { |
516 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
446 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
517 | } |
|
|
518 | |
|
|
519 | /* |
|
|
520 | * Returns the object which this object marks as being the owner. |
|
|
521 | * A id-scheme is used to avoid pointing to objects which have been |
|
|
522 | * freed and are now reused. If this is detected, the owner is |
|
|
523 | * set to NULL, and NULL is returned. |
|
|
524 | * Changed 2004-02-12 - if the player is setting at the play again |
|
|
525 | * prompt, he is removed, and we don't want to treat him as an owner of |
|
|
526 | * anything, so check removed flag. I don't expect that this should break |
|
|
527 | * anything - once an object is removed, it is basically dead anyways. |
|
|
528 | */ |
|
|
529 | object * |
|
|
530 | object::get_owner () |
|
|
531 | { |
|
|
532 | if (!owner |
|
|
533 | || QUERY_FLAG (owner, FLAG_FREED) |
|
|
534 | || QUERY_FLAG (owner, FLAG_REMOVED)) |
|
|
535 | owner = 0; |
|
|
536 | |
|
|
537 | return owner; |
|
|
538 | } |
447 | } |
539 | |
448 | |
540 | /* |
449 | /* |
541 | * Sets the owner and sets the skill and exp pointers to owner's current |
450 | * Sets the owner and sets the skill and exp pointers to owner's current |
542 | * skill and experience objects. |
451 | * skill and experience objects. |
… | |
… | |
612 | |
521 | |
613 | /* What is not cleared is next, prev, and count */ |
522 | /* What is not cleared is next, prev, and count */ |
614 | |
523 | |
615 | expmul = 1.0; |
524 | expmul = 1.0; |
616 | face = blank_face; |
525 | face = blank_face; |
617 | attacked_by_count = -1; |
|
|
618 | |
526 | |
619 | if (settings.casting_time) |
527 | if (settings.casting_time) |
620 | casting_time = -1; |
528 | casting_time = -1; |
621 | } |
529 | } |
622 | |
530 | |
… | |
… | |
645 | |
553 | |
646 | op2->clone (op); |
554 | op2->clone (op); |
647 | |
555 | |
648 | if (is_freed) |
556 | if (is_freed) |
649 | SET_FLAG (op, FLAG_FREED); |
557 | SET_FLAG (op, FLAG_FREED); |
|
|
558 | |
650 | if (is_removed) |
559 | if (is_removed) |
651 | SET_FLAG (op, FLAG_REMOVED); |
560 | SET_FLAG (op, FLAG_REMOVED); |
652 | |
561 | |
653 | if (op2->speed < 0) |
562 | if (op2->speed < 0) |
654 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
563 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
… | |
… | |
896 | update_now = 1; |
805 | update_now = 1; |
897 | |
806 | |
898 | if ((move_slow | op->move_slow) != move_slow) |
807 | if ((move_slow | op->move_slow) != move_slow) |
899 | update_now = 1; |
808 | update_now = 1; |
900 | } |
809 | } |
|
|
810 | |
901 | /* if the object is being removed, we can't make intelligent |
811 | /* if the object is being removed, we can't make intelligent |
902 | * decisions, because remove_ob can't really pass the object |
812 | * decisions, because remove_ob can't really pass the object |
903 | * that is being removed. |
813 | * that is being removed. |
904 | */ |
814 | */ |
905 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
815 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
917 | |
827 | |
918 | if (op->more != NULL) |
828 | if (op->more != NULL) |
919 | update_object (op->more, action); |
829 | update_object (op->more, action); |
920 | } |
830 | } |
921 | |
831 | |
922 | static unordered_vector<object *> mortals; |
832 | object::vector object::mortals; |
923 | static std::vector<object *, slice_allocator <object *> > freed; |
833 | object::vector object::objects; // not yet used |
|
|
834 | object *object::first; |
924 | |
835 | |
925 | void object::free_mortals () |
836 | void object::free_mortals () |
926 | { |
837 | { |
927 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) |
838 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
928 | if ((*i)->refcnt) |
839 | if ((*i)->refcnt) |
929 | ++i; // further delay freeing |
840 | ++i; // further delay freeing |
930 | else |
841 | else |
931 | { |
842 | { |
932 | //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D |
|
|
933 | //freed.push_back (*i);//D |
|
|
934 | delete *i; |
843 | delete *i; |
935 | mortals.erase (i); |
844 | mortals.erase (i); |
936 | } |
845 | } |
937 | |
|
|
938 | if (mortals.size() && 0)//D |
|
|
939 | LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D |
|
|
940 | } |
846 | } |
941 | |
847 | |
942 | object::object () |
848 | object::object () |
943 | { |
849 | { |
944 | SET_FLAG (this, FLAG_REMOVED); |
850 | SET_FLAG (this, FLAG_REMOVED); |
945 | |
851 | |
946 | expmul = 1.0; |
852 | expmul = 1.0; |
947 | face = blank_face; |
853 | face = blank_face; |
948 | attacked_by_count = -1; |
|
|
949 | } |
854 | } |
950 | |
855 | |
951 | object::~object () |
856 | object::~object () |
952 | { |
857 | { |
953 | free_key_values (this); |
858 | free_key_values (this); |
… | |
… | |
957 | { |
862 | { |
958 | count = ++ob_count; |
863 | count = ++ob_count; |
959 | uuid = gen_uuid (); |
864 | uuid = gen_uuid (); |
960 | |
865 | |
961 | prev = 0; |
866 | prev = 0; |
962 | next = objects; |
867 | next = object::first; |
963 | |
868 | |
964 | if (objects) |
869 | if (object::first) |
965 | objects->prev = this; |
870 | object::first->prev = this; |
966 | |
871 | |
967 | objects = this; |
872 | object::first = this; |
968 | } |
873 | } |
969 | |
874 | |
970 | void object::unlink () |
875 | void object::unlink () |
971 | { |
876 | { |
972 | //count = 0;//D |
|
|
973 | if (!prev && !next) return;//D |
|
|
974 | |
|
|
975 | if (this == objects) |
877 | if (this == object::first) |
976 | objects = next; |
878 | object::first = next; |
977 | |
879 | |
978 | /* Remove this object from the list of used objects */ |
880 | /* Remove this object from the list of used objects */ |
979 | if (prev) prev->next = next; |
881 | if (prev) prev->next = next; |
980 | if (next) next->prev = prev; |
882 | if (next) next->prev = prev; |
981 | |
883 | |
… | |
… | |
983 | next = 0; |
885 | next = 0; |
984 | } |
886 | } |
985 | |
887 | |
986 | object *object::create () |
888 | object *object::create () |
987 | { |
889 | { |
988 | object *op; |
|
|
989 | |
|
|
990 | if (freed.empty ()) |
|
|
991 | op = new object; |
890 | object *op = new object; |
992 | else |
|
|
993 | { |
|
|
994 | // highly annoying, but the only way to get it stable right now |
|
|
995 | op = freed.back (); |
|
|
996 | freed.pop_back (); |
|
|
997 | op->~object (); |
|
|
998 | new ((void *) op) object; |
|
|
999 | } |
|
|
1000 | |
|
|
1001 | op->link (); |
891 | op->link (); |
1002 | return op; |
892 | return op; |
1003 | } |
893 | } |
1004 | |
894 | |
1005 | /* |
895 | /* |
… | |
… | |
1007 | * it from the list of used objects, and puts it on the list of |
897 | * it from the list of used objects, and puts it on the list of |
1008 | * free objects. The IS_FREED() flag is set in the object. |
898 | * free objects. The IS_FREED() flag is set in the object. |
1009 | * The object must have been removed by remove_ob() first for |
899 | * The object must have been removed by remove_ob() first for |
1010 | * this function to succeed. |
900 | * this function to succeed. |
1011 | * |
901 | * |
1012 | * If free_inventory is set, free inventory as well. Else drop items in |
902 | * If destroy_inventory is set, free inventory as well. Else drop items in |
1013 | * inventory to the ground. |
903 | * inventory to the ground. |
1014 | */ |
904 | */ |
1015 | void object::free (bool free_inventory) |
905 | void object::destroy (bool destroy_inventory) |
1016 | { |
906 | { |
1017 | if (QUERY_FLAG (this, FLAG_FREED)) |
907 | if (QUERY_FLAG (this, FLAG_FREED)) |
1018 | return; |
908 | return; |
1019 | |
909 | |
1020 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
910 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
… | |
… | |
1023 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
913 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
1024 | remove_ob (this); |
914 | remove_ob (this); |
1025 | |
915 | |
1026 | SET_FLAG (this, FLAG_FREED); |
916 | SET_FLAG (this, FLAG_FREED); |
1027 | |
917 | |
1028 | //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D |
|
|
1029 | |
|
|
1030 | if (more) |
918 | if (more) |
1031 | { |
919 | { |
1032 | more->free (free_inventory); |
920 | more->destroy (destroy_inventory); |
1033 | more = 0; |
921 | more = 0; |
1034 | } |
922 | } |
1035 | |
923 | |
1036 | if (inv) |
924 | if (inv) |
1037 | { |
925 | { |
1038 | /* Only if the space blocks everything do we not process - |
926 | /* Only if the space blocks everything do we not process - |
1039 | * if some form of movement is allowed, let objects |
927 | * if some form of movement is allowed, let objects |
1040 | * drop on that space. |
928 | * drop on that space. |
1041 | */ |
929 | */ |
1042 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
930 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
1043 | { |
931 | { |
1044 | object *op = inv; |
932 | object *op = inv; |
1045 | |
933 | |
1046 | while (op) |
934 | while (op) |
1047 | { |
935 | { |
1048 | object *tmp = op->below; |
936 | object *tmp = op->below; |
1049 | op->free (free_inventory); |
937 | op->destroy (destroy_inventory); |
1050 | op = tmp; |
938 | op = tmp; |
1051 | } |
939 | } |
1052 | } |
940 | } |
1053 | else |
941 | else |
1054 | { /* Put objects in inventory onto this space */ |
942 | { /* Put objects in inventory onto this space */ |
… | |
… | |
1073 | op = tmp; |
961 | op = tmp; |
1074 | } |
962 | } |
1075 | } |
963 | } |
1076 | } |
964 | } |
1077 | |
965 | |
|
|
966 | // hack to ensure that freed objects still have a valid map |
|
|
967 | { |
|
|
968 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
969 | |
|
|
970 | if (!freed_map) |
|
|
971 | { |
|
|
972 | freed_map = new maptile; |
|
|
973 | |
|
|
974 | freed_map->name = "/internal/freed_objects_map"; |
|
|
975 | freed_map->width = 3; |
|
|
976 | freed_map->height = 3; |
|
|
977 | |
|
|
978 | freed_map->allocate (); |
|
|
979 | } |
|
|
980 | |
|
|
981 | map = freed_map; |
|
|
982 | x = 1; |
|
|
983 | y = 1; |
|
|
984 | } |
|
|
985 | |
|
|
986 | // clear those pointers that likely might have circular references to us |
1078 | owner = 0; |
987 | owner = 0; |
|
|
988 | enemy = 0; |
|
|
989 | attacked_by = 0; |
|
|
990 | |
|
|
991 | // only relevant for players(?), but make sure of it anyways |
|
|
992 | contr = 0; |
1079 | |
993 | |
1080 | /* Remove object from the active list */ |
994 | /* Remove object from the active list */ |
1081 | speed = 0; |
995 | speed = 0; |
1082 | update_ob_speed (this); |
996 | update_ob_speed (this); |
1083 | |
997 | |
… | |
… | |
1088 | |
1002 | |
1089 | /* |
1003 | /* |
1090 | * sub_weight() recursively (outwards) subtracts a number from the |
1004 | * sub_weight() recursively (outwards) subtracts a number from the |
1091 | * weight of an object (and what is carried by it's environment(s)). |
1005 | * weight of an object (and what is carried by it's environment(s)). |
1092 | */ |
1006 | */ |
1093 | |
|
|
1094 | void |
1007 | void |
1095 | sub_weight (object *op, signed long weight) |
1008 | sub_weight (object *op, signed long weight) |
1096 | { |
1009 | { |
1097 | while (op != NULL) |
1010 | while (op != NULL) |
1098 | { |
1011 | { |
1099 | if (op->type == CONTAINER) |
1012 | if (op->type == CONTAINER) |
1100 | { |
|
|
1101 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1013 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1102 | } |
1014 | |
1103 | op->carrying -= weight; |
1015 | op->carrying -= weight; |
1104 | op = op->env; |
1016 | op = op->env; |
1105 | } |
1017 | } |
1106 | } |
1018 | } |
1107 | |
1019 | |
… | |
… | |
1111 | * object will have no environment. If the object previously had an |
1023 | * object will have no environment. If the object previously had an |
1112 | * environment, the x and y coordinates will be updated to |
1024 | * environment, the x and y coordinates will be updated to |
1113 | * the previous environment. |
1025 | * the previous environment. |
1114 | * Beware: This function is called from the editor as well! |
1026 | * Beware: This function is called from the editor as well! |
1115 | */ |
1027 | */ |
1116 | |
|
|
1117 | void |
1028 | void |
1118 | remove_ob (object *op) |
1029 | object::remove () |
1119 | { |
1030 | { |
|
|
1031 | object *tmp, *last = 0; |
1120 | object * |
1032 | object *otmp; |
1121 | tmp, * |
|
|
1122 | last = NULL; |
|
|
1123 | object * |
|
|
1124 | otmp; |
|
|
1125 | |
1033 | |
1126 | tag_t |
|
|
1127 | tag; |
|
|
1128 | int |
|
|
1129 | check_walk_off; |
1034 | int check_walk_off; |
1130 | mapstruct * |
|
|
1131 | m; |
|
|
1132 | |
1035 | |
1133 | sint16 |
|
|
1134 | x, |
|
|
1135 | y; |
|
|
1136 | |
|
|
1137 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1036 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1138 | return; |
1037 | return; |
1139 | |
1038 | |
1140 | SET_FLAG (op, FLAG_REMOVED); |
1039 | SET_FLAG (this, FLAG_REMOVED); |
1141 | |
1040 | |
1142 | if (op->more != NULL) |
1041 | if (more) |
1143 | remove_ob (op->more); |
1042 | more->remove (); |
1144 | |
1043 | |
1145 | /* |
1044 | /* |
1146 | * In this case, the object to be removed is in someones |
1045 | * In this case, the object to be removed is in someones |
1147 | * inventory. |
1046 | * inventory. |
1148 | */ |
1047 | */ |
1149 | if (op->env != NULL) |
1048 | if (env) |
1150 | { |
1049 | { |
1151 | if (op->nrof) |
1050 | if (nrof) |
1152 | sub_weight (op->env, op->weight * op->nrof); |
1051 | sub_weight (env, weight * nrof); |
1153 | else |
1052 | else |
1154 | sub_weight (op->env, op->weight + op->carrying); |
1053 | sub_weight (env, weight + carrying); |
1155 | |
1054 | |
1156 | /* NO_FIX_PLAYER is set when a great many changes are being |
1055 | /* NO_FIX_PLAYER is set when a great many changes are being |
1157 | * made to players inventory. If set, avoiding the call |
1056 | * made to players inventory. If set, avoiding the call |
1158 | * to save cpu time. |
1057 | * to save cpu time. |
1159 | */ |
1058 | */ |
1160 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1059 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1161 | fix_player (otmp); |
1060 | fix_player (otmp); |
1162 | |
1061 | |
1163 | if (op->above != NULL) |
1062 | if (above != NULL) |
1164 | op->above->below = op->below; |
1063 | above->below = below; |
1165 | else |
1064 | else |
1166 | op->env->inv = op->below; |
1065 | env->inv = below; |
1167 | |
1066 | |
1168 | if (op->below != NULL) |
1067 | if (below != NULL) |
1169 | op->below->above = op->above; |
1068 | below->above = above; |
1170 | |
1069 | |
1171 | /* we set up values so that it could be inserted into |
1070 | /* we set up values so that it could be inserted into |
1172 | * the map, but we don't actually do that - it is up |
1071 | * the map, but we don't actually do that - it is up |
1173 | * to the caller to decide what we want to do. |
1072 | * to the caller to decide what we want to do. |
1174 | */ |
1073 | */ |
1175 | op->x = op->env->x, op->y = op->env->y; |
1074 | x = env->x, y = env->y; |
1176 | op->map = op->env->map; |
1075 | map = env->map; |
1177 | op->above = NULL, op->below = NULL; |
1076 | above = 0, below = 0; |
1178 | op->env = NULL; |
1077 | env = 0; |
1179 | } |
1078 | } |
1180 | else if (op->map) |
1079 | else if (map) |
1181 | { |
1080 | { |
1182 | x = op->x; |
|
|
1183 | y = op->y; |
|
|
1184 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1185 | |
|
|
1186 | if (!m) |
|
|
1187 | { |
|
|
1188 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1189 | op->map->path, op->x, op->y); |
|
|
1190 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1191 | * it seems if we get into this case, something is probablye |
|
|
1192 | * screwed up and should be fixed. |
|
|
1193 | */ |
|
|
1194 | abort (); |
|
|
1195 | } |
|
|
1196 | |
|
|
1197 | if (op->map != m) |
|
|
1198 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1199 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1200 | |
|
|
1201 | /* Re did the following section of code - it looks like it had |
1081 | /* Re did the following section of code - it looks like it had |
1202 | * lots of logic for things we no longer care about |
1082 | * lots of logic for things we no longer care about |
1203 | */ |
1083 | */ |
1204 | |
1084 | |
1205 | /* link the object above us */ |
1085 | /* link the object above us */ |
1206 | if (op->above) |
1086 | if (above) |
1207 | op->above->below = op->below; |
1087 | above->below = below; |
1208 | else |
1088 | else |
1209 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1089 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1210 | |
1090 | |
1211 | /* Relink the object below us, if there is one */ |
1091 | /* Relink the object below us, if there is one */ |
1212 | if (op->below) |
1092 | if (below) |
1213 | op->below->above = op->above; |
1093 | below->above = above; |
1214 | else |
1094 | else |
1215 | { |
1095 | { |
1216 | /* Nothing below, which means we need to relink map object for this space |
1096 | /* Nothing below, which means we need to relink map object for this space |
1217 | * use translated coordinates in case some oddness with map tiling is |
1097 | * use translated coordinates in case some oddness with map tiling is |
1218 | * evident |
1098 | * evident |
1219 | */ |
1099 | */ |
1220 | if (GET_MAP_OB (m, x, y) != op) |
1100 | if (GET_MAP_OB (map, x, y) != this) |
1221 | { |
1101 | { |
1222 | dump_object (op); |
1102 | char *dump = dump_object (this); |
1223 | LOG (llevError, |
1103 | LOG (llevError, |
1224 | "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); |
1104 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
|
|
1105 | free (dump); |
1225 | dump_object (GET_MAP_OB (m, x, y)); |
1106 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1226 | LOG (llevError, "%s\n", errmsg); |
1107 | LOG (llevError, "%s\n", dump); |
|
|
1108 | free (dump); |
1227 | } |
1109 | } |
1228 | |
1110 | |
1229 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1111 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1230 | } |
1112 | } |
1231 | |
1113 | |
1232 | op->above = 0; |
1114 | above = 0; |
1233 | op->below = 0; |
1115 | below = 0; |
1234 | |
1116 | |
1235 | if (op->map->in_memory == MAP_SAVING) |
1117 | if (map->in_memory == MAP_SAVING) |
1236 | return; |
1118 | return; |
1237 | |
1119 | |
1238 | tag = op->count; |
|
|
1239 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1120 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1240 | |
1121 | |
1241 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1122 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1242 | { |
1123 | { |
1243 | /* No point updating the players look faces if he is the object |
1124 | /* No point updating the players look faces if he is the object |
1244 | * being removed. |
1125 | * being removed. |
1245 | */ |
1126 | */ |
1246 | |
1127 | |
1247 | if (tmp->type == PLAYER && tmp != op) |
1128 | if (tmp->type == PLAYER && tmp != this) |
1248 | { |
1129 | { |
1249 | /* If a container that the player is currently using somehow gets |
1130 | /* If a container that the player is currently using somehow gets |
1250 | * removed (most likely destroyed), update the player view |
1131 | * removed (most likely destroyed), update the player view |
1251 | * appropriately. |
1132 | * appropriately. |
1252 | */ |
1133 | */ |
1253 | if (tmp->container == op) |
1134 | if (tmp->container == this) |
1254 | { |
1135 | { |
1255 | CLEAR_FLAG (op, FLAG_APPLIED); |
1136 | CLEAR_FLAG (this, FLAG_APPLIED); |
1256 | tmp->container = NULL; |
1137 | tmp->container = 0; |
1257 | } |
1138 | } |
1258 | |
1139 | |
1259 | tmp->contr->socket.update_look = 1; |
1140 | tmp->contr->socket.update_look = 1; |
1260 | } |
1141 | } |
1261 | |
1142 | |
1262 | /* See if player moving off should effect something */ |
1143 | /* See if player moving off should effect something */ |
1263 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1144 | if (check_walk_off |
|
|
1145 | && ((move_type & tmp->move_off) |
|
|
1146 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1264 | { |
1147 | { |
1265 | move_apply (tmp, op, NULL); |
1148 | move_apply (tmp, this, 0); |
1266 | |
1149 | |
1267 | if (was_destroyed (op, tag)) |
1150 | if (destroyed ()) |
1268 | { |
|
|
1269 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1151 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1270 | } |
|
|
1271 | } |
1152 | } |
1272 | |
1153 | |
1273 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1154 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1274 | |
1155 | |
1275 | if (tmp->above == tmp) |
1156 | if (tmp->above == tmp) |
1276 | tmp->above = NULL; |
1157 | tmp->above = 0; |
1277 | |
1158 | |
1278 | last = tmp; |
1159 | last = tmp; |
1279 | } |
1160 | } |
1280 | |
1161 | |
1281 | /* last == NULL of there are no objects on this space */ |
1162 | /* last == NULL of there are no objects on this space */ |
1282 | if (last == NULL) |
1163 | if (!last) |
1283 | { |
1164 | { |
1284 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1165 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1285 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1166 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1286 | * those out anyways, and if there are any flags set right now, they won't |
1167 | * those out anyways, and if there are any flags set right now, they won't |
1287 | * be correct anyways. |
1168 | * be correct anyways. |
1288 | */ |
1169 | */ |
1289 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1170 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1290 | update_position (op->map, op->x, op->y); |
1171 | update_position (map, x, y); |
1291 | } |
1172 | } |
1292 | else |
1173 | else |
1293 | update_object (last, UP_OBJ_REMOVE); |
1174 | update_object (last, UP_OBJ_REMOVE); |
1294 | |
1175 | |
1295 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1176 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1296 | update_all_los (op->map, op->x, op->y); |
1177 | update_all_los (map, x, y); |
1297 | } |
1178 | } |
1298 | } |
1179 | } |
1299 | |
1180 | |
1300 | /* |
1181 | /* |
1301 | * merge_ob(op,top): |
1182 | * merge_ob(op,top): |
… | |
… | |
1328 | free_object (op); |
1209 | free_object (op); |
1329 | return top; |
1210 | return top; |
1330 | } |
1211 | } |
1331 | } |
1212 | } |
1332 | |
1213 | |
1333 | return NULL; |
1214 | return 0; |
1334 | } |
1215 | } |
1335 | |
1216 | |
1336 | /* |
1217 | /* |
1337 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1218 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1338 | * job preparing multi-part monsters |
1219 | * job preparing multi-part monsters |
1339 | */ |
1220 | */ |
1340 | object * |
1221 | object * |
1341 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1222 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1342 | { |
1223 | { |
1343 | object *tmp; |
1224 | object *tmp; |
1344 | |
1225 | |
1345 | if (op->head) |
1226 | if (op->head) |
1346 | op = op->head; |
1227 | op = op->head; |
… | |
… | |
1374 | * NULL if 'op' was destroyed |
1255 | * NULL if 'op' was destroyed |
1375 | * just 'op' otherwise |
1256 | * just 'op' otherwise |
1376 | */ |
1257 | */ |
1377 | |
1258 | |
1378 | object * |
1259 | object * |
1379 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1260 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1380 | { |
1261 | { |
1381 | object *tmp, *top, *floor = NULL; |
1262 | object *tmp, *top, *floor = NULL; |
1382 | sint16 x, y; |
1263 | sint16 x, y; |
1383 | |
1264 | |
1384 | if (QUERY_FLAG (op, FLAG_FREED)) |
1265 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1387 | return NULL; |
1268 | return NULL; |
1388 | } |
1269 | } |
1389 | |
1270 | |
1390 | if (m == NULL) |
1271 | if (m == NULL) |
1391 | { |
1272 | { |
1392 | dump_object (op); |
1273 | char *dump = dump_object (op); |
1393 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1274 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1275 | free (dump); |
1394 | return op; |
1276 | return op; |
1395 | } |
1277 | } |
1396 | |
1278 | |
1397 | if (out_of_map (m, op->x, op->y)) |
1279 | if (out_of_map (m, op->x, op->y)) |
1398 | { |
1280 | { |
1399 | dump_object (op); |
1281 | char *dump = dump_object (op); |
1400 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1282 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1401 | #ifdef MANY_CORES |
1283 | #ifdef MANY_CORES |
1402 | /* Better to catch this here, as otherwise the next use of this object |
1284 | /* Better to catch this here, as otherwise the next use of this object |
1403 | * is likely to cause a crash. Better to find out where it is getting |
1285 | * is likely to cause a crash. Better to find out where it is getting |
1404 | * improperly inserted. |
1286 | * improperly inserted. |
1405 | */ |
1287 | */ |
1406 | abort (); |
1288 | abort (); |
1407 | #endif |
1289 | #endif |
|
|
1290 | free (dump); |
1408 | return op; |
1291 | return op; |
1409 | } |
1292 | } |
1410 | |
1293 | |
1411 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1294 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1412 | { |
1295 | { |
1413 | dump_object (op); |
1296 | char *dump = dump_object (op); |
1414 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1297 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1298 | free (dump); |
1415 | return op; |
1299 | return op; |
1416 | } |
1300 | } |
1417 | |
1301 | |
1418 | if (op->more != NULL) |
1302 | if (op->more != NULL) |
1419 | { |
1303 | { |
… | |
… | |
1665 | remove_ob (tmp); |
1549 | remove_ob (tmp); |
1666 | free_object (tmp); |
1550 | free_object (tmp); |
1667 | } |
1551 | } |
1668 | } |
1552 | } |
1669 | |
1553 | |
1670 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1554 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1671 | |
1555 | |
1672 | tmp1->x = op->x; |
1556 | tmp1->x = op->x; |
1673 | tmp1->y = op->y; |
1557 | tmp1->y = op->y; |
1674 | insert_ob_in_map (tmp1, op->map, op, 0); |
1558 | insert_ob_in_map (tmp1, op->map, op, 0); |
1675 | } |
1559 | } |
… | |
… | |
1833 | op->carrying += weight; |
1717 | op->carrying += weight; |
1834 | op = op->env; |
1718 | op = op->env; |
1835 | } |
1719 | } |
1836 | } |
1720 | } |
1837 | |
1721 | |
|
|
1722 | object * |
|
|
1723 | insert_ob_in_ob (object *op, object *where) |
|
|
1724 | { |
|
|
1725 | if (!where) |
|
|
1726 | { |
|
|
1727 | char *dump = dump_object (op); |
|
|
1728 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1729 | free (dump); |
|
|
1730 | return op; |
|
|
1731 | } |
|
|
1732 | |
|
|
1733 | if (where->head) |
|
|
1734 | { |
|
|
1735 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1736 | where = where->head; |
|
|
1737 | } |
|
|
1738 | |
|
|
1739 | return where->insert (op); |
|
|
1740 | } |
|
|
1741 | |
1838 | /* |
1742 | /* |
1839 | * insert_ob_in_ob(op,environment): |
1743 | * env->insert (op) |
1840 | * This function inserts the object op in the linked list |
1744 | * This function inserts the object op in the linked list |
1841 | * inside the object environment. |
1745 | * inside the object environment. |
1842 | * |
1746 | * |
1843 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1844 | * the inventory at the last position or next to other objects of the same |
|
|
1845 | * type. |
|
|
1846 | * Frank: Now sorted by type, archetype and magic! |
|
|
1847 | * |
|
|
1848 | * The function returns now pointer to inserted item, and return value can |
1747 | * The function returns now pointer to inserted item, and return value can |
1849 | * be != op, if items are merged. -Tero |
1748 | * be != op, if items are merged. -Tero |
1850 | */ |
1749 | */ |
1851 | |
1750 | |
1852 | object * |
1751 | object * |
1853 | insert_ob_in_ob (object *op, object *where) |
1752 | object::insert (object *op) |
1854 | { |
1753 | { |
1855 | object * |
1754 | object *tmp, *otmp; |
1856 | tmp, * |
|
|
1857 | otmp; |
|
|
1858 | |
1755 | |
1859 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1756 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1860 | { |
1757 | op->remove (); |
1861 | dump_object (op); |
|
|
1862 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1863 | return op; |
|
|
1864 | } |
|
|
1865 | |
|
|
1866 | if (where == NULL) |
|
|
1867 | { |
|
|
1868 | dump_object (op); |
|
|
1869 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1870 | return op; |
|
|
1871 | } |
|
|
1872 | |
|
|
1873 | if (where->head) |
|
|
1874 | { |
|
|
1875 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1876 | where = where->head; |
|
|
1877 | } |
|
|
1878 | |
1758 | |
1879 | if (op->more) |
1759 | if (op->more) |
1880 | { |
1760 | { |
1881 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1761 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1882 | return op; |
1762 | return op; |
… | |
… | |
1884 | |
1764 | |
1885 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1765 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1886 | CLEAR_FLAG (op, FLAG_REMOVED); |
1766 | CLEAR_FLAG (op, FLAG_REMOVED); |
1887 | if (op->nrof) |
1767 | if (op->nrof) |
1888 | { |
1768 | { |
1889 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1769 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1890 | if (CAN_MERGE (tmp, op)) |
1770 | if (CAN_MERGE (tmp, op)) |
1891 | { |
1771 | { |
1892 | /* return the original object and remove inserted object |
1772 | /* return the original object and remove inserted object |
1893 | (client needs the original object) */ |
1773 | (client needs the original object) */ |
1894 | tmp->nrof += op->nrof; |
1774 | tmp->nrof += op->nrof; |
1895 | /* Weight handling gets pretty funky. Since we are adding to |
1775 | /* Weight handling gets pretty funky. Since we are adding to |
1896 | * tmp->nrof, we need to increase the weight. |
1776 | * tmp->nrof, we need to increase the weight. |
1897 | */ |
1777 | */ |
1898 | add_weight (where, op->weight * op->nrof); |
1778 | add_weight (this, op->weight * op->nrof); |
1899 | SET_FLAG (op, FLAG_REMOVED); |
1779 | SET_FLAG (op, FLAG_REMOVED); |
1900 | free_object (op); /* free the inserted object */ |
1780 | op->destroy (); /* free the inserted object */ |
1901 | op = tmp; |
1781 | op = tmp; |
1902 | remove_ob (op); /* and fix old object's links */ |
1782 | op->remove (); /* and fix old object's links */ |
1903 | CLEAR_FLAG (op, FLAG_REMOVED); |
1783 | CLEAR_FLAG (op, FLAG_REMOVED); |
1904 | break; |
1784 | break; |
1905 | } |
1785 | } |
1906 | |
1786 | |
1907 | /* I assume combined objects have no inventory |
1787 | /* I assume combined objects have no inventory |
1908 | * We add the weight - this object could have just been removed |
1788 | * We add the weight - this object could have just been removed |
1909 | * (if it was possible to merge). calling remove_ob will subtract |
1789 | * (if it was possible to merge). calling remove_ob will subtract |
1910 | * the weight, so we need to add it in again, since we actually do |
1790 | * the weight, so we need to add it in again, since we actually do |
1911 | * the linking below |
1791 | * the linking below |
1912 | */ |
1792 | */ |
1913 | add_weight (where, op->weight * op->nrof); |
1793 | add_weight (this, op->weight * op->nrof); |
1914 | } |
1794 | } |
1915 | else |
1795 | else |
1916 | add_weight (where, (op->weight + op->carrying)); |
1796 | add_weight (this, (op->weight + op->carrying)); |
1917 | |
1797 | |
1918 | otmp = is_player_inv (where); |
1798 | otmp = is_player_inv (this); |
1919 | if (otmp && otmp->contr != NULL) |
1799 | if (otmp && otmp->contr) |
1920 | { |
|
|
1921 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1800 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1922 | fix_player (otmp); |
1801 | fix_player (otmp); |
1923 | } |
|
|
1924 | |
1802 | |
1925 | op->map = NULL; |
1803 | op->map = NULL; |
1926 | op->env = where; |
1804 | op->env = this; |
1927 | op->above = NULL; |
1805 | op->above = NULL; |
1928 | op->below = NULL; |
1806 | op->below = NULL; |
1929 | op->x = 0, op->y = 0; |
1807 | op->x = 0, op->y = 0; |
1930 | |
1808 | |
1931 | /* reset the light list and los of the players on the map */ |
1809 | /* reset the light list and los of the players on the map */ |
1932 | if ((op->glow_radius != 0) && where->map) |
1810 | if ((op->glow_radius != 0) && map) |
1933 | { |
1811 | { |
1934 | #ifdef DEBUG_LIGHTS |
1812 | #ifdef DEBUG_LIGHTS |
1935 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1813 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1936 | #endif /* DEBUG_LIGHTS */ |
1814 | #endif /* DEBUG_LIGHTS */ |
1937 | if (MAP_DARKNESS (where->map)) |
1815 | if (MAP_DARKNESS (map)) |
1938 | update_all_los (where->map, where->x, where->y); |
1816 | update_all_los (map, x, y); |
1939 | } |
1817 | } |
1940 | |
1818 | |
1941 | /* Client has no idea of ordering so lets not bother ordering it here. |
1819 | /* Client has no idea of ordering so lets not bother ordering it here. |
1942 | * It sure simplifies this function... |
1820 | * It sure simplifies this function... |
1943 | */ |
1821 | */ |
1944 | if (where->inv == NULL) |
1822 | if (!inv) |
1945 | where->inv = op; |
1823 | inv = op; |
1946 | else |
1824 | else |
1947 | { |
1825 | { |
1948 | op->below = where->inv; |
1826 | op->below = inv; |
1949 | op->below->above = op; |
1827 | op->below->above = op; |
1950 | where->inv = op; |
1828 | inv = op; |
1951 | } |
1829 | } |
|
|
1830 | |
1952 | return op; |
1831 | return op; |
1953 | } |
1832 | } |
1954 | |
1833 | |
1955 | /* |
1834 | /* |
1956 | * Checks if any objects has a move_type that matches objects |
1835 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1974 | */ |
1853 | */ |
1975 | |
1854 | |
1976 | int |
1855 | int |
1977 | check_move_on (object *op, object *originator) |
1856 | check_move_on (object *op, object *originator) |
1978 | { |
1857 | { |
1979 | object * |
1858 | object *tmp; |
1980 | tmp; |
1859 | maptile *m = op->map; |
1981 | tag_t |
|
|
1982 | tag; |
|
|
1983 | mapstruct * |
|
|
1984 | m = op->map; |
|
|
1985 | int |
|
|
1986 | x = op->x, y = op->y; |
1860 | int x = op->x, y = op->y; |
1987 | |
1861 | |
1988 | MoveType |
1862 | MoveType move_on, move_slow, move_block; |
1989 | move_on, |
|
|
1990 | move_slow, |
|
|
1991 | move_block; |
|
|
1992 | |
1863 | |
1993 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1864 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1994 | return 0; |
1865 | return 0; |
1995 | |
|
|
1996 | tag = op->count; |
|
|
1997 | |
1866 | |
1998 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1867 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1999 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1868 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
2000 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1869 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
2001 | |
1870 | |
… | |
… | |
2062 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1931 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2063 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1932 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
2064 | { |
1933 | { |
2065 | move_apply (tmp, op, originator); |
1934 | move_apply (tmp, op, originator); |
2066 | |
1935 | |
2067 | if (was_destroyed (op, tag)) |
1936 | if (op->destroyed ()) |
2068 | return 1; |
1937 | return 1; |
2069 | |
1938 | |
2070 | /* what the person/creature stepped onto has moved the object |
1939 | /* what the person/creature stepped onto has moved the object |
2071 | * someplace new. Don't process any further - if we did, |
1940 | * someplace new. Don't process any further - if we did, |
2072 | * have a feeling strange problems would result. |
1941 | * have a feeling strange problems would result. |
… | |
… | |
2084 | * a matching archetype at the given map and coordinates. |
1953 | * a matching archetype at the given map and coordinates. |
2085 | * The first matching object is returned, or NULL if none. |
1954 | * The first matching object is returned, or NULL if none. |
2086 | */ |
1955 | */ |
2087 | |
1956 | |
2088 | object * |
1957 | object * |
2089 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1958 | present_arch (const archetype *at, maptile *m, int x, int y) |
2090 | { |
1959 | { |
2091 | object * |
1960 | object * |
2092 | tmp; |
1961 | tmp; |
2093 | |
1962 | |
2094 | if (m == NULL || out_of_map (m, x, y)) |
1963 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2107 | * a matching type variable at the given map and coordinates. |
1976 | * a matching type variable at the given map and coordinates. |
2108 | * The first matching object is returned, or NULL if none. |
1977 | * The first matching object is returned, or NULL if none. |
2109 | */ |
1978 | */ |
2110 | |
1979 | |
2111 | object * |
1980 | object * |
2112 | present (unsigned char type, mapstruct *m, int x, int y) |
1981 | present (unsigned char type, maptile *m, int x, int y) |
2113 | { |
1982 | { |
2114 | object * |
1983 | object * |
2115 | tmp; |
1984 | tmp; |
2116 | |
1985 | |
2117 | if (out_of_map (m, x, y)) |
1986 | if (out_of_map (m, x, y)) |
… | |
… | |
2257 | * the archetype because that isn't correct if the monster has been |
2126 | * the archetype because that isn't correct if the monster has been |
2258 | * customized, changed states, etc. |
2127 | * customized, changed states, etc. |
2259 | */ |
2128 | */ |
2260 | |
2129 | |
2261 | int |
2130 | int |
2262 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2131 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2263 | { |
2132 | { |
2264 | int |
2133 | int |
2265 | i, |
2134 | i, |
2266 | index = 0, flag; |
2135 | index = 0, flag; |
2267 | static int |
2136 | static int |
… | |
… | |
2288 | return -1; |
2157 | return -1; |
2289 | return altern[RANDOM () % index]; |
2158 | return altern[RANDOM () % index]; |
2290 | } |
2159 | } |
2291 | |
2160 | |
2292 | /* |
2161 | /* |
2293 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2162 | * find_first_free_spot(archetype, maptile, x, y) works like |
2294 | * find_free_spot(), but it will search max number of squares. |
2163 | * find_free_spot(), but it will search max number of squares. |
2295 | * But it will return the first available spot, not a random choice. |
2164 | * But it will return the first available spot, not a random choice. |
2296 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2165 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2297 | */ |
2166 | */ |
2298 | |
2167 | |
2299 | int |
2168 | int |
2300 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2169 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2301 | { |
2170 | { |
2302 | int |
2171 | int |
2303 | i; |
2172 | i; |
2304 | |
2173 | |
2305 | for (i = 0; i < SIZEOFFREE; i++) |
2174 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2369 | * because we have to know what movement the thing looking to move |
2238 | * because we have to know what movement the thing looking to move |
2370 | * there is capable of. |
2239 | * there is capable of. |
2371 | */ |
2240 | */ |
2372 | |
2241 | |
2373 | int |
2242 | int |
2374 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2243 | find_dir (maptile *m, int x, int y, object *exclude) |
2375 | { |
2244 | { |
2376 | int |
2245 | int |
2377 | i, |
2246 | i, |
2378 | max = SIZEOFFREE, mflags; |
2247 | max = SIZEOFFREE, mflags; |
2379 | |
2248 | |
2380 | sint16 nx, ny; |
2249 | sint16 nx, ny; |
2381 | object * |
2250 | object * |
2382 | tmp; |
2251 | tmp; |
2383 | mapstruct * |
2252 | maptile * |
2384 | mp; |
2253 | mp; |
2385 | |
2254 | |
2386 | MoveType blocked, move_type; |
2255 | MoveType blocked, move_type; |
2387 | |
2256 | |
2388 | if (exclude && exclude->head) |
2257 | if (exclude && exclude->head) |
… | |
… | |
2596 | * Modified to be map tile aware -.MSW |
2465 | * Modified to be map tile aware -.MSW |
2597 | */ |
2466 | */ |
2598 | |
2467 | |
2599 | |
2468 | |
2600 | int |
2469 | int |
2601 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2470 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2602 | { |
2471 | { |
2603 | sint16 dx, dy; |
2472 | sint16 dx, dy; |
2604 | int |
2473 | int |
2605 | mflags; |
2474 | mflags; |
2606 | |
2475 | |
… | |
… | |
2686 | if (prev) |
2555 | if (prev) |
2687 | prev->more = tmp; |
2556 | prev->more = tmp; |
2688 | prev = tmp; |
2557 | prev = tmp; |
2689 | } |
2558 | } |
2690 | |
2559 | |
2691 | /*** copy inventory ***/ |
|
|
2692 | for (item = src->inv; item; item = item->below) |
2560 | for (item = src->inv; item; item = item->below) |
2693 | { |
|
|
2694 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2561 | insert_ob_in_ob (object_create_clone (item), dst); |
2695 | } |
|
|
2696 | |
2562 | |
2697 | return dst; |
2563 | return dst; |
2698 | } |
2564 | } |
2699 | |
2565 | |
2700 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2701 | int |
|
|
2702 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2703 | { |
|
|
2704 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2705 | * robust */ |
|
|
2706 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2707 | } |
|
|
2708 | |
|
|
2709 | /* GROS - Creates an object using a string representing its content. */ |
2566 | /* GROS - Creates an object using a string representing its content. */ |
2710 | |
|
|
2711 | /* Basically, we save the content of the string to a temp file, then call */ |
2567 | /* Basically, we save the content of the string to a temp file, then call */ |
2712 | |
|
|
2713 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2568 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2714 | |
|
|
2715 | /* but it was simple to make and allows reusing the load_object function. */ |
2569 | /* but it was simple to make and allows reusing the load_object function. */ |
2716 | |
|
|
2717 | /* Remember not to use load_object_str in a time-critical situation. */ |
2570 | /* Remember not to use load_object_str in a time-critical situation. */ |
2718 | |
|
|
2719 | /* Also remember that multiparts objects are not supported for now. */ |
2571 | /* Also remember that multiparts objects are not supported for now. */ |
2720 | |
2572 | |
2721 | object * |
2573 | object * |
2722 | load_object_str (const char *obstr) |
2574 | load_object_str (const char *obstr) |
2723 | { |
2575 | { |
2724 | object * |
2576 | object *op; |
2725 | op; |
|
|
2726 | char |
|
|
2727 | filename[MAX_BUF]; |
2577 | char filename[MAX_BUF]; |
2728 | |
2578 | |
2729 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2579 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2730 | |
2580 | |
2731 | FILE * |
|
|
2732 | tempfile = fopen (filename, "w"); |
2581 | FILE *tempfile = fopen (filename, "w"); |
2733 | |
2582 | |
2734 | if (tempfile == NULL) |
2583 | if (tempfile == NULL) |
2735 | { |
2584 | { |
2736 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2585 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2737 | return NULL; |
2586 | return NULL; |
… | |
… | |
2758 | * returns NULL if no match. |
2607 | * returns NULL if no match. |
2759 | */ |
2608 | */ |
2760 | object * |
2609 | object * |
2761 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2610 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2762 | { |
2611 | { |
2763 | object * |
2612 | object *tmp; |
2764 | tmp; |
|
|
2765 | |
2613 | |
2766 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2614 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2767 | if (tmp->type == type && tmp->subtype == subtype) |
2615 | if (tmp->type == type && tmp->subtype == subtype) |
2768 | return tmp; |
2616 | return tmp; |
2769 | |
2617 | |
… | |
… | |
2777 | * do the desired thing. |
2625 | * do the desired thing. |
2778 | */ |
2626 | */ |
2779 | key_value * |
2627 | key_value * |
2780 | get_ob_key_link (const object *ob, const char *key) |
2628 | get_ob_key_link (const object *ob, const char *key) |
2781 | { |
2629 | { |
2782 | key_value * |
2630 | key_value *link; |
2783 | link; |
|
|
2784 | |
2631 | |
2785 | for (link = ob->key_values; link != NULL; link = link->next) |
2632 | for (link = ob->key_values; link != NULL; link = link->next) |
2786 | { |
|
|
2787 | if (link->key == key) |
2633 | if (link->key == key) |
2788 | { |
|
|
2789 | return link; |
2634 | return link; |
2790 | } |
|
|
2791 | } |
|
|
2792 | |
2635 | |
2793 | return NULL; |
2636 | return NULL; |
2794 | } |
2637 | } |
2795 | |
2638 | |
2796 | /* |
2639 | /* |