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. */ |
… | |
… | |
105 | _exit (1); |
104 | _exit (1); |
106 | } |
105 | } |
107 | |
106 | |
108 | uuid.seq = uid; |
107 | uuid.seq = uid; |
109 | write_uuid (); |
108 | write_uuid (); |
110 | LOG (llevDebug, "read UID: %lld\n", uid); |
109 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
111 | fclose (fp); |
110 | fclose (fp); |
112 | } |
111 | } |
113 | |
112 | |
114 | UUID |
113 | UUID |
115 | gen_uuid () |
114 | gen_uuid () |
… | |
… | |
375 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
374 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
376 | * Some error messages. |
375 | * Some error messages. |
377 | * 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. |
378 | */ |
377 | */ |
379 | |
378 | |
380 | void |
379 | char * |
381 | dump_object2 (object *op) |
|
|
382 | { |
|
|
383 | errmsg[0] = 0; |
|
|
384 | return; |
|
|
385 | //TODO//D#d# |
|
|
386 | #if 0 |
|
|
387 | char *cp; |
|
|
388 | |
|
|
389 | /* object *tmp;*/ |
|
|
390 | |
|
|
391 | if (op->arch != NULL) |
|
|
392 | { |
|
|
393 | strcat (errmsg, "arch "); |
|
|
394 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
395 | strcat (errmsg, "\n"); |
|
|
396 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
397 | strcat (errmsg, cp); |
|
|
398 | # if 0 |
|
|
399 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
400 | * will overflow the buffer. |
|
|
401 | * Changed so that we don't dump inventory either. This may |
|
|
402 | * also overflow the buffer. |
|
|
403 | */ |
|
|
404 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
405 | strcat (errmsg, cp); |
|
|
406 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
407 | dump_object2 (tmp); |
|
|
408 | # endif |
|
|
409 | strcat (errmsg, "end\n"); |
|
|
410 | } |
|
|
411 | else |
|
|
412 | { |
|
|
413 | strcat (errmsg, "Object "); |
|
|
414 | if (op->name == NULL) |
|
|
415 | strcat (errmsg, "(null)"); |
|
|
416 | else |
|
|
417 | strcat (errmsg, op->name); |
|
|
418 | strcat (errmsg, "\n"); |
|
|
419 | # if 0 |
|
|
420 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
421 | strcat (errmsg, cp); |
|
|
422 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
423 | dump_object2 (tmp); |
|
|
424 | # endif |
|
|
425 | strcat (errmsg, "end\n"); |
|
|
426 | } |
|
|
427 | #endif |
|
|
428 | } |
|
|
429 | |
|
|
430 | /* |
|
|
431 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
432 | */ |
|
|
433 | |
|
|
434 | void |
|
|
435 | dump_object (object *op) |
380 | dump_object (object *op) |
436 | { |
381 | { |
437 | if (op == NULL) |
382 | if (!op) |
438 | { |
383 | return strdup ("[NULLOBJ]"); |
439 | strcpy (errmsg, "[NULL pointer]"); |
|
|
440 | return; |
|
|
441 | } |
|
|
442 | errmsg[0] = '\0'; |
|
|
443 | dump_object2 (op); |
|
|
444 | } |
|
|
445 | |
384 | |
446 | void |
385 | object_freezer freezer; |
447 | dump_all_objects (void) |
386 | save_object (freezer, op, 3); |
448 | { |
387 | return freezer.as_string (); |
449 | object *op; |
|
|
450 | |
|
|
451 | for (op = object::first; op != NULL; op = op->next) |
|
|
452 | { |
|
|
453 | dump_object (op); |
|
|
454 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
|
|
455 | } |
|
|
456 | } |
388 | } |
457 | |
389 | |
458 | /* |
390 | /* |
459 | * 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 |
460 | * multi-object 1 which is closest to the second object. |
392 | * multi-object 1 which is closest to the second object. |
… | |
… | |
480 | */ |
412 | */ |
481 | |
413 | |
482 | object * |
414 | object * |
483 | find_object (tag_t i) |
415 | find_object (tag_t i) |
484 | { |
416 | { |
485 | object *op; |
|
|
486 | |
|
|
487 | for (op = object::first; op != NULL; op = op->next) |
417 | for (object *op = object::first; op; op = op->next) |
488 | if (op->count == i) |
418 | if (op->count == i) |
489 | break; |
419 | return op; |
|
|
420 | |
490 | return op; |
421 | return 0; |
491 | } |
422 | } |
492 | |
423 | |
493 | /* |
424 | /* |
494 | * 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. |
495 | * Used only by the patch command, but not all that useful. |
426 | * Used only by the patch command, but not all that useful. |
… | |
… | |
622 | |
553 | |
623 | op2->clone (op); |
554 | op2->clone (op); |
624 | |
555 | |
625 | if (is_freed) |
556 | if (is_freed) |
626 | SET_FLAG (op, FLAG_FREED); |
557 | SET_FLAG (op, FLAG_FREED); |
|
|
558 | |
627 | if (is_removed) |
559 | if (is_removed) |
628 | SET_FLAG (op, FLAG_REMOVED); |
560 | SET_FLAG (op, FLAG_REMOVED); |
629 | |
561 | |
630 | if (op2->speed < 0) |
562 | if (op2->speed < 0) |
631 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
563 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
… | |
… | |
873 | update_now = 1; |
805 | update_now = 1; |
874 | |
806 | |
875 | if ((move_slow | op->move_slow) != move_slow) |
807 | if ((move_slow | op->move_slow) != move_slow) |
876 | update_now = 1; |
808 | update_now = 1; |
877 | } |
809 | } |
|
|
810 | |
878 | /* if the object is being removed, we can't make intelligent |
811 | /* if the object is being removed, we can't make intelligent |
879 | * decisions, because remove_ob can't really pass the object |
812 | * decisions, because remove_ob can't really pass the object |
880 | * that is being removed. |
813 | * that is being removed. |
881 | */ |
814 | */ |
882 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
815 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
908 | else |
841 | else |
909 | { |
842 | { |
910 | delete *i; |
843 | delete *i; |
911 | mortals.erase (i); |
844 | mortals.erase (i); |
912 | } |
845 | } |
913 | |
|
|
914 | static int lastmortals = 0;//D |
|
|
915 | |
|
|
916 | if (mortals.size() != lastmortals)//D |
|
|
917 | { |
|
|
918 | lastmortals = mortals.size ();//D |
|
|
919 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
920 | } |
|
|
921 | } |
846 | } |
922 | |
847 | |
923 | object::object () |
848 | object::object () |
924 | { |
849 | { |
925 | SET_FLAG (this, FLAG_REMOVED); |
850 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
947 | object::first = this; |
872 | object::first = this; |
948 | } |
873 | } |
949 | |
874 | |
950 | void object::unlink () |
875 | void object::unlink () |
951 | { |
876 | { |
952 | //count = 0;//D |
|
|
953 | if (!prev && !next) return;//D |
|
|
954 | |
|
|
955 | if (this == object::first) |
877 | if (this == object::first) |
956 | object::first = next; |
878 | object::first = next; |
957 | |
879 | |
958 | /* Remove this object from the list of used objects */ |
880 | /* Remove this object from the list of used objects */ |
959 | if (prev) prev->next = next; |
881 | if (prev) prev->next = next; |
… | |
… | |
975 | * 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 |
976 | * free objects. The IS_FREED() flag is set in the object. |
898 | * free objects. The IS_FREED() flag is set in the object. |
977 | * The object must have been removed by remove_ob() first for |
899 | * The object must have been removed by remove_ob() first for |
978 | * this function to succeed. |
900 | * this function to succeed. |
979 | * |
901 | * |
980 | * 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 |
981 | * inventory to the ground. |
903 | * inventory to the ground. |
982 | */ |
904 | */ |
983 | void object::free (bool free_inventory) |
905 | void object::destroy (bool destroy_inventory) |
984 | { |
906 | { |
985 | if (QUERY_FLAG (this, FLAG_FREED)) |
907 | if (QUERY_FLAG (this, FLAG_FREED)) |
986 | return; |
908 | return; |
987 | |
909 | |
988 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
910 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
… | |
… | |
993 | |
915 | |
994 | SET_FLAG (this, FLAG_FREED); |
916 | SET_FLAG (this, FLAG_FREED); |
995 | |
917 | |
996 | if (more) |
918 | if (more) |
997 | { |
919 | { |
998 | more->free (free_inventory); |
920 | more->destroy (destroy_inventory); |
999 | more = 0; |
921 | more = 0; |
1000 | } |
922 | } |
1001 | |
923 | |
1002 | if (inv) |
924 | if (inv) |
1003 | { |
925 | { |
1004 | /* Only if the space blocks everything do we not process - |
926 | /* Only if the space blocks everything do we not process - |
1005 | * if some form of movement is allowed, let objects |
927 | * if some form of movement is allowed, let objects |
1006 | * drop on that space. |
928 | * drop on that space. |
1007 | */ |
929 | */ |
1008 | 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) |
1009 | { |
931 | { |
1010 | object *op = inv; |
932 | object *op = inv; |
1011 | |
933 | |
1012 | while (op) |
934 | while (op) |
1013 | { |
935 | { |
1014 | object *tmp = op->below; |
936 | object *tmp = op->below; |
1015 | op->free (free_inventory); |
937 | op->destroy (destroy_inventory); |
1016 | op = tmp; |
938 | op = tmp; |
1017 | } |
939 | } |
1018 | } |
940 | } |
1019 | else |
941 | else |
1020 | { /* Put objects in inventory onto this space */ |
942 | { /* Put objects in inventory onto this space */ |
… | |
… | |
1039 | op = tmp; |
961 | op = tmp; |
1040 | } |
962 | } |
1041 | } |
963 | } |
1042 | } |
964 | } |
1043 | |
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 | |
1044 | // clear those pointers that likely might have circular references to us |
986 | // clear those pointers that likely might have circular references to us |
1045 | owner = 0; |
987 | owner = 0; |
1046 | enemy = 0; |
988 | enemy = 0; |
1047 | attacked_by = 0; |
989 | attacked_by = 0; |
1048 | |
990 | |
|
|
991 | // only relevant for players(?), but make sure of it anyways |
|
|
992 | contr = 0; |
|
|
993 | |
1049 | /* Remove object from the active list */ |
994 | /* Remove object from the active list */ |
1050 | speed = 0; |
995 | speed = 0; |
1051 | update_ob_speed (this); |
996 | update_ob_speed (this); |
1052 | |
997 | |
1053 | unlink (); |
998 | unlink (); |
… | |
… | |
1057 | |
1002 | |
1058 | /* |
1003 | /* |
1059 | * sub_weight() recursively (outwards) subtracts a number from the |
1004 | * sub_weight() recursively (outwards) subtracts a number from the |
1060 | * 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)). |
1061 | */ |
1006 | */ |
1062 | |
|
|
1063 | void |
1007 | void |
1064 | sub_weight (object *op, signed long weight) |
1008 | sub_weight (object *op, signed long weight) |
1065 | { |
1009 | { |
1066 | while (op != NULL) |
1010 | while (op != NULL) |
1067 | { |
1011 | { |
… | |
… | |
1079 | * object will have no environment. If the object previously had an |
1023 | * object will have no environment. If the object previously had an |
1080 | * environment, the x and y coordinates will be updated to |
1024 | * environment, the x and y coordinates will be updated to |
1081 | * the previous environment. |
1025 | * the previous environment. |
1082 | * Beware: This function is called from the editor as well! |
1026 | * Beware: This function is called from the editor as well! |
1083 | */ |
1027 | */ |
1084 | |
|
|
1085 | void |
1028 | void |
1086 | remove_ob (object *op) |
1029 | object::remove () |
1087 | { |
1030 | { |
1088 | object *tmp, *last = 0; |
1031 | object *tmp, *last = 0; |
1089 | object *otmp; |
1032 | object *otmp; |
1090 | |
1033 | |
1091 | tag_t tag; |
|
|
1092 | int check_walk_off; |
1034 | int check_walk_off; |
1093 | mapstruct *m; |
|
|
1094 | |
1035 | |
1095 | sint16 x, y; |
|
|
1096 | |
|
|
1097 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1036 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1098 | return; |
1037 | return; |
1099 | |
1038 | |
1100 | SET_FLAG (op, FLAG_REMOVED); |
1039 | SET_FLAG (this, FLAG_REMOVED); |
1101 | |
1040 | |
1102 | if (op->more != NULL) |
1041 | if (more) |
1103 | remove_ob (op->more); |
1042 | more->remove (); |
1104 | |
1043 | |
1105 | /* |
1044 | /* |
1106 | * In this case, the object to be removed is in someones |
1045 | * In this case, the object to be removed is in someones |
1107 | * inventory. |
1046 | * inventory. |
1108 | */ |
1047 | */ |
1109 | if (op->env != NULL) |
1048 | if (env) |
1110 | { |
1049 | { |
1111 | if (op->nrof) |
1050 | if (nrof) |
1112 | sub_weight (op->env, op->weight * op->nrof); |
1051 | sub_weight (env, weight * nrof); |
1113 | else |
1052 | else |
1114 | sub_weight (op->env, op->weight + op->carrying); |
1053 | sub_weight (env, weight + carrying); |
1115 | |
1054 | |
1116 | /* 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 |
1117 | * made to players inventory. If set, avoiding the call |
1056 | * made to players inventory. If set, avoiding the call |
1118 | * to save cpu time. |
1057 | * to save cpu time. |
1119 | */ |
1058 | */ |
1120 | 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)) |
1121 | fix_player (otmp); |
1060 | fix_player (otmp); |
1122 | |
1061 | |
1123 | if (op->above != NULL) |
1062 | if (above != NULL) |
1124 | op->above->below = op->below; |
1063 | above->below = below; |
1125 | else |
1064 | else |
1126 | op->env->inv = op->below; |
1065 | env->inv = below; |
1127 | |
1066 | |
1128 | if (op->below != NULL) |
1067 | if (below != NULL) |
1129 | op->below->above = op->above; |
1068 | below->above = above; |
1130 | |
1069 | |
1131 | /* we set up values so that it could be inserted into |
1070 | /* we set up values so that it could be inserted into |
1132 | * 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 |
1133 | * to the caller to decide what we want to do. |
1072 | * to the caller to decide what we want to do. |
1134 | */ |
1073 | */ |
1135 | op->x = op->env->x, op->y = op->env->y; |
1074 | x = env->x, y = env->y; |
1136 | op->map = op->env->map; |
1075 | map = env->map; |
1137 | op->above = NULL, op->below = NULL; |
1076 | above = 0, below = 0; |
1138 | op->env = NULL; |
1077 | env = 0; |
1139 | } |
1078 | } |
1140 | else if (op->map) |
1079 | else if (map) |
1141 | { |
1080 | { |
1142 | x = op->x; |
|
|
1143 | y = op->y; |
|
|
1144 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1145 | |
|
|
1146 | if (!m) |
|
|
1147 | { |
|
|
1148 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1149 | op->map->path, op->x, op->y); |
|
|
1150 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1151 | * it seems if we get into this case, something is probablye |
|
|
1152 | * screwed up and should be fixed. |
|
|
1153 | */ |
|
|
1154 | abort (); |
|
|
1155 | } |
|
|
1156 | |
|
|
1157 | if (op->map != m) |
|
|
1158 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1159 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1160 | |
|
|
1161 | /* 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 |
1162 | * lots of logic for things we no longer care about |
1082 | * lots of logic for things we no longer care about |
1163 | */ |
1083 | */ |
1164 | |
1084 | |
1165 | /* link the object above us */ |
1085 | /* link the object above us */ |
1166 | if (op->above) |
1086 | if (above) |
1167 | op->above->below = op->below; |
1087 | above->below = below; |
1168 | else |
1088 | else |
1169 | 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 */ |
1170 | |
1090 | |
1171 | /* Relink the object below us, if there is one */ |
1091 | /* Relink the object below us, if there is one */ |
1172 | if (op->below) |
1092 | if (below) |
1173 | op->below->above = op->above; |
1093 | below->above = above; |
1174 | else |
1094 | else |
1175 | { |
1095 | { |
1176 | /* 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 |
1177 | * use translated coordinates in case some oddness with map tiling is |
1097 | * use translated coordinates in case some oddness with map tiling is |
1178 | * evident |
1098 | * evident |
1179 | */ |
1099 | */ |
1180 | if (GET_MAP_OB (m, x, y) != op) |
1100 | if (GET_MAP_OB (map, x, y) != this) |
1181 | { |
1101 | { |
1182 | dump_object (op); |
1102 | char *dump = dump_object (this); |
1183 | LOG (llevError, |
1103 | LOG (llevError, |
1184 | "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); |
1185 | dump_object (GET_MAP_OB (m, x, y)); |
1106 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1186 | LOG (llevError, "%s\n", errmsg); |
1107 | LOG (llevError, "%s\n", dump); |
|
|
1108 | free (dump); |
1187 | } |
1109 | } |
1188 | |
1110 | |
1189 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1111 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1190 | } |
1112 | } |
1191 | |
1113 | |
1192 | op->above = 0; |
1114 | above = 0; |
1193 | op->below = 0; |
1115 | below = 0; |
1194 | |
1116 | |
1195 | if (op->map->in_memory == MAP_SAVING) |
1117 | if (map->in_memory == MAP_SAVING) |
1196 | return; |
1118 | return; |
1197 | |
1119 | |
1198 | tag = op->count; |
|
|
1199 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1120 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1200 | |
1121 | |
1201 | 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) |
1202 | { |
1123 | { |
1203 | /* 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 |
1204 | * being removed. |
1125 | * being removed. |
1205 | */ |
1126 | */ |
1206 | |
1127 | |
1207 | if (tmp->type == PLAYER && tmp != op) |
1128 | if (tmp->type == PLAYER && tmp != this) |
1208 | { |
1129 | { |
1209 | /* If a container that the player is currently using somehow gets |
1130 | /* If a container that the player is currently using somehow gets |
1210 | * removed (most likely destroyed), update the player view |
1131 | * removed (most likely destroyed), update the player view |
1211 | * appropriately. |
1132 | * appropriately. |
1212 | */ |
1133 | */ |
1213 | if (tmp->container == op) |
1134 | if (tmp->container == this) |
1214 | { |
1135 | { |
1215 | CLEAR_FLAG (op, FLAG_APPLIED); |
1136 | CLEAR_FLAG (this, FLAG_APPLIED); |
1216 | tmp->container = NULL; |
1137 | tmp->container = 0; |
1217 | } |
1138 | } |
1218 | |
1139 | |
1219 | tmp->contr->socket.update_look = 1; |
1140 | tmp->contr->socket.update_look = 1; |
1220 | } |
1141 | } |
1221 | |
1142 | |
1222 | /* See if player moving off should effect something */ |
1143 | /* See if player moving off should effect something */ |
1223 | 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)) |
1224 | { |
1147 | { |
1225 | move_apply (tmp, op, NULL); |
1148 | move_apply (tmp, this, 0); |
1226 | |
1149 | |
1227 | if (was_destroyed (op, tag)) |
1150 | if (destroyed ()) |
1228 | { |
|
|
1229 | 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 ()); |
1230 | } |
|
|
1231 | } |
1152 | } |
1232 | |
1153 | |
1233 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1154 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1234 | |
1155 | |
1235 | if (tmp->above == tmp) |
1156 | if (tmp->above == tmp) |
1236 | tmp->above = NULL; |
1157 | tmp->above = 0; |
1237 | |
1158 | |
1238 | last = tmp; |
1159 | last = tmp; |
1239 | } |
1160 | } |
1240 | |
1161 | |
1241 | /* last == NULL of there are no objects on this space */ |
1162 | /* last == NULL of there are no objects on this space */ |
1242 | if (last == NULL) |
1163 | if (!last) |
1243 | { |
1164 | { |
1244 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1165 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1245 | * 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 |
1246 | * 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 |
1247 | * be correct anyways. |
1168 | * be correct anyways. |
1248 | */ |
1169 | */ |
1249 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1170 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1250 | update_position (op->map, op->x, op->y); |
1171 | update_position (map, x, y); |
1251 | } |
1172 | } |
1252 | else |
1173 | else |
1253 | update_object (last, UP_OBJ_REMOVE); |
1174 | update_object (last, UP_OBJ_REMOVE); |
1254 | |
1175 | |
1255 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1176 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1256 | update_all_los (op->map, op->x, op->y); |
1177 | update_all_los (map, x, y); |
1257 | } |
1178 | } |
1258 | } |
1179 | } |
1259 | |
1180 | |
1260 | /* |
1181 | /* |
1261 | * merge_ob(op,top): |
1182 | * merge_ob(op,top): |
… | |
… | |
1296 | /* |
1217 | /* |
1297 | * 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 |
1298 | * job preparing multi-part monsters |
1219 | * job preparing multi-part monsters |
1299 | */ |
1220 | */ |
1300 | object * |
1221 | object * |
1301 | 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) |
1302 | { |
1223 | { |
1303 | object *tmp; |
1224 | object *tmp; |
1304 | |
1225 | |
1305 | if (op->head) |
1226 | if (op->head) |
1306 | op = op->head; |
1227 | op = op->head; |
… | |
… | |
1334 | * NULL if 'op' was destroyed |
1255 | * NULL if 'op' was destroyed |
1335 | * just 'op' otherwise |
1256 | * just 'op' otherwise |
1336 | */ |
1257 | */ |
1337 | |
1258 | |
1338 | object * |
1259 | object * |
1339 | 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) |
1340 | { |
1261 | { |
1341 | object *tmp, *top, *floor = NULL; |
1262 | object *tmp, *top, *floor = NULL; |
1342 | sint16 x, y; |
1263 | sint16 x, y; |
1343 | |
1264 | |
1344 | if (QUERY_FLAG (op, FLAG_FREED)) |
1265 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1347 | return NULL; |
1268 | return NULL; |
1348 | } |
1269 | } |
1349 | |
1270 | |
1350 | if (m == NULL) |
1271 | if (m == NULL) |
1351 | { |
1272 | { |
1352 | dump_object (op); |
1273 | char *dump = dump_object (op); |
1353 | 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); |
1354 | return op; |
1276 | return op; |
1355 | } |
1277 | } |
1356 | |
1278 | |
1357 | if (out_of_map (m, op->x, op->y)) |
1279 | if (out_of_map (m, op->x, op->y)) |
1358 | { |
1280 | { |
1359 | dump_object (op); |
1281 | char *dump = dump_object (op); |
1360 | 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); |
1361 | #ifdef MANY_CORES |
1283 | #ifdef MANY_CORES |
1362 | /* 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 |
1363 | * 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 |
1364 | * improperly inserted. |
1286 | * improperly inserted. |
1365 | */ |
1287 | */ |
1366 | abort (); |
1288 | abort (); |
1367 | #endif |
1289 | #endif |
|
|
1290 | free (dump); |
1368 | return op; |
1291 | return op; |
1369 | } |
1292 | } |
1370 | |
1293 | |
1371 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1294 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1372 | { |
1295 | { |
1373 | dump_object (op); |
1296 | char *dump = dump_object (op); |
1374 | 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); |
1375 | return op; |
1299 | return op; |
1376 | } |
1300 | } |
1377 | |
1301 | |
1378 | if (op->more != NULL) |
1302 | if (op->more != NULL) |
1379 | { |
1303 | { |
… | |
… | |
1793 | op->carrying += weight; |
1717 | op->carrying += weight; |
1794 | op = op->env; |
1718 | op = op->env; |
1795 | } |
1719 | } |
1796 | } |
1720 | } |
1797 | |
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 | |
1798 | /* |
1742 | /* |
1799 | * insert_ob_in_ob(op,environment): |
1743 | * env->insert (op) |
1800 | * This function inserts the object op in the linked list |
1744 | * This function inserts the object op in the linked list |
1801 | * inside the object environment. |
1745 | * inside the object environment. |
1802 | * |
1746 | * |
1803 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1804 | * the inventory at the last position or next to other objects of the same |
|
|
1805 | * type. |
|
|
1806 | * Frank: Now sorted by type, archetype and magic! |
|
|
1807 | * |
|
|
1808 | * 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 |
1809 | * be != op, if items are merged. -Tero |
1748 | * be != op, if items are merged. -Tero |
1810 | */ |
1749 | */ |
1811 | |
1750 | |
1812 | object * |
1751 | object * |
1813 | insert_ob_in_ob (object *op, object *where) |
1752 | object::insert (object *op) |
1814 | { |
1753 | { |
1815 | object * |
1754 | object *tmp, *otmp; |
1816 | tmp, * |
|
|
1817 | otmp; |
|
|
1818 | |
1755 | |
1819 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1756 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1820 | { |
1757 | op->remove (); |
1821 | dump_object (op); |
|
|
1822 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1823 | return op; |
|
|
1824 | } |
|
|
1825 | |
|
|
1826 | if (where == NULL) |
|
|
1827 | { |
|
|
1828 | dump_object (op); |
|
|
1829 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1830 | return op; |
|
|
1831 | } |
|
|
1832 | |
|
|
1833 | if (where->head) |
|
|
1834 | { |
|
|
1835 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1836 | where = where->head; |
|
|
1837 | } |
|
|
1838 | |
1758 | |
1839 | if (op->more) |
1759 | if (op->more) |
1840 | { |
1760 | { |
1841 | 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); |
1842 | return op; |
1762 | return op; |
… | |
… | |
1844 | |
1764 | |
1845 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1765 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1846 | CLEAR_FLAG (op, FLAG_REMOVED); |
1766 | CLEAR_FLAG (op, FLAG_REMOVED); |
1847 | if (op->nrof) |
1767 | if (op->nrof) |
1848 | { |
1768 | { |
1849 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1769 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1850 | if (CAN_MERGE (tmp, op)) |
1770 | if (CAN_MERGE (tmp, op)) |
1851 | { |
1771 | { |
1852 | /* return the original object and remove inserted object |
1772 | /* return the original object and remove inserted object |
1853 | (client needs the original object) */ |
1773 | (client needs the original object) */ |
1854 | tmp->nrof += op->nrof; |
1774 | tmp->nrof += op->nrof; |
1855 | /* Weight handling gets pretty funky. Since we are adding to |
1775 | /* Weight handling gets pretty funky. Since we are adding to |
1856 | * tmp->nrof, we need to increase the weight. |
1776 | * tmp->nrof, we need to increase the weight. |
1857 | */ |
1777 | */ |
1858 | add_weight (where, op->weight * op->nrof); |
1778 | add_weight (this, op->weight * op->nrof); |
1859 | SET_FLAG (op, FLAG_REMOVED); |
1779 | SET_FLAG (op, FLAG_REMOVED); |
1860 | free_object (op); /* free the inserted object */ |
1780 | op->destroy (); /* free the inserted object */ |
1861 | op = tmp; |
1781 | op = tmp; |
1862 | remove_ob (op); /* and fix old object's links */ |
1782 | op->remove (); /* and fix old object's links */ |
1863 | CLEAR_FLAG (op, FLAG_REMOVED); |
1783 | CLEAR_FLAG (op, FLAG_REMOVED); |
1864 | break; |
1784 | break; |
1865 | } |
1785 | } |
1866 | |
1786 | |
1867 | /* I assume combined objects have no inventory |
1787 | /* I assume combined objects have no inventory |
1868 | * We add the weight - this object could have just been removed |
1788 | * We add the weight - this object could have just been removed |
1869 | * (if it was possible to merge). calling remove_ob will subtract |
1789 | * (if it was possible to merge). calling remove_ob will subtract |
1870 | * 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 |
1871 | * the linking below |
1791 | * the linking below |
1872 | */ |
1792 | */ |
1873 | add_weight (where, op->weight * op->nrof); |
1793 | add_weight (this, op->weight * op->nrof); |
1874 | } |
1794 | } |
1875 | else |
1795 | else |
1876 | add_weight (where, (op->weight + op->carrying)); |
1796 | add_weight (this, (op->weight + op->carrying)); |
1877 | |
1797 | |
1878 | otmp = is_player_inv (where); |
1798 | otmp = is_player_inv (this); |
1879 | if (otmp && otmp->contr != NULL) |
1799 | if (otmp && otmp->contr) |
1880 | { |
|
|
1881 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1800 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1882 | fix_player (otmp); |
1801 | fix_player (otmp); |
1883 | } |
|
|
1884 | |
1802 | |
1885 | op->map = NULL; |
1803 | op->map = NULL; |
1886 | op->env = where; |
1804 | op->env = this; |
1887 | op->above = NULL; |
1805 | op->above = NULL; |
1888 | op->below = NULL; |
1806 | op->below = NULL; |
1889 | op->x = 0, op->y = 0; |
1807 | op->x = 0, op->y = 0; |
1890 | |
1808 | |
1891 | /* 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 */ |
1892 | if ((op->glow_radius != 0) && where->map) |
1810 | if ((op->glow_radius != 0) && map) |
1893 | { |
1811 | { |
1894 | #ifdef DEBUG_LIGHTS |
1812 | #ifdef DEBUG_LIGHTS |
1895 | 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); |
1896 | #endif /* DEBUG_LIGHTS */ |
1814 | #endif /* DEBUG_LIGHTS */ |
1897 | if (MAP_DARKNESS (where->map)) |
1815 | if (MAP_DARKNESS (map)) |
1898 | update_all_los (where->map, where->x, where->y); |
1816 | update_all_los (map, x, y); |
1899 | } |
1817 | } |
1900 | |
1818 | |
1901 | /* 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. |
1902 | * It sure simplifies this function... |
1820 | * It sure simplifies this function... |
1903 | */ |
1821 | */ |
1904 | if (where->inv == NULL) |
1822 | if (!inv) |
1905 | where->inv = op; |
1823 | inv = op; |
1906 | else |
1824 | else |
1907 | { |
1825 | { |
1908 | op->below = where->inv; |
1826 | op->below = inv; |
1909 | op->below->above = op; |
1827 | op->below->above = op; |
1910 | where->inv = op; |
1828 | inv = op; |
1911 | } |
1829 | } |
|
|
1830 | |
1912 | return op; |
1831 | return op; |
1913 | } |
1832 | } |
1914 | |
1833 | |
1915 | /* |
1834 | /* |
1916 | * Checks if any objects has a move_type that matches objects |
1835 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1934 | */ |
1853 | */ |
1935 | |
1854 | |
1936 | int |
1855 | int |
1937 | check_move_on (object *op, object *originator) |
1856 | check_move_on (object *op, object *originator) |
1938 | { |
1857 | { |
1939 | object * |
1858 | object *tmp; |
1940 | tmp; |
1859 | maptile *m = op->map; |
1941 | tag_t |
|
|
1942 | tag; |
|
|
1943 | mapstruct * |
|
|
1944 | m = op->map; |
|
|
1945 | int |
|
|
1946 | x = op->x, y = op->y; |
1860 | int x = op->x, y = op->y; |
1947 | |
1861 | |
1948 | MoveType |
1862 | MoveType move_on, move_slow, move_block; |
1949 | move_on, |
|
|
1950 | move_slow, |
|
|
1951 | move_block; |
|
|
1952 | |
1863 | |
1953 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1864 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1954 | return 0; |
1865 | return 0; |
1955 | |
|
|
1956 | tag = op->count; |
|
|
1957 | |
1866 | |
1958 | 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); |
1959 | 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); |
1960 | 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); |
1961 | |
1870 | |
… | |
… | |
2022 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1931 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2023 | ((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)) |
2024 | { |
1933 | { |
2025 | move_apply (tmp, op, originator); |
1934 | move_apply (tmp, op, originator); |
2026 | |
1935 | |
2027 | if (was_destroyed (op, tag)) |
1936 | if (op->destroyed ()) |
2028 | return 1; |
1937 | return 1; |
2029 | |
1938 | |
2030 | /* what the person/creature stepped onto has moved the object |
1939 | /* what the person/creature stepped onto has moved the object |
2031 | * someplace new. Don't process any further - if we did, |
1940 | * someplace new. Don't process any further - if we did, |
2032 | * have a feeling strange problems would result. |
1941 | * have a feeling strange problems would result. |
… | |
… | |
2044 | * a matching archetype at the given map and coordinates. |
1953 | * a matching archetype at the given map and coordinates. |
2045 | * The first matching object is returned, or NULL if none. |
1954 | * The first matching object is returned, or NULL if none. |
2046 | */ |
1955 | */ |
2047 | |
1956 | |
2048 | object * |
1957 | object * |
2049 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1958 | present_arch (const archetype *at, maptile *m, int x, int y) |
2050 | { |
1959 | { |
2051 | object * |
1960 | object * |
2052 | tmp; |
1961 | tmp; |
2053 | |
1962 | |
2054 | if (m == NULL || out_of_map (m, x, y)) |
1963 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2067 | * a matching type variable at the given map and coordinates. |
1976 | * a matching type variable at the given map and coordinates. |
2068 | * The first matching object is returned, or NULL if none. |
1977 | * The first matching object is returned, or NULL if none. |
2069 | */ |
1978 | */ |
2070 | |
1979 | |
2071 | object * |
1980 | object * |
2072 | present (unsigned char type, mapstruct *m, int x, int y) |
1981 | present (unsigned char type, maptile *m, int x, int y) |
2073 | { |
1982 | { |
2074 | object * |
1983 | object * |
2075 | tmp; |
1984 | tmp; |
2076 | |
1985 | |
2077 | if (out_of_map (m, x, y)) |
1986 | if (out_of_map (m, x, y)) |
… | |
… | |
2217 | * 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 |
2218 | * customized, changed states, etc. |
2127 | * customized, changed states, etc. |
2219 | */ |
2128 | */ |
2220 | |
2129 | |
2221 | int |
2130 | int |
2222 | 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) |
2223 | { |
2132 | { |
2224 | int |
2133 | int |
2225 | i, |
2134 | i, |
2226 | index = 0, flag; |
2135 | index = 0, flag; |
2227 | static int |
2136 | static int |
… | |
… | |
2248 | return -1; |
2157 | return -1; |
2249 | return altern[RANDOM () % index]; |
2158 | return altern[RANDOM () % index]; |
2250 | } |
2159 | } |
2251 | |
2160 | |
2252 | /* |
2161 | /* |
2253 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2162 | * find_first_free_spot(archetype, maptile, x, y) works like |
2254 | * find_free_spot(), but it will search max number of squares. |
2163 | * find_free_spot(), but it will search max number of squares. |
2255 | * 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. |
2256 | * 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. |
2257 | */ |
2166 | */ |
2258 | |
2167 | |
2259 | int |
2168 | int |
2260 | 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) |
2261 | { |
2170 | { |
2262 | int |
2171 | int |
2263 | i; |
2172 | i; |
2264 | |
2173 | |
2265 | for (i = 0; i < SIZEOFFREE; i++) |
2174 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2329 | * 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 |
2330 | * there is capable of. |
2239 | * there is capable of. |
2331 | */ |
2240 | */ |
2332 | |
2241 | |
2333 | int |
2242 | int |
2334 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2243 | find_dir (maptile *m, int x, int y, object *exclude) |
2335 | { |
2244 | { |
2336 | int |
2245 | int |
2337 | i, |
2246 | i, |
2338 | max = SIZEOFFREE, mflags; |
2247 | max = SIZEOFFREE, mflags; |
2339 | |
2248 | |
2340 | sint16 nx, ny; |
2249 | sint16 nx, ny; |
2341 | object * |
2250 | object * |
2342 | tmp; |
2251 | tmp; |
2343 | mapstruct * |
2252 | maptile * |
2344 | mp; |
2253 | mp; |
2345 | |
2254 | |
2346 | MoveType blocked, move_type; |
2255 | MoveType blocked, move_type; |
2347 | |
2256 | |
2348 | if (exclude && exclude->head) |
2257 | if (exclude && exclude->head) |
… | |
… | |
2556 | * Modified to be map tile aware -.MSW |
2465 | * Modified to be map tile aware -.MSW |
2557 | */ |
2466 | */ |
2558 | |
2467 | |
2559 | |
2468 | |
2560 | int |
2469 | int |
2561 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2470 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2562 | { |
2471 | { |
2563 | sint16 dx, dy; |
2472 | sint16 dx, dy; |
2564 | int |
2473 | int |
2565 | mflags; |
2474 | mflags; |
2566 | |
2475 | |
… | |
… | |
2646 | if (prev) |
2555 | if (prev) |
2647 | prev->more = tmp; |
2556 | prev->more = tmp; |
2648 | prev = tmp; |
2557 | prev = tmp; |
2649 | } |
2558 | } |
2650 | |
2559 | |
2651 | /*** copy inventory ***/ |
|
|
2652 | for (item = src->inv; item; item = item->below) |
2560 | for (item = src->inv; item; item = item->below) |
2653 | { |
|
|
2654 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2561 | insert_ob_in_ob (object_create_clone (item), dst); |
2655 | } |
|
|
2656 | |
2562 | |
2657 | return dst; |
2563 | return dst; |
2658 | } |
2564 | } |
2659 | |
2565 | |
2660 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2661 | int |
|
|
2662 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2663 | { |
|
|
2664 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2665 | * robust */ |
|
|
2666 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2667 | } |
|
|
2668 | |
|
|
2669 | /* GROS - Creates an object using a string representing its content. */ |
2566 | /* GROS - Creates an object using a string representing its content. */ |
2670 | |
|
|
2671 | /* 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 */ |
2672 | |
|
|
2673 | /* 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, */ |
2674 | |
|
|
2675 | /* 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. */ |
2676 | |
|
|
2677 | /* 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. */ |
2678 | |
|
|
2679 | /* Also remember that multiparts objects are not supported for now. */ |
2571 | /* Also remember that multiparts objects are not supported for now. */ |
2680 | |
2572 | |
2681 | object * |
2573 | object * |
2682 | load_object_str (const char *obstr) |
2574 | load_object_str (const char *obstr) |
2683 | { |
2575 | { |
2684 | object * |
2576 | object *op; |
2685 | op; |
|
|
2686 | char |
|
|
2687 | filename[MAX_BUF]; |
2577 | char filename[MAX_BUF]; |
2688 | |
2578 | |
2689 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2579 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2690 | |
2580 | |
2691 | FILE * |
|
|
2692 | tempfile = fopen (filename, "w"); |
2581 | FILE *tempfile = fopen (filename, "w"); |
2693 | |
2582 | |
2694 | if (tempfile == NULL) |
2583 | if (tempfile == NULL) |
2695 | { |
2584 | { |
2696 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2585 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2697 | return NULL; |
2586 | return NULL; |
… | |
… | |
2718 | * returns NULL if no match. |
2607 | * returns NULL if no match. |
2719 | */ |
2608 | */ |
2720 | object * |
2609 | object * |
2721 | 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) |
2722 | { |
2611 | { |
2723 | object * |
2612 | object *tmp; |
2724 | tmp; |
|
|
2725 | |
2613 | |
2726 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2614 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2727 | if (tmp->type == type && tmp->subtype == subtype) |
2615 | if (tmp->type == type && tmp->subtype == subtype) |
2728 | return tmp; |
2616 | return tmp; |
2729 | |
2617 | |
… | |
… | |
2737 | * do the desired thing. |
2625 | * do the desired thing. |
2738 | */ |
2626 | */ |
2739 | key_value * |
2627 | key_value * |
2740 | get_ob_key_link (const object *ob, const char *key) |
2628 | get_ob_key_link (const object *ob, const char *key) |
2741 | { |
2629 | { |
2742 | key_value * |
2630 | key_value *link; |
2743 | link; |
|
|
2744 | |
2631 | |
2745 | for (link = ob->key_values; link != NULL; link = link->next) |
2632 | for (link = ob->key_values; link != NULL; link = link->next) |
2746 | { |
|
|
2747 | if (link->key == key) |
2633 | if (link->key == key) |
2748 | { |
|
|
2749 | return link; |
2634 | return link; |
2750 | } |
|
|
2751 | } |
|
|
2752 | |
2635 | |
2753 | return NULL; |
2636 | return NULL; |
2754 | } |
2637 | } |
2755 | |
2638 | |
2756 | /* |
2639 | /* |