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. */ |
… | |
… | |
32 | #include <object.h> |
31 | #include <object.h> |
33 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
34 | #include <loader.h> |
33 | #include <loader.h> |
35 | |
34 | |
36 | int nrofallocobjects = 0; |
35 | int nrofallocobjects = 0; |
|
|
36 | static UUID uuid; |
|
|
37 | const uint64 UUID_SKIP = 1<<19; |
37 | |
38 | |
38 | object *objects; /* Pointer to the list of used objects */ |
|
|
39 | 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 */ |
40 | |
40 | |
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, |
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, |
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 |
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 |
43 | }; |
43 | }; |
… | |
… | |
49 | }; |
49 | }; |
50 | int freedir[SIZEOFFREE] = { |
50 | int freedir[SIZEOFFREE] = { |
51 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
51 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
52 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
52 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
53 | }; |
53 | }; |
|
|
54 | |
|
|
55 | static void |
|
|
56 | write_uuid (void) |
|
|
57 | { |
|
|
58 | char filename1[MAX_BUF], filename2[MAX_BUF]; |
|
|
59 | |
|
|
60 | sprintf (filename1, "%s/uuid", settings.localdir); |
|
|
61 | sprintf (filename2, "%s/uuid~", settings.localdir); |
|
|
62 | |
|
|
63 | FILE *fp; |
|
|
64 | |
|
|
65 | if (!(fp = fopen (filename2, "w"))) |
|
|
66 | { |
|
|
67 | LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); |
|
|
68 | return; |
|
|
69 | } |
|
|
70 | |
|
|
71 | fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); |
|
|
72 | fclose (fp); |
|
|
73 | rename (filename2, filename1); |
|
|
74 | } |
|
|
75 | |
|
|
76 | static void |
|
|
77 | read_uuid (void) |
|
|
78 | { |
|
|
79 | char filename[MAX_BUF]; |
|
|
80 | |
|
|
81 | sprintf (filename, "%s/uuid", settings.localdir); |
|
|
82 | |
|
|
83 | FILE *fp; |
|
|
84 | |
|
|
85 | if (!(fp = fopen (filename, "r"))) |
|
|
86 | { |
|
|
87 | if (errno == ENOENT) |
|
|
88 | { |
|
|
89 | LOG (llevInfo, "RESET uid to 1\n"); |
|
|
90 | uuid.seq = 0; |
|
|
91 | write_uuid (); |
|
|
92 | return; |
|
|
93 | } |
|
|
94 | |
|
|
95 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
|
|
96 | _exit (1); |
|
|
97 | } |
|
|
98 | |
|
|
99 | int version; |
|
|
100 | unsigned long long uid; |
|
|
101 | if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) |
|
|
102 | { |
|
|
103 | LOG (llevError, "FATAL: error reading uid from %s!\n", filename); |
|
|
104 | _exit (1); |
|
|
105 | } |
|
|
106 | |
|
|
107 | uuid.seq = uid; |
|
|
108 | write_uuid (); |
|
|
109 | LOG (llevDebug, "read UID: %lld\n", uid); |
|
|
110 | fclose (fp); |
|
|
111 | } |
|
|
112 | |
|
|
113 | UUID |
|
|
114 | gen_uuid () |
|
|
115 | { |
|
|
116 | UUID uid; |
|
|
117 | |
|
|
118 | uid.seq = ++uuid.seq; |
|
|
119 | |
|
|
120 | if (!(uuid.seq & (UUID_SKIP - 1))) |
|
|
121 | write_uuid (); |
|
|
122 | |
|
|
123 | return uid; |
|
|
124 | } |
|
|
125 | |
|
|
126 | void |
|
|
127 | init_uuid () |
|
|
128 | { |
|
|
129 | read_uuid (); |
|
|
130 | } |
54 | |
131 | |
55 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
132 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
56 | static int |
133 | static int |
57 | compare_ob_value_lists_one (const object *wants, const object *has) |
134 | compare_ob_value_lists_one (const object *wants, const object *has) |
58 | { |
135 | { |
… | |
… | |
368 | void |
445 | void |
369 | dump_all_objects (void) |
446 | dump_all_objects (void) |
370 | { |
447 | { |
371 | object *op; |
448 | object *op; |
372 | |
449 | |
373 | for (op = objects; op != NULL; op = op->next) |
450 | for (op = object::first; op != NULL; op = op->next) |
374 | { |
451 | { |
375 | dump_object (op); |
452 | dump_object (op); |
376 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
453 | fprintf (logfile, "Object %s\n", errmsg); |
377 | } |
454 | } |
378 | } |
455 | } |
379 | |
456 | |
380 | /* |
457 | /* |
381 | * get_nearest_part(multi-object, object 2) returns the part of the |
458 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
404 | object * |
481 | object * |
405 | find_object (tag_t i) |
482 | find_object (tag_t i) |
406 | { |
483 | { |
407 | object *op; |
484 | object *op; |
408 | |
485 | |
409 | for (op = objects; op != NULL; op = op->next) |
486 | for (op = object::first; op != NULL; op = op->next) |
410 | if (op->count == i) |
487 | if (op->count == i) |
411 | break; |
488 | break; |
|
|
489 | |
412 | return op; |
490 | return op; |
413 | } |
491 | } |
414 | |
492 | |
415 | /* |
493 | /* |
416 | * Returns the first object which has a name equal to the argument. |
494 | * Returns the first object which has a name equal to the argument. |
… | |
… | |
422 | find_object_name (const char *str) |
500 | find_object_name (const char *str) |
423 | { |
501 | { |
424 | shstr_cmp str_ (str); |
502 | shstr_cmp str_ (str); |
425 | object *op; |
503 | object *op; |
426 | |
504 | |
427 | for (op = objects; op != NULL; op = op->next) |
505 | for (op = object::first; op != NULL; op = op->next) |
428 | if (op->name == str_) |
506 | if (op->name == str_) |
429 | break; |
507 | break; |
430 | |
508 | |
431 | return op; |
509 | return op; |
432 | } |
510 | } |
433 | |
511 | |
434 | void |
512 | void |
435 | free_all_object_data () |
513 | free_all_object_data () |
436 | { |
514 | { |
437 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
515 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
438 | } |
|
|
439 | |
|
|
440 | /* |
|
|
441 | * Returns the object which this object marks as being the owner. |
|
|
442 | * A id-scheme is used to avoid pointing to objects which have been |
|
|
443 | * freed and are now reused. If this is detected, the owner is |
|
|
444 | * set to NULL, and NULL is returned. |
|
|
445 | * Changed 2004-02-12 - if the player is setting at the play again |
|
|
446 | * prompt, he is removed, and we don't want to treat him as an owner of |
|
|
447 | * anything, so check removed flag. I don't expect that this should break |
|
|
448 | * anything - once an object is removed, it is basically dead anyways. |
|
|
449 | */ |
|
|
450 | object * |
|
|
451 | object::get_owner () |
|
|
452 | { |
|
|
453 | if (!owner |
|
|
454 | || QUERY_FLAG (owner, FLAG_FREED) |
|
|
455 | || QUERY_FLAG (owner, FLAG_REMOVED)) |
|
|
456 | owner = 0; |
|
|
457 | |
|
|
458 | return owner; |
|
|
459 | } |
516 | } |
460 | |
517 | |
461 | /* |
518 | /* |
462 | * Sets the owner and sets the skill and exp pointers to owner's current |
519 | * Sets the owner and sets the skill and exp pointers to owner's current |
463 | * skill and experience objects. |
520 | * skill and experience objects. |
… | |
… | |
533 | |
590 | |
534 | /* What is not cleared is next, prev, and count */ |
591 | /* What is not cleared is next, prev, and count */ |
535 | |
592 | |
536 | expmul = 1.0; |
593 | expmul = 1.0; |
537 | face = blank_face; |
594 | face = blank_face; |
538 | attacked_by_count = -1; |
|
|
539 | |
595 | |
540 | if (settings.casting_time) |
596 | if (settings.casting_time) |
541 | casting_time = -1; |
597 | casting_time = -1; |
542 | } |
598 | } |
543 | |
599 | |
… | |
… | |
838 | |
894 | |
839 | if (op->more != NULL) |
895 | if (op->more != NULL) |
840 | update_object (op->more, action); |
896 | update_object (op->more, action); |
841 | } |
897 | } |
842 | |
898 | |
843 | static unordered_vector<object *> mortals; |
899 | object::vector object::mortals; |
844 | static std::vector<object *, slice_allocator <object *> > freed; |
900 | object::vector object::objects; // not yet used |
|
|
901 | object *object::first; |
845 | |
902 | |
846 | void object::free_mortals () |
903 | void object::free_mortals () |
847 | { |
904 | { |
848 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) |
905 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
849 | if ((*i)->refcnt) |
906 | if ((*i)->refcnt) |
850 | ++i; // further delay freeing |
907 | ++i; // further delay freeing |
851 | else |
908 | else |
852 | { |
909 | { |
853 | freed.push_back (*i);//D |
|
|
854 | //delete *i; |
910 | delete *i; |
855 | mortals.erase (i); |
911 | mortals.erase (i); |
856 | } |
912 | } |
857 | |
913 | |
858 | if (mortals.size() && 0)//D |
914 | static int lastmortals = 0;//D |
|
|
915 | |
|
|
916 | if (mortals.size() != lastmortals && lastmortals > 100)//D |
|
|
917 | { |
|
|
918 | lastmortals = mortals.size ();//D |
859 | LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D |
919 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
920 | } |
860 | } |
921 | } |
861 | |
922 | |
862 | object::object () |
923 | object::object () |
863 | { |
924 | { |
864 | SET_FLAG (this, FLAG_REMOVED); |
925 | SET_FLAG (this, FLAG_REMOVED); |
865 | |
926 | |
866 | expmul = 1.0; |
927 | expmul = 1.0; |
867 | face = blank_face; |
928 | face = blank_face; |
868 | attacked_by_count = -1; |
|
|
869 | } |
929 | } |
870 | |
930 | |
871 | object::~object () |
931 | object::~object () |
872 | { |
932 | { |
873 | free_key_values (this); |
933 | free_key_values (this); |
874 | } |
934 | } |
875 | |
935 | |
876 | void object::link () |
936 | void object::link () |
877 | { |
937 | { |
878 | count = ++ob_count; |
938 | count = ++ob_count; |
|
|
939 | uuid = gen_uuid (); |
879 | |
940 | |
880 | prev = 0; |
941 | prev = 0; |
881 | next = objects; |
942 | next = object::first; |
882 | |
943 | |
883 | if (objects) |
944 | if (object::first) |
884 | objects->prev = this; |
945 | object::first->prev = this; |
885 | |
946 | |
886 | objects = this; |
947 | object::first = this; |
887 | } |
948 | } |
888 | |
949 | |
889 | void object::unlink () |
950 | void object::unlink () |
890 | { |
951 | { |
891 | count = 0; |
|
|
892 | |
|
|
893 | if (this == objects) |
952 | if (this == object::first) |
894 | objects = next; |
953 | object::first = next; |
895 | |
954 | |
896 | /* Remove this object from the list of used objects */ |
955 | /* Remove this object from the list of used objects */ |
897 | if (prev) |
|
|
898 | { |
|
|
899 | prev->next = next; |
956 | if (prev) prev->next = next; |
|
|
957 | if (next) next->prev = prev; |
|
|
958 | |
900 | prev = 0; |
959 | prev = 0; |
901 | } |
|
|
902 | |
|
|
903 | if (next) |
|
|
904 | { |
|
|
905 | next->prev = prev; |
|
|
906 | next = 0; |
960 | next = 0; |
907 | } |
|
|
908 | } |
961 | } |
909 | |
962 | |
910 | object *object::create () |
963 | object *object::create () |
911 | { |
964 | { |
912 | object *op; |
|
|
913 | |
|
|
914 | if (freed.empty ()) |
|
|
915 | op = new object; |
965 | object *op = new object; |
916 | else |
|
|
917 | { |
|
|
918 | // highly annoying, but the only way to get it stable right now |
|
|
919 | op = freed.back (); |
|
|
920 | freed.pop_back (); |
|
|
921 | op->~object (); |
|
|
922 | new ((void *) op) object; |
|
|
923 | } |
|
|
924 | |
|
|
925 | op->link (); |
966 | op->link (); |
926 | return op; |
967 | return op; |
927 | } |
968 | } |
928 | |
969 | |
929 | /* |
970 | /* |
… | |
… | |
931 | * it from the list of used objects, and puts it on the list of |
972 | * it from the list of used objects, and puts it on the list of |
932 | * free objects. The IS_FREED() flag is set in the object. |
973 | * free objects. The IS_FREED() flag is set in the object. |
933 | * The object must have been removed by remove_ob() first for |
974 | * The object must have been removed by remove_ob() first for |
934 | * this function to succeed. |
975 | * this function to succeed. |
935 | * |
976 | * |
936 | * If free_inventory is set, free inventory as well. Else drop items in |
977 | * If destroy_inventory is set, free inventory as well. Else drop items in |
937 | * inventory to the ground. |
978 | * inventory to the ground. |
938 | */ |
979 | */ |
939 | void object::free (bool free_inventory) |
980 | void object::destroy (bool destroy_inventory) |
940 | { |
981 | { |
941 | if (QUERY_FLAG (this, FLAG_FREED)) |
982 | if (QUERY_FLAG (this, FLAG_FREED)) |
942 | return; |
983 | return; |
943 | |
984 | |
944 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
985 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
… | |
… | |
949 | |
990 | |
950 | SET_FLAG (this, FLAG_FREED); |
991 | SET_FLAG (this, FLAG_FREED); |
951 | |
992 | |
952 | if (more) |
993 | if (more) |
953 | { |
994 | { |
954 | more->free (free_inventory); |
995 | more->destroy (destroy_inventory); |
955 | more = 0; |
996 | more = 0; |
956 | } |
997 | } |
957 | |
998 | |
958 | if (inv) |
999 | if (inv) |
959 | { |
1000 | { |
960 | /* Only if the space blocks everything do we not process - |
1001 | /* Only if the space blocks everything do we not process - |
961 | * if some form of movement is allowed, let objects |
1002 | * if some form of movement is allowed, let objects |
962 | * drop on that space. |
1003 | * drop on that space. |
963 | */ |
1004 | */ |
964 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
1005 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
965 | { |
1006 | { |
966 | object *op = inv; |
1007 | object *op = inv; |
967 | |
1008 | |
968 | while (op) |
1009 | while (op) |
969 | { |
1010 | { |
970 | object *tmp = op->below; |
1011 | object *tmp = op->below; |
971 | op->free (free_inventory); |
1012 | op->destroy (destroy_inventory); |
972 | op = tmp; |
1013 | op = tmp; |
973 | } |
1014 | } |
974 | } |
1015 | } |
975 | else |
1016 | else |
976 | { /* Put objects in inventory onto this space */ |
1017 | { /* Put objects in inventory onto this space */ |
… | |
… | |
995 | op = tmp; |
1036 | op = tmp; |
996 | } |
1037 | } |
997 | } |
1038 | } |
998 | } |
1039 | } |
999 | |
1040 | |
|
|
1041 | // clear those pointers that likely might have circular references to us |
1000 | owner = 0; |
1042 | owner = 0; |
|
|
1043 | enemy = 0; |
|
|
1044 | attacked_by = 0; |
|
|
1045 | |
|
|
1046 | // only relevant for players(?), but make sure of it anyways |
|
|
1047 | contr = 0; |
1001 | |
1048 | |
1002 | /* Remove object from the active list */ |
1049 | /* Remove object from the active list */ |
1003 | speed = 0; |
1050 | speed = 0; |
1004 | update_ob_speed (this); |
1051 | update_ob_speed (this); |
1005 | |
1052 | |
… | |
… | |
1017 | sub_weight (object *op, signed long weight) |
1064 | sub_weight (object *op, signed long weight) |
1018 | { |
1065 | { |
1019 | while (op != NULL) |
1066 | while (op != NULL) |
1020 | { |
1067 | { |
1021 | if (op->type == CONTAINER) |
1068 | if (op->type == CONTAINER) |
1022 | { |
|
|
1023 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1069 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1024 | } |
1070 | |
1025 | op->carrying -= weight; |
1071 | op->carrying -= weight; |
1026 | op = op->env; |
1072 | op = op->env; |
1027 | } |
1073 | } |
1028 | } |
1074 | } |
1029 | |
1075 | |
… | |
… | |
1037 | */ |
1083 | */ |
1038 | |
1084 | |
1039 | void |
1085 | void |
1040 | remove_ob (object *op) |
1086 | remove_ob (object *op) |
1041 | { |
1087 | { |
|
|
1088 | object *tmp, *last = 0; |
1042 | object * |
1089 | object *otmp; |
1043 | tmp, * |
|
|
1044 | last = NULL; |
|
|
1045 | object * |
|
|
1046 | otmp; |
|
|
1047 | |
1090 | |
1048 | tag_t |
|
|
1049 | tag; |
|
|
1050 | int |
|
|
1051 | check_walk_off; |
1091 | int check_walk_off; |
1052 | mapstruct * |
1092 | maptile *m; |
1053 | m; |
|
|
1054 | |
1093 | |
1055 | sint16 |
1094 | sint16 x, y; |
1056 | x, |
|
|
1057 | y; |
|
|
1058 | |
1095 | |
1059 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1096 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1060 | return; |
1097 | return; |
1061 | |
1098 | |
1062 | SET_FLAG (op, FLAG_REMOVED); |
1099 | SET_FLAG (op, FLAG_REMOVED); |
… | |
… | |
1155 | op->below = 0; |
1192 | op->below = 0; |
1156 | |
1193 | |
1157 | if (op->map->in_memory == MAP_SAVING) |
1194 | if (op->map->in_memory == MAP_SAVING) |
1158 | return; |
1195 | return; |
1159 | |
1196 | |
1160 | tag = op->count; |
|
|
1161 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1197 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1162 | |
1198 | |
1163 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1199 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1164 | { |
1200 | { |
1165 | /* No point updating the players look faces if he is the object |
1201 | /* No point updating the players look faces if he is the object |
… | |
… | |
1180 | |
1216 | |
1181 | tmp->contr->socket.update_look = 1; |
1217 | tmp->contr->socket.update_look = 1; |
1182 | } |
1218 | } |
1183 | |
1219 | |
1184 | /* See if player moving off should effect something */ |
1220 | /* See if player moving off should effect something */ |
1185 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1221 | if (check_walk_off |
|
|
1222 | && ((op->move_type & tmp->move_off) |
|
|
1223 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1186 | { |
1224 | { |
1187 | move_apply (tmp, op, NULL); |
1225 | move_apply (tmp, op, NULL); |
1188 | |
1226 | |
1189 | if (was_destroyed (op, tag)) |
1227 | if (op->destroyed ()) |
1190 | { |
|
|
1191 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1228 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1192 | } |
|
|
1193 | } |
1229 | } |
1194 | |
1230 | |
1195 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1231 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1196 | |
1232 | |
1197 | if (tmp->above == tmp) |
1233 | if (tmp->above == tmp) |
… | |
… | |
1250 | free_object (op); |
1286 | free_object (op); |
1251 | return top; |
1287 | return top; |
1252 | } |
1288 | } |
1253 | } |
1289 | } |
1254 | |
1290 | |
1255 | return NULL; |
1291 | return 0; |
1256 | } |
1292 | } |
1257 | |
1293 | |
1258 | /* |
1294 | /* |
1259 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1295 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1260 | * job preparing multi-part monsters |
1296 | * job preparing multi-part monsters |
1261 | */ |
1297 | */ |
1262 | object * |
1298 | object * |
1263 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1299 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1264 | { |
1300 | { |
1265 | object *tmp; |
1301 | object *tmp; |
1266 | |
1302 | |
1267 | if (op->head) |
1303 | if (op->head) |
1268 | op = op->head; |
1304 | op = op->head; |
… | |
… | |
1296 | * NULL if 'op' was destroyed |
1332 | * NULL if 'op' was destroyed |
1297 | * just 'op' otherwise |
1333 | * just 'op' otherwise |
1298 | */ |
1334 | */ |
1299 | |
1335 | |
1300 | object * |
1336 | object * |
1301 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1337 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1302 | { |
1338 | { |
1303 | object *tmp, *top, *floor = NULL; |
1339 | object *tmp, *top, *floor = NULL; |
1304 | sint16 x, y; |
1340 | sint16 x, y; |
1305 | |
1341 | |
1306 | if (QUERY_FLAG (op, FLAG_FREED)) |
1342 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1587 | remove_ob (tmp); |
1623 | remove_ob (tmp); |
1588 | free_object (tmp); |
1624 | free_object (tmp); |
1589 | } |
1625 | } |
1590 | } |
1626 | } |
1591 | |
1627 | |
1592 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1628 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1593 | |
1629 | |
1594 | tmp1->x = op->x; |
1630 | tmp1->x = op->x; |
1595 | tmp1->y = op->y; |
1631 | tmp1->y = op->y; |
1596 | insert_ob_in_map (tmp1, op->map, op, 0); |
1632 | insert_ob_in_map (tmp1, op->map, op, 0); |
1597 | } |
1633 | } |
… | |
… | |
1896 | */ |
1932 | */ |
1897 | |
1933 | |
1898 | int |
1934 | int |
1899 | check_move_on (object *op, object *originator) |
1935 | check_move_on (object *op, object *originator) |
1900 | { |
1936 | { |
1901 | object * |
1937 | object *tmp; |
1902 | tmp; |
1938 | maptile *m = op->map; |
1903 | tag_t |
|
|
1904 | tag; |
|
|
1905 | mapstruct * |
|
|
1906 | m = op->map; |
|
|
1907 | int |
|
|
1908 | x = op->x, y = op->y; |
1939 | int x = op->x, y = op->y; |
1909 | |
1940 | |
1910 | MoveType |
1941 | MoveType move_on, move_slow, move_block; |
1911 | move_on, |
|
|
1912 | move_slow, |
|
|
1913 | move_block; |
|
|
1914 | |
1942 | |
1915 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1943 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1916 | return 0; |
1944 | return 0; |
1917 | |
|
|
1918 | tag = op->count; |
|
|
1919 | |
1945 | |
1920 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1946 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1921 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1947 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1922 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1948 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1923 | |
1949 | |
… | |
… | |
1984 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2010 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1985 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
2011 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1986 | { |
2012 | { |
1987 | move_apply (tmp, op, originator); |
2013 | move_apply (tmp, op, originator); |
1988 | |
2014 | |
1989 | if (was_destroyed (op, tag)) |
2015 | if (op->destroyed ()) |
1990 | return 1; |
2016 | return 1; |
1991 | |
2017 | |
1992 | /* what the person/creature stepped onto has moved the object |
2018 | /* what the person/creature stepped onto has moved the object |
1993 | * someplace new. Don't process any further - if we did, |
2019 | * someplace new. Don't process any further - if we did, |
1994 | * have a feeling strange problems would result. |
2020 | * have a feeling strange problems would result. |
… | |
… | |
2006 | * a matching archetype at the given map and coordinates. |
2032 | * a matching archetype at the given map and coordinates. |
2007 | * The first matching object is returned, or NULL if none. |
2033 | * The first matching object is returned, or NULL if none. |
2008 | */ |
2034 | */ |
2009 | |
2035 | |
2010 | object * |
2036 | object * |
2011 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
2037 | present_arch (const archetype *at, maptile *m, int x, int y) |
2012 | { |
2038 | { |
2013 | object * |
2039 | object * |
2014 | tmp; |
2040 | tmp; |
2015 | |
2041 | |
2016 | if (m == NULL || out_of_map (m, x, y)) |
2042 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2029 | * a matching type variable at the given map and coordinates. |
2055 | * a matching type variable at the given map and coordinates. |
2030 | * The first matching object is returned, or NULL if none. |
2056 | * The first matching object is returned, or NULL if none. |
2031 | */ |
2057 | */ |
2032 | |
2058 | |
2033 | object * |
2059 | object * |
2034 | present (unsigned char type, mapstruct *m, int x, int y) |
2060 | present (unsigned char type, maptile *m, int x, int y) |
2035 | { |
2061 | { |
2036 | object * |
2062 | object * |
2037 | tmp; |
2063 | tmp; |
2038 | |
2064 | |
2039 | if (out_of_map (m, x, y)) |
2065 | if (out_of_map (m, x, y)) |
… | |
… | |
2179 | * the archetype because that isn't correct if the monster has been |
2205 | * the archetype because that isn't correct if the monster has been |
2180 | * customized, changed states, etc. |
2206 | * customized, changed states, etc. |
2181 | */ |
2207 | */ |
2182 | |
2208 | |
2183 | int |
2209 | int |
2184 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2210 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2185 | { |
2211 | { |
2186 | int |
2212 | int |
2187 | i, |
2213 | i, |
2188 | index = 0, flag; |
2214 | index = 0, flag; |
2189 | static int |
2215 | static int |
… | |
… | |
2210 | return -1; |
2236 | return -1; |
2211 | return altern[RANDOM () % index]; |
2237 | return altern[RANDOM () % index]; |
2212 | } |
2238 | } |
2213 | |
2239 | |
2214 | /* |
2240 | /* |
2215 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2241 | * find_first_free_spot(archetype, maptile, x, y) works like |
2216 | * find_free_spot(), but it will search max number of squares. |
2242 | * find_free_spot(), but it will search max number of squares. |
2217 | * But it will return the first available spot, not a random choice. |
2243 | * But it will return the first available spot, not a random choice. |
2218 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2244 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2219 | */ |
2245 | */ |
2220 | |
2246 | |
2221 | int |
2247 | int |
2222 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2248 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2223 | { |
2249 | { |
2224 | int |
2250 | int |
2225 | i; |
2251 | i; |
2226 | |
2252 | |
2227 | for (i = 0; i < SIZEOFFREE; i++) |
2253 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2291 | * because we have to know what movement the thing looking to move |
2317 | * because we have to know what movement the thing looking to move |
2292 | * there is capable of. |
2318 | * there is capable of. |
2293 | */ |
2319 | */ |
2294 | |
2320 | |
2295 | int |
2321 | int |
2296 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2322 | find_dir (maptile *m, int x, int y, object *exclude) |
2297 | { |
2323 | { |
2298 | int |
2324 | int |
2299 | i, |
2325 | i, |
2300 | max = SIZEOFFREE, mflags; |
2326 | max = SIZEOFFREE, mflags; |
2301 | |
2327 | |
2302 | sint16 nx, ny; |
2328 | sint16 nx, ny; |
2303 | object * |
2329 | object * |
2304 | tmp; |
2330 | tmp; |
2305 | mapstruct * |
2331 | maptile * |
2306 | mp; |
2332 | mp; |
2307 | |
2333 | |
2308 | MoveType blocked, move_type; |
2334 | MoveType blocked, move_type; |
2309 | |
2335 | |
2310 | if (exclude && exclude->head) |
2336 | if (exclude && exclude->head) |
… | |
… | |
2518 | * Modified to be map tile aware -.MSW |
2544 | * Modified to be map tile aware -.MSW |
2519 | */ |
2545 | */ |
2520 | |
2546 | |
2521 | |
2547 | |
2522 | int |
2548 | int |
2523 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2549 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2524 | { |
2550 | { |
2525 | sint16 dx, dy; |
2551 | sint16 dx, dy; |
2526 | int |
2552 | int |
2527 | mflags; |
2553 | mflags; |
2528 | |
2554 | |
… | |
… | |
2608 | if (prev) |
2634 | if (prev) |
2609 | prev->more = tmp; |
2635 | prev->more = tmp; |
2610 | prev = tmp; |
2636 | prev = tmp; |
2611 | } |
2637 | } |
2612 | |
2638 | |
2613 | /*** copy inventory ***/ |
|
|
2614 | for (item = src->inv; item; item = item->below) |
2639 | for (item = src->inv; item; item = item->below) |
2615 | { |
|
|
2616 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2640 | insert_ob_in_ob (object_create_clone (item), dst); |
2617 | } |
|
|
2618 | |
2641 | |
2619 | return dst; |
2642 | return dst; |
2620 | } |
2643 | } |
2621 | |
2644 | |
2622 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2623 | int |
|
|
2624 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2625 | { |
|
|
2626 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2627 | * robust */ |
|
|
2628 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2629 | } |
|
|
2630 | |
|
|
2631 | /* GROS - Creates an object using a string representing its content. */ |
2645 | /* GROS - Creates an object using a string representing its content. */ |
2632 | |
|
|
2633 | /* Basically, we save the content of the string to a temp file, then call */ |
2646 | /* Basically, we save the content of the string to a temp file, then call */ |
2634 | |
|
|
2635 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2647 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2636 | |
|
|
2637 | /* but it was simple to make and allows reusing the load_object function. */ |
2648 | /* but it was simple to make and allows reusing the load_object function. */ |
2638 | |
|
|
2639 | /* Remember not to use load_object_str in a time-critical situation. */ |
2649 | /* Remember not to use load_object_str in a time-critical situation. */ |
2640 | |
|
|
2641 | /* Also remember that multiparts objects are not supported for now. */ |
2650 | /* Also remember that multiparts objects are not supported for now. */ |
2642 | |
2651 | |
2643 | object * |
2652 | object * |
2644 | load_object_str (const char *obstr) |
2653 | load_object_str (const char *obstr) |
2645 | { |
2654 | { |
2646 | object * |
2655 | object *op; |
2647 | op; |
|
|
2648 | char |
|
|
2649 | filename[MAX_BUF]; |
2656 | char filename[MAX_BUF]; |
2650 | |
2657 | |
2651 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2658 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2652 | |
2659 | |
2653 | FILE * |
|
|
2654 | tempfile = fopen (filename, "w"); |
2660 | FILE *tempfile = fopen (filename, "w"); |
2655 | |
2661 | |
2656 | if (tempfile == NULL) |
2662 | if (tempfile == NULL) |
2657 | { |
2663 | { |
2658 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2664 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2659 | return NULL; |
2665 | return NULL; |
2660 | }; |
2666 | } |
|
|
2667 | |
2661 | fprintf (tempfile, obstr); |
2668 | fprintf (tempfile, obstr); |
2662 | fclose (tempfile); |
2669 | fclose (tempfile); |
2663 | |
2670 | |
2664 | op = get_object (); |
2671 | op = get_object (); |
2665 | |
2672 | |
… | |
… | |
2679 | * returns NULL if no match. |
2686 | * returns NULL if no match. |
2680 | */ |
2687 | */ |
2681 | object * |
2688 | object * |
2682 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2689 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2683 | { |
2690 | { |
2684 | object * |
2691 | object *tmp; |
2685 | tmp; |
|
|
2686 | |
2692 | |
2687 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2693 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2688 | if (tmp->type == type && tmp->subtype == subtype) |
2694 | if (tmp->type == type && tmp->subtype == subtype) |
2689 | return tmp; |
2695 | return tmp; |
2690 | |
2696 | |
… | |
… | |
2698 | * do the desired thing. |
2704 | * do the desired thing. |
2699 | */ |
2705 | */ |
2700 | key_value * |
2706 | key_value * |
2701 | get_ob_key_link (const object *ob, const char *key) |
2707 | get_ob_key_link (const object *ob, const char *key) |
2702 | { |
2708 | { |
2703 | key_value * |
2709 | key_value *link; |
2704 | link; |
|
|
2705 | |
2710 | |
2706 | for (link = ob->key_values; link != NULL; link = link->next) |
2711 | for (link = ob->key_values; link != NULL; link = link->next) |
2707 | { |
|
|
2708 | if (link->key == key) |
2712 | if (link->key == key) |
2709 | { |
|
|
2710 | return link; |
2713 | return link; |
2711 | } |
|
|
2712 | } |
|
|
2713 | |
2714 | |
2714 | return NULL; |
2715 | return NULL; |
2715 | } |
2716 | } |
2716 | |
2717 | |
2717 | /* |
2718 | /* |