… | |
… | |
104 | _exit (1); |
104 | _exit (1); |
105 | } |
105 | } |
106 | |
106 | |
107 | uuid.seq = uid; |
107 | uuid.seq = uid; |
108 | write_uuid (); |
108 | write_uuid (); |
109 | LOG (llevDebug, "read UID: %lld\n", uid); |
109 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
110 | fclose (fp); |
110 | fclose (fp); |
111 | } |
111 | } |
112 | |
112 | |
113 | UUID |
113 | UUID |
114 | gen_uuid () |
114 | gen_uuid () |
… | |
… | |
374 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
374 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
375 | * Some error messages. |
375 | * Some error messages. |
376 | * 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. |
377 | */ |
377 | */ |
378 | |
378 | |
379 | void |
379 | char * |
380 | dump_object2 (object *op) |
|
|
381 | { |
|
|
382 | errmsg[0] = 0; |
|
|
383 | return; |
|
|
384 | //TODO//D#d# |
|
|
385 | #if 0 |
|
|
386 | char *cp; |
|
|
387 | |
|
|
388 | /* object *tmp;*/ |
|
|
389 | |
|
|
390 | if (op->arch != NULL) |
|
|
391 | { |
|
|
392 | strcat (errmsg, "arch "); |
|
|
393 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
394 | strcat (errmsg, "\n"); |
|
|
395 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
396 | strcat (errmsg, cp); |
|
|
397 | # if 0 |
|
|
398 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
399 | * will overflow the buffer. |
|
|
400 | * Changed so that we don't dump inventory either. This may |
|
|
401 | * also overflow the buffer. |
|
|
402 | */ |
|
|
403 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
404 | strcat (errmsg, cp); |
|
|
405 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
406 | dump_object2 (tmp); |
|
|
407 | # endif |
|
|
408 | strcat (errmsg, "end\n"); |
|
|
409 | } |
|
|
410 | else |
|
|
411 | { |
|
|
412 | strcat (errmsg, "Object "); |
|
|
413 | if (op->name == NULL) |
|
|
414 | strcat (errmsg, "(null)"); |
|
|
415 | else |
|
|
416 | strcat (errmsg, op->name); |
|
|
417 | strcat (errmsg, "\n"); |
|
|
418 | # if 0 |
|
|
419 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
420 | strcat (errmsg, cp); |
|
|
421 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
422 | dump_object2 (tmp); |
|
|
423 | # endif |
|
|
424 | strcat (errmsg, "end\n"); |
|
|
425 | } |
|
|
426 | #endif |
|
|
427 | } |
|
|
428 | |
|
|
429 | /* |
|
|
430 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
431 | */ |
|
|
432 | |
|
|
433 | void |
|
|
434 | dump_object (object *op) |
380 | dump_object (object *op) |
435 | { |
381 | { |
436 | if (op == NULL) |
382 | if (!op) |
437 | { |
383 | return strdup ("[NULLOBJ]"); |
438 | strcpy (errmsg, "[NULL pointer]"); |
|
|
439 | return; |
|
|
440 | } |
|
|
441 | errmsg[0] = '\0'; |
|
|
442 | dump_object2 (op); |
|
|
443 | } |
|
|
444 | |
384 | |
445 | void |
385 | object_freezer freezer; |
446 | dump_all_objects (void) |
386 | save_object (freezer, op, 3); |
447 | { |
387 | return freezer.as_string (); |
448 | object *op; |
|
|
449 | |
|
|
450 | for (op = object::first; op != NULL; op = op->next) |
|
|
451 | { |
|
|
452 | dump_object (op); |
|
|
453 | fprintf (logfile, "Object %s\n", errmsg); |
|
|
454 | } |
|
|
455 | } |
388 | } |
456 | |
389 | |
457 | /* |
390 | /* |
458 | * 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 |
459 | * multi-object 1 which is closest to the second object. |
392 | * multi-object 1 which is closest to the second object. |
… | |
… | |
479 | */ |
412 | */ |
480 | |
413 | |
481 | object * |
414 | object * |
482 | find_object (tag_t i) |
415 | find_object (tag_t i) |
483 | { |
416 | { |
484 | object *op; |
|
|
485 | |
|
|
486 | for (op = object::first; op != NULL; op = op->next) |
417 | for (object *op = object::first; op; op = op->next) |
487 | if (op->count == i) |
418 | if (op->count == i) |
488 | break; |
419 | return op; |
489 | |
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); |
… | |
… | |
972 | * 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 |
973 | * free objects. The IS_FREED() flag is set in the object. |
898 | * free objects. The IS_FREED() flag is set in the object. |
974 | * The object must have been removed by remove_ob() first for |
899 | * The object must have been removed by remove_ob() first for |
975 | * this function to succeed. |
900 | * this function to succeed. |
976 | * |
901 | * |
977 | * 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 |
978 | * inventory to the ground. |
903 | * inventory to the ground. |
979 | */ |
904 | */ |
980 | void object::free (bool free_inventory) |
905 | void object::destroy (bool destroy_inventory) |
981 | { |
906 | { |
982 | if (QUERY_FLAG (this, FLAG_FREED)) |
907 | if (QUERY_FLAG (this, FLAG_FREED)) |
983 | return; |
908 | return; |
984 | |
909 | |
985 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
910 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
… | |
… | |
990 | |
915 | |
991 | SET_FLAG (this, FLAG_FREED); |
916 | SET_FLAG (this, FLAG_FREED); |
992 | |
917 | |
993 | if (more) |
918 | if (more) |
994 | { |
919 | { |
995 | more->free (free_inventory); |
920 | more->destroy (destroy_inventory); |
996 | more = 0; |
921 | more = 0; |
997 | } |
922 | } |
998 | |
923 | |
999 | if (inv) |
924 | if (inv) |
1000 | { |
925 | { |
1001 | /* Only if the space blocks everything do we not process - |
926 | /* Only if the space blocks everything do we not process - |
1002 | * if some form of movement is allowed, let objects |
927 | * if some form of movement is allowed, let objects |
1003 | * drop on that space. |
928 | * drop on that space. |
1004 | */ |
929 | */ |
1005 | 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) |
1006 | { |
931 | { |
1007 | object *op = inv; |
932 | object *op = inv; |
1008 | |
933 | |
1009 | while (op) |
934 | while (op) |
1010 | { |
935 | { |
1011 | object *tmp = op->below; |
936 | object *tmp = op->below; |
1012 | op->free (free_inventory); |
937 | op->destroy (destroy_inventory); |
1013 | op = tmp; |
938 | op = tmp; |
1014 | } |
939 | } |
1015 | } |
940 | } |
1016 | else |
941 | else |
1017 | { /* Put objects in inventory onto this space */ |
942 | { /* Put objects in inventory onto this space */ |
… | |
… | |
1036 | op = tmp; |
961 | op = tmp; |
1037 | } |
962 | } |
1038 | } |
963 | } |
1039 | } |
964 | } |
1040 | |
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 | |
1041 | // clear those pointers that likely might have circular references to us |
986 | // clear those pointers that likely might have circular references to us |
1042 | owner = 0; |
987 | owner = 0; |
1043 | enemy = 0; |
988 | enemy = 0; |
1044 | attacked_by = 0; |
989 | attacked_by = 0; |
1045 | |
990 | |
|
|
991 | // only relevant for players(?), but make sure of it anyways |
|
|
992 | contr = 0; |
|
|
993 | |
1046 | /* Remove object from the active list */ |
994 | /* Remove object from the active list */ |
1047 | speed = 0; |
995 | speed = 0; |
1048 | update_ob_speed (this); |
996 | update_ob_speed (this); |
1049 | |
997 | |
1050 | unlink (); |
998 | unlink (); |
… | |
… | |
1054 | |
1002 | |
1055 | /* |
1003 | /* |
1056 | * sub_weight() recursively (outwards) subtracts a number from the |
1004 | * sub_weight() recursively (outwards) subtracts a number from the |
1057 | * 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)). |
1058 | */ |
1006 | */ |
1059 | |
|
|
1060 | void |
1007 | void |
1061 | sub_weight (object *op, signed long weight) |
1008 | sub_weight (object *op, signed long weight) |
1062 | { |
1009 | { |
1063 | while (op != NULL) |
1010 | while (op != NULL) |
1064 | { |
1011 | { |
… | |
… | |
1076 | * object will have no environment. If the object previously had an |
1023 | * object will have no environment. If the object previously had an |
1077 | * environment, the x and y coordinates will be updated to |
1024 | * environment, the x and y coordinates will be updated to |
1078 | * the previous environment. |
1025 | * the previous environment. |
1079 | * Beware: This function is called from the editor as well! |
1026 | * Beware: This function is called from the editor as well! |
1080 | */ |
1027 | */ |
1081 | |
|
|
1082 | void |
1028 | void |
1083 | remove_ob (object *op) |
1029 | object::remove () |
1084 | { |
1030 | { |
1085 | object *tmp, *last = 0; |
1031 | object *tmp, *last = 0; |
1086 | object *otmp; |
1032 | object *otmp; |
1087 | |
1033 | |
1088 | int check_walk_off; |
1034 | int check_walk_off; |
1089 | maptile *m; |
|
|
1090 | |
1035 | |
1091 | sint16 x, y; |
|
|
1092 | |
|
|
1093 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1036 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1094 | return; |
1037 | return; |
1095 | |
1038 | |
1096 | SET_FLAG (op, FLAG_REMOVED); |
1039 | SET_FLAG (this, FLAG_REMOVED); |
1097 | |
1040 | |
1098 | if (op->more != NULL) |
1041 | if (more) |
1099 | remove_ob (op->more); |
1042 | more->remove (); |
1100 | |
1043 | |
1101 | /* |
1044 | /* |
1102 | * In this case, the object to be removed is in someones |
1045 | * In this case, the object to be removed is in someones |
1103 | * inventory. |
1046 | * inventory. |
1104 | */ |
1047 | */ |
1105 | if (op->env != NULL) |
1048 | if (env) |
1106 | { |
1049 | { |
1107 | if (op->nrof) |
1050 | if (nrof) |
1108 | sub_weight (op->env, op->weight * op->nrof); |
1051 | sub_weight (env, weight * nrof); |
1109 | else |
1052 | else |
1110 | sub_weight (op->env, op->weight + op->carrying); |
1053 | sub_weight (env, weight + carrying); |
1111 | |
1054 | |
1112 | /* 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 |
1113 | * made to players inventory. If set, avoiding the call |
1056 | * made to players inventory. If set, avoiding the call |
1114 | * to save cpu time. |
1057 | * to save cpu time. |
1115 | */ |
1058 | */ |
1116 | 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)) |
1117 | fix_player (otmp); |
1060 | fix_player (otmp); |
1118 | |
1061 | |
1119 | if (op->above != NULL) |
1062 | if (above != NULL) |
1120 | op->above->below = op->below; |
1063 | above->below = below; |
1121 | else |
1064 | else |
1122 | op->env->inv = op->below; |
1065 | env->inv = below; |
1123 | |
1066 | |
1124 | if (op->below != NULL) |
1067 | if (below != NULL) |
1125 | op->below->above = op->above; |
1068 | below->above = above; |
1126 | |
1069 | |
1127 | /* we set up values so that it could be inserted into |
1070 | /* we set up values so that it could be inserted into |
1128 | * 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 |
1129 | * to the caller to decide what we want to do. |
1072 | * to the caller to decide what we want to do. |
1130 | */ |
1073 | */ |
1131 | op->x = op->env->x, op->y = op->env->y; |
1074 | x = env->x, y = env->y; |
1132 | op->map = op->env->map; |
1075 | map = env->map; |
1133 | op->above = NULL, op->below = NULL; |
1076 | above = 0, below = 0; |
1134 | op->env = NULL; |
1077 | env = 0; |
1135 | } |
1078 | } |
1136 | else if (op->map) |
1079 | else if (map) |
1137 | { |
1080 | { |
1138 | x = op->x; |
|
|
1139 | y = op->y; |
|
|
1140 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1141 | |
|
|
1142 | if (!m) |
|
|
1143 | { |
|
|
1144 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1145 | op->map->path, op->x, op->y); |
|
|
1146 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1147 | * it seems if we get into this case, something is probablye |
|
|
1148 | * screwed up and should be fixed. |
|
|
1149 | */ |
|
|
1150 | abort (); |
|
|
1151 | } |
|
|
1152 | |
|
|
1153 | if (op->map != m) |
|
|
1154 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1155 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1156 | |
|
|
1157 | /* Re did the following section of code - it looks like it had |
1081 | /* Re did the following section of code - it looks like it had |
1158 | * lots of logic for things we no longer care about |
1082 | * lots of logic for things we no longer care about |
1159 | */ |
1083 | */ |
1160 | |
1084 | |
1161 | /* link the object above us */ |
1085 | /* link the object above us */ |
1162 | if (op->above) |
1086 | if (above) |
1163 | op->above->below = op->below; |
1087 | above->below = below; |
1164 | else |
1088 | else |
1165 | 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 */ |
1166 | |
1090 | |
1167 | /* Relink the object below us, if there is one */ |
1091 | /* Relink the object below us, if there is one */ |
1168 | if (op->below) |
1092 | if (below) |
1169 | op->below->above = op->above; |
1093 | below->above = above; |
1170 | else |
1094 | else |
1171 | { |
1095 | { |
1172 | /* 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 |
1173 | * use translated coordinates in case some oddness with map tiling is |
1097 | * use translated coordinates in case some oddness with map tiling is |
1174 | * evident |
1098 | * evident |
1175 | */ |
1099 | */ |
1176 | if (GET_MAP_OB (m, x, y) != op) |
1100 | if (GET_MAP_OB (map, x, y) != this) |
1177 | { |
1101 | { |
1178 | dump_object (op); |
1102 | char *dump = dump_object (this); |
1179 | LOG (llevError, |
1103 | LOG (llevError, |
1180 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
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); |
1181 | dump_object (GET_MAP_OB (m, x, y)); |
1106 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1182 | LOG (llevError, "%s\n", errmsg); |
1107 | LOG (llevError, "%s\n", dump); |
|
|
1108 | free (dump); |
1183 | } |
1109 | } |
1184 | |
1110 | |
1185 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1111 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1186 | } |
1112 | } |
1187 | |
1113 | |
1188 | op->above = 0; |
1114 | above = 0; |
1189 | op->below = 0; |
1115 | below = 0; |
1190 | |
1116 | |
1191 | if (op->map->in_memory == MAP_SAVING) |
1117 | if (map->in_memory == MAP_SAVING) |
1192 | return; |
1118 | return; |
1193 | |
1119 | |
1194 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1120 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1195 | |
1121 | |
1196 | 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) |
1197 | { |
1123 | { |
1198 | /* 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 |
1199 | * being removed. |
1125 | * being removed. |
1200 | */ |
1126 | */ |
1201 | |
1127 | |
1202 | if (tmp->type == PLAYER && tmp != op) |
1128 | if (tmp->type == PLAYER && tmp != this) |
1203 | { |
1129 | { |
1204 | /* If a container that the player is currently using somehow gets |
1130 | /* If a container that the player is currently using somehow gets |
1205 | * removed (most likely destroyed), update the player view |
1131 | * removed (most likely destroyed), update the player view |
1206 | * appropriately. |
1132 | * appropriately. |
1207 | */ |
1133 | */ |
1208 | if (tmp->container == op) |
1134 | if (tmp->container == this) |
1209 | { |
1135 | { |
1210 | CLEAR_FLAG (op, FLAG_APPLIED); |
1136 | CLEAR_FLAG (this, FLAG_APPLIED); |
1211 | tmp->container = NULL; |
1137 | tmp->container = 0; |
1212 | } |
1138 | } |
1213 | |
1139 | |
1214 | tmp->contr->socket.update_look = 1; |
1140 | tmp->contr->socket.update_look = 1; |
1215 | } |
1141 | } |
1216 | |
1142 | |
1217 | /* See if player moving off should effect something */ |
1143 | /* See if player moving off should effect something */ |
1218 | if (check_walk_off |
1144 | if (check_walk_off |
1219 | && ((op->move_type & tmp->move_off) |
1145 | && ((move_type & tmp->move_off) |
1220 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1146 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1221 | { |
1147 | { |
1222 | move_apply (tmp, op, NULL); |
1148 | move_apply (tmp, this, 0); |
1223 | |
1149 | |
1224 | if (op->destroyed ()) |
1150 | if (destroyed ()) |
1225 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1151 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1226 | } |
1152 | } |
1227 | |
1153 | |
1228 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1154 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1229 | |
1155 | |
1230 | if (tmp->above == tmp) |
1156 | if (tmp->above == tmp) |
1231 | tmp->above = NULL; |
1157 | tmp->above = 0; |
1232 | |
1158 | |
1233 | last = tmp; |
1159 | last = tmp; |
1234 | } |
1160 | } |
1235 | |
1161 | |
1236 | /* last == NULL of there are no objects on this space */ |
1162 | /* last == NULL of there are no objects on this space */ |
1237 | if (last == NULL) |
1163 | if (!last) |
1238 | { |
1164 | { |
1239 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1165 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1240 | * 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 |
1241 | * 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 |
1242 | * be correct anyways. |
1168 | * be correct anyways. |
1243 | */ |
1169 | */ |
1244 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1170 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1245 | update_position (op->map, op->x, op->y); |
1171 | update_position (map, x, y); |
1246 | } |
1172 | } |
1247 | else |
1173 | else |
1248 | update_object (last, UP_OBJ_REMOVE); |
1174 | update_object (last, UP_OBJ_REMOVE); |
1249 | |
1175 | |
1250 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1176 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1251 | update_all_los (op->map, op->x, op->y); |
1177 | update_all_los (map, x, y); |
1252 | } |
1178 | } |
1253 | } |
1179 | } |
1254 | |
1180 | |
1255 | /* |
1181 | /* |
1256 | * merge_ob(op,top): |
1182 | * merge_ob(op,top): |
… | |
… | |
1342 | return NULL; |
1268 | return NULL; |
1343 | } |
1269 | } |
1344 | |
1270 | |
1345 | if (m == NULL) |
1271 | if (m == NULL) |
1346 | { |
1272 | { |
1347 | dump_object (op); |
1273 | char *dump = dump_object (op); |
1348 | 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); |
1349 | return op; |
1276 | return op; |
1350 | } |
1277 | } |
1351 | |
1278 | |
1352 | if (out_of_map (m, op->x, op->y)) |
1279 | if (out_of_map (m, op->x, op->y)) |
1353 | { |
1280 | { |
1354 | dump_object (op); |
1281 | char *dump = dump_object (op); |
1355 | 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); |
1356 | #ifdef MANY_CORES |
1283 | #ifdef MANY_CORES |
1357 | /* 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 |
1358 | * 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 |
1359 | * improperly inserted. |
1286 | * improperly inserted. |
1360 | */ |
1287 | */ |
1361 | abort (); |
1288 | abort (); |
1362 | #endif |
1289 | #endif |
|
|
1290 | free (dump); |
1363 | return op; |
1291 | return op; |
1364 | } |
1292 | } |
1365 | |
1293 | |
1366 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1294 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1367 | { |
1295 | { |
1368 | dump_object (op); |
1296 | char *dump = dump_object (op); |
1369 | 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); |
1370 | return op; |
1299 | return op; |
1371 | } |
1300 | } |
1372 | |
1301 | |
1373 | if (op->more != NULL) |
1302 | if (op->more != NULL) |
1374 | { |
1303 | { |
… | |
… | |
1788 | op->carrying += weight; |
1717 | op->carrying += weight; |
1789 | op = op->env; |
1718 | op = op->env; |
1790 | } |
1719 | } |
1791 | } |
1720 | } |
1792 | |
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 | |
1793 | /* |
1742 | /* |
1794 | * insert_ob_in_ob(op,environment): |
1743 | * env->insert (op) |
1795 | * This function inserts the object op in the linked list |
1744 | * This function inserts the object op in the linked list |
1796 | * inside the object environment. |
1745 | * inside the object environment. |
1797 | * |
1746 | * |
1798 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1799 | * the inventory at the last position or next to other objects of the same |
|
|
1800 | * type. |
|
|
1801 | * Frank: Now sorted by type, archetype and magic! |
|
|
1802 | * |
|
|
1803 | * 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 |
1804 | * be != op, if items are merged. -Tero |
1748 | * be != op, if items are merged. -Tero |
1805 | */ |
1749 | */ |
1806 | |
1750 | |
1807 | object * |
1751 | object * |
1808 | insert_ob_in_ob (object *op, object *where) |
1752 | object::insert (object *op) |
1809 | { |
1753 | { |
1810 | object * |
1754 | object *tmp, *otmp; |
1811 | tmp, * |
|
|
1812 | otmp; |
|
|
1813 | |
1755 | |
1814 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1756 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1815 | { |
1757 | op->remove (); |
1816 | dump_object (op); |
|
|
1817 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1818 | return op; |
|
|
1819 | } |
|
|
1820 | |
|
|
1821 | if (where == NULL) |
|
|
1822 | { |
|
|
1823 | dump_object (op); |
|
|
1824 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1825 | return op; |
|
|
1826 | } |
|
|
1827 | |
|
|
1828 | if (where->head) |
|
|
1829 | { |
|
|
1830 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1831 | where = where->head; |
|
|
1832 | } |
|
|
1833 | |
1758 | |
1834 | if (op->more) |
1759 | if (op->more) |
1835 | { |
1760 | { |
1836 | 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); |
1837 | return op; |
1762 | return op; |
… | |
… | |
1839 | |
1764 | |
1840 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1765 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1841 | CLEAR_FLAG (op, FLAG_REMOVED); |
1766 | CLEAR_FLAG (op, FLAG_REMOVED); |
1842 | if (op->nrof) |
1767 | if (op->nrof) |
1843 | { |
1768 | { |
1844 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1769 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1845 | if (CAN_MERGE (tmp, op)) |
1770 | if (CAN_MERGE (tmp, op)) |
1846 | { |
1771 | { |
1847 | /* return the original object and remove inserted object |
1772 | /* return the original object and remove inserted object |
1848 | (client needs the original object) */ |
1773 | (client needs the original object) */ |
1849 | tmp->nrof += op->nrof; |
1774 | tmp->nrof += op->nrof; |
1850 | /* Weight handling gets pretty funky. Since we are adding to |
1775 | /* Weight handling gets pretty funky. Since we are adding to |
1851 | * tmp->nrof, we need to increase the weight. |
1776 | * tmp->nrof, we need to increase the weight. |
1852 | */ |
1777 | */ |
1853 | add_weight (where, op->weight * op->nrof); |
1778 | add_weight (this, op->weight * op->nrof); |
1854 | SET_FLAG (op, FLAG_REMOVED); |
1779 | SET_FLAG (op, FLAG_REMOVED); |
1855 | free_object (op); /* free the inserted object */ |
1780 | op->destroy (); /* free the inserted object */ |
1856 | op = tmp; |
1781 | op = tmp; |
1857 | remove_ob (op); /* and fix old object's links */ |
1782 | op->remove (); /* and fix old object's links */ |
1858 | CLEAR_FLAG (op, FLAG_REMOVED); |
1783 | CLEAR_FLAG (op, FLAG_REMOVED); |
1859 | break; |
1784 | break; |
1860 | } |
1785 | } |
1861 | |
1786 | |
1862 | /* I assume combined objects have no inventory |
1787 | /* I assume combined objects have no inventory |
1863 | * We add the weight - this object could have just been removed |
1788 | * We add the weight - this object could have just been removed |
1864 | * (if it was possible to merge). calling remove_ob will subtract |
1789 | * (if it was possible to merge). calling remove_ob will subtract |
1865 | * 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 |
1866 | * the linking below |
1791 | * the linking below |
1867 | */ |
1792 | */ |
1868 | add_weight (where, op->weight * op->nrof); |
1793 | add_weight (this, op->weight * op->nrof); |
1869 | } |
1794 | } |
1870 | else |
1795 | else |
1871 | add_weight (where, (op->weight + op->carrying)); |
1796 | add_weight (this, (op->weight + op->carrying)); |
1872 | |
1797 | |
1873 | otmp = is_player_inv (where); |
1798 | otmp = is_player_inv (this); |
1874 | if (otmp && otmp->contr != NULL) |
1799 | if (otmp && otmp->contr) |
1875 | { |
|
|
1876 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1800 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1877 | fix_player (otmp); |
1801 | fix_player (otmp); |
1878 | } |
|
|
1879 | |
1802 | |
1880 | op->map = NULL; |
1803 | op->map = NULL; |
1881 | op->env = where; |
1804 | op->env = this; |
1882 | op->above = NULL; |
1805 | op->above = NULL; |
1883 | op->below = NULL; |
1806 | op->below = NULL; |
1884 | op->x = 0, op->y = 0; |
1807 | op->x = 0, op->y = 0; |
1885 | |
1808 | |
1886 | /* 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 */ |
1887 | if ((op->glow_radius != 0) && where->map) |
1810 | if ((op->glow_radius != 0) && map) |
1888 | { |
1811 | { |
1889 | #ifdef DEBUG_LIGHTS |
1812 | #ifdef DEBUG_LIGHTS |
1890 | 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); |
1891 | #endif /* DEBUG_LIGHTS */ |
1814 | #endif /* DEBUG_LIGHTS */ |
1892 | if (MAP_DARKNESS (where->map)) |
1815 | if (MAP_DARKNESS (map)) |
1893 | update_all_los (where->map, where->x, where->y); |
1816 | update_all_los (map, x, y); |
1894 | } |
1817 | } |
1895 | |
1818 | |
1896 | /* 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. |
1897 | * It sure simplifies this function... |
1820 | * It sure simplifies this function... |
1898 | */ |
1821 | */ |
1899 | if (where->inv == NULL) |
1822 | if (!inv) |
1900 | where->inv = op; |
1823 | inv = op; |
1901 | else |
1824 | else |
1902 | { |
1825 | { |
1903 | op->below = where->inv; |
1826 | op->below = inv; |
1904 | op->below->above = op; |
1827 | op->below->above = op; |
1905 | where->inv = op; |
1828 | inv = op; |
1906 | } |
1829 | } |
|
|
1830 | |
1907 | return op; |
1831 | return op; |
1908 | } |
1832 | } |
1909 | |
1833 | |
1910 | /* |
1834 | /* |
1911 | * Checks if any objects has a move_type that matches objects |
1835 | * Checks if any objects has a move_type that matches objects |