… | |
… | |
330 | |
330 | |
331 | /* Everything passes, must be OK. */ |
331 | /* Everything passes, must be OK. */ |
332 | return 1; |
332 | return 1; |
333 | } |
333 | } |
334 | |
334 | |
|
|
335 | // find player who can see this object |
|
|
336 | object * |
|
|
337 | object::visible_to () const |
|
|
338 | { |
|
|
339 | if (client_visible () && !flag [FLAG_REMOVED]) |
|
|
340 | { |
|
|
341 | // see if we are in a container of sorts |
|
|
342 | if (env) |
|
|
343 | { |
|
|
344 | // the player inventory itself is always visible |
|
|
345 | if (env->type == PLAYER) |
|
|
346 | return env; |
|
|
347 | |
|
|
348 | // else a player could have our env open |
|
|
349 | object *envest = env->outer_env (); |
|
|
350 | |
|
|
351 | // the player itself is always on a map, so we will find him here |
|
|
352 | // even if our inv is in a player. |
|
|
353 | if (envest->is_on_map ()) |
|
|
354 | if (object *pl = envest->ms ().player ()) |
|
|
355 | if (pl->container == env) |
|
|
356 | return pl; |
|
|
357 | } |
|
|
358 | else |
|
|
359 | { |
|
|
360 | // maybe there is a player standing on the same mapspace |
|
|
361 | // this will catch the case where "this" is a player |
|
|
362 | if (object *pl = ms ().player ()) |
|
|
363 | if (!pl->container || this == pl->container) |
|
|
364 | return pl; |
|
|
365 | } |
|
|
366 | } |
|
|
367 | |
|
|
368 | return 0; |
|
|
369 | } |
|
|
370 | |
335 | // adjust weight per container type ("of holding") |
371 | // adjust weight per container type ("of holding") |
336 | static sint32 |
372 | static sint32 |
337 | weight_adjust (object *op, sint32 weight) |
373 | weight_adjust (object *op, sint32 weight) |
338 | { |
374 | { |
339 | return op->type == CONTAINER |
375 | return op->type == CONTAINER |
… | |
… | |
356 | return; |
392 | return; |
357 | |
393 | |
358 | op->carrying += weight; |
394 | op->carrying += weight; |
359 | |
395 | |
360 | if (object *pl = op->visible_to ()) |
396 | if (object *pl = op->visible_to ()) |
|
|
397 | if (pl != op) // player is handled lazily |
361 | esrv_update_item (UPD_WEIGHT, pl, op); |
398 | esrv_update_item (UPD_WEIGHT, pl, op); |
362 | |
399 | |
363 | op = op->env; |
400 | op = op->env; |
364 | } |
401 | } |
365 | } |
402 | } |
366 | |
403 | |
… | |
… | |
387 | if (sum != carrying) |
424 | if (sum != carrying) |
388 | { |
425 | { |
389 | carrying = sum; |
426 | carrying = sum; |
390 | |
427 | |
391 | if (object *pl = visible_to ()) |
428 | if (object *pl = visible_to ()) |
|
|
429 | if (pl != this) // player is handled lazily |
392 | esrv_update_item (UPD_WEIGHT, pl, this); |
430 | esrv_update_item (UPD_WEIGHT, pl, this); |
393 | } |
431 | } |
394 | } |
432 | } |
395 | |
433 | |
396 | /* |
434 | /* |
397 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
435 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
… | |
… | |
568 | } |
606 | } |
569 | |
607 | |
570 | object & |
608 | object & |
571 | object::operator =(const object &src) |
609 | object::operator =(const object &src) |
572 | { |
610 | { |
573 | bool is_freed = flag [FLAG_FREED]; |
611 | remove (); |
574 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
575 | |
612 | |
576 | *(object_copy *)this = src; |
613 | *(object_copy *)this = src; |
577 | |
614 | |
578 | flag [FLAG_FREED] = is_freed; |
|
|
579 | flag [FLAG_REMOVED] = is_removed; |
615 | flag [FLAG_REMOVED] = true; |
580 | |
616 | |
581 | /* Copy over key_values, if any. */ |
617 | /* Copy over key_values, if any. */ |
582 | if (src.key_values) |
618 | if (src.key_values) |
583 | { |
619 | { |
584 | key_value *tail = 0; |
620 | key_value *tail = 0; |
… | |
… | |
648 | object * |
684 | object * |
649 | object::clone () |
685 | object::clone () |
650 | { |
686 | { |
651 | object *neu = create (); |
687 | object *neu = create (); |
652 | copy_to (neu); |
688 | copy_to (neu); |
|
|
689 | neu->map = map; // not copied by copy_to |
653 | return neu; |
690 | return neu; |
654 | } |
691 | } |
655 | |
692 | |
656 | /* |
693 | /* |
657 | * If an object with the IS_TURNABLE() flag needs to be turned due |
694 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
708 | * UP_OBJ_FACE: only the objects face has changed. |
745 | * UP_OBJ_FACE: only the objects face has changed. |
709 | */ |
746 | */ |
710 | void |
747 | void |
711 | update_object (object *op, int action) |
748 | update_object (object *op, int action) |
712 | { |
749 | { |
713 | if (op == NULL) |
750 | if (!op) |
714 | { |
751 | { |
715 | /* this should never happen */ |
752 | /* this should never happen */ |
716 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
753 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
717 | return; |
754 | return; |
718 | } |
755 | } |
719 | |
756 | |
720 | if (op->env) |
757 | if (!op->is_on_map ()) |
721 | { |
758 | { |
722 | /* Animation is currently handled by client, so nothing |
759 | /* Animation is currently handled by client, so nothing |
723 | * to do in this case. |
760 | * to do in this case. |
724 | */ |
761 | */ |
725 | return; |
762 | return; |
726 | } |
763 | } |
727 | |
|
|
728 | /* If the map is saving, don't do anything as everything is |
|
|
729 | * going to get freed anyways. |
|
|
730 | */ |
|
|
731 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
732 | return; |
|
|
733 | |
764 | |
734 | /* make sure the object is within map boundaries */ |
765 | /* make sure the object is within map boundaries */ |
735 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
766 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
736 | { |
767 | { |
737 | LOG (llevError, "update_object() called for object out of map!\n"); |
768 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
880 | object::destroy_inv (bool drop_to_ground) |
911 | object::destroy_inv (bool drop_to_ground) |
881 | { |
912 | { |
882 | // need to check first, because the checks below might segfault |
913 | // need to check first, because the checks below might segfault |
883 | // as we might be on an invalid mapspace and crossfire code |
914 | // as we might be on an invalid mapspace and crossfire code |
884 | // is too buggy to ensure that the inventory is empty. |
915 | // is too buggy to ensure that the inventory is empty. |
885 | // corollary: if you create arrows etc. with stuff in tis inventory, |
916 | // corollary: if you create arrows etc. with stuff in its inventory, |
886 | // cf will crash below with off-map x and y |
917 | // cf will crash below with off-map x and y |
887 | if (!inv) |
918 | if (!inv) |
888 | return; |
919 | return; |
889 | |
920 | |
890 | /* Only if the space blocks everything do we not process - |
921 | /* Only if the space blocks everything do we not process - |
… | |
… | |
897 | || map->nodrop |
928 | || map->nodrop |
898 | || ms ().move_block == MOVE_ALL) |
929 | || ms ().move_block == MOVE_ALL) |
899 | { |
930 | { |
900 | while (inv) |
931 | while (inv) |
901 | { |
932 | { |
902 | inv->destroy_inv (drop_to_ground); |
933 | inv->destroy_inv (false); |
903 | inv->destroy (); |
934 | inv->destroy (); |
904 | } |
935 | } |
905 | } |
936 | } |
906 | else |
937 | else |
907 | { /* Put objects in inventory onto this space */ |
938 | { /* Put objects in inventory onto this space */ |
… | |
… | |
913 | || op->flag [FLAG_NO_DROP] |
944 | || op->flag [FLAG_NO_DROP] |
914 | || op->type == RUNE |
945 | || op->type == RUNE |
915 | || op->type == TRAP |
946 | || op->type == TRAP |
916 | || op->flag [FLAG_IS_A_TEMPLATE] |
947 | || op->flag [FLAG_IS_A_TEMPLATE] |
917 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
948 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
918 | op->destroy (); |
949 | op->destroy (true); |
919 | else |
950 | else |
920 | map->insert (op, x, y); |
951 | map->insert (op, x, y); |
921 | } |
952 | } |
922 | } |
953 | } |
923 | } |
954 | } |
… | |
… | |
927 | object *op = new object; |
958 | object *op = new object; |
928 | op->link (); |
959 | op->link (); |
929 | return op; |
960 | return op; |
930 | } |
961 | } |
931 | |
962 | |
|
|
963 | static struct freed_map : maptile |
|
|
964 | { |
|
|
965 | freed_map () |
|
|
966 | { |
|
|
967 | path = "<freed objects map>"; |
|
|
968 | name = "/internal/freed_objects_map"; |
|
|
969 | width = 3; |
|
|
970 | height = 3; |
|
|
971 | nodrop = 1; |
|
|
972 | |
|
|
973 | alloc (); |
|
|
974 | in_memory = MAP_ACTIVE; |
|
|
975 | } |
|
|
976 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
977 | |
932 | void |
978 | void |
933 | object::do_destroy () |
979 | object::do_destroy () |
934 | { |
980 | { |
935 | if (object *pl = visible_to ()) |
|
|
936 | esrv_del_item (pl->contr, count); |
|
|
937 | |
|
|
938 | attachable::do_destroy (); |
|
|
939 | |
|
|
940 | if (flag [FLAG_IS_LINKED]) |
981 | if (flag [FLAG_IS_LINKED]) |
941 | remove_button_link (this); |
982 | remove_button_link (this); |
942 | |
983 | |
943 | if (flag [FLAG_FRIENDLY]) |
984 | if (flag [FLAG_FRIENDLY]) |
944 | remove_friendly_object (this); |
985 | remove_friendly_object (this); |
945 | |
986 | |
946 | if (!flag [FLAG_REMOVED]) |
|
|
947 | remove (); |
987 | remove (); |
948 | |
988 | |
949 | destroy_inv (true); |
989 | attachable::do_destroy (); |
950 | |
990 | |
951 | deactivate (); |
991 | deactivate (); |
952 | unlink (); |
992 | unlink (); |
953 | |
993 | |
954 | flag [FLAG_FREED] = 1; |
994 | flag [FLAG_FREED] = 1; |
955 | |
995 | |
956 | // hack to ensure that freed objects still have a valid map |
996 | // hack to ensure that freed objects still have a valid map |
957 | { |
|
|
958 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
959 | |
|
|
960 | if (!freed_map) |
|
|
961 | { |
|
|
962 | freed_map = new maptile; |
|
|
963 | |
|
|
964 | freed_map->path = "<freed objects map>"; |
|
|
965 | freed_map->name = "/internal/freed_objects_map"; |
|
|
966 | freed_map->width = 3; |
|
|
967 | freed_map->height = 3; |
|
|
968 | freed_map->nodrop = 1; |
|
|
969 | |
|
|
970 | freed_map->alloc (); |
|
|
971 | freed_map->in_memory = MAP_ACTIVE; |
|
|
972 | } |
|
|
973 | |
|
|
974 | map = freed_map; |
997 | map = &freed_map; |
975 | x = 1; |
998 | x = 1; |
976 | y = 1; |
999 | y = 1; |
977 | } |
|
|
978 | |
1000 | |
979 | if (more) |
1001 | if (more) |
980 | { |
1002 | { |
981 | more->destroy (); |
1003 | more->destroy (); |
982 | more = 0; |
1004 | more = 0; |
… | |
… | |
995 | object::destroy (bool destroy_inventory) |
1017 | object::destroy (bool destroy_inventory) |
996 | { |
1018 | { |
997 | if (destroyed ()) |
1019 | if (destroyed ()) |
998 | return; |
1020 | return; |
999 | |
1021 | |
|
|
1022 | if (!is_head () && !head->destroyed ()) |
|
|
1023 | { |
|
|
1024 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1025 | head->destroy (destroy_inventory); |
|
|
1026 | return; |
|
|
1027 | } |
|
|
1028 | |
1000 | if (destroy_inventory) |
1029 | destroy_inv (!destroy_inventory); |
1001 | destroy_inv (false); |
|
|
1002 | |
1030 | |
1003 | if (is_head ()) |
1031 | if (is_head ()) |
1004 | if (sound_destroy) |
1032 | if (sound_destroy) |
1005 | play_sound (sound_destroy); |
1033 | play_sound (sound_destroy); |
1006 | else if (flag [FLAG_MONSTER]) |
1034 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1020 | object::do_remove () |
1048 | object::do_remove () |
1021 | { |
1049 | { |
1022 | object *tmp, *last = 0; |
1050 | object *tmp, *last = 0; |
1023 | object *otmp; |
1051 | object *otmp; |
1024 | |
1052 | |
1025 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1053 | if (flag [FLAG_REMOVED]) |
1026 | return; |
1054 | return; |
1027 | |
1055 | |
1028 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1029 | INVOKE_OBJECT (REMOVE, this); |
1056 | INVOKE_OBJECT (REMOVE, this); |
|
|
1057 | |
|
|
1058 | flag [FLAG_REMOVED] = true; |
1030 | |
1059 | |
1031 | if (more) |
1060 | if (more) |
1032 | more->remove (); |
1061 | more->remove (); |
1033 | |
1062 | |
1034 | /* |
1063 | /* |
1035 | * In this case, the object to be removed is in someones |
1064 | * In this case, the object to be removed is in someones |
1036 | * inventory. |
1065 | * inventory. |
1037 | */ |
1066 | */ |
1038 | if (env) |
1067 | if (env) |
1039 | { |
1068 | { |
|
|
1069 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1070 | if (object *pl = visible_to ()) |
|
|
1071 | esrv_del_item (pl->contr, count); |
|
|
1072 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1073 | |
1040 | adjust_weight (env, -total_weight ()); |
1074 | adjust_weight (env, -total_weight ()); |
1041 | |
1075 | |
1042 | *(above ? &above->below : &env->inv) = below; |
1076 | *(above ? &above->below : &env->inv) = below; |
1043 | |
1077 | |
1044 | if (below) |
1078 | if (below) |
… | |
… | |
1062 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1096 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1063 | otmp->update_stats (); |
1097 | otmp->update_stats (); |
1064 | } |
1098 | } |
1065 | else if (map) |
1099 | else if (map) |
1066 | { |
1100 | { |
1067 | if (type == PLAYER) |
|
|
1068 | { |
|
|
1069 | // leaving a spot always closes any open container on the ground |
|
|
1070 | if (container && !container->env) |
|
|
1071 | // this causes spurious floorbox updates, but it ensures |
|
|
1072 | // that the CLOSE event is being sent. |
|
|
1073 | close_container (); |
|
|
1074 | |
|
|
1075 | --map->players; |
|
|
1076 | map->touch (); |
|
|
1077 | } |
|
|
1078 | |
|
|
1079 | map->dirty = true; |
1101 | map->dirty = true; |
1080 | mapspace &ms = this->ms (); |
1102 | mapspace &ms = this->ms (); |
|
|
1103 | |
|
|
1104 | if (object *pl = ms.player ()) |
|
|
1105 | { |
|
|
1106 | if (type == PLAYER) // this == pl(!) |
|
|
1107 | { |
|
|
1108 | // leaving a spot always closes any open container on the ground |
|
|
1109 | if (container && !container->env) |
|
|
1110 | // this causes spurious floorbox updates, but it ensures |
|
|
1111 | // that the CLOSE event is being sent. |
|
|
1112 | close_container (); |
|
|
1113 | |
|
|
1114 | --map->players; |
|
|
1115 | map->touch (); |
|
|
1116 | } |
|
|
1117 | else if (pl->container == this) |
|
|
1118 | { |
|
|
1119 | // removing a container should close it |
|
|
1120 | close_container (); |
|
|
1121 | } |
|
|
1122 | |
|
|
1123 | esrv_del_item (pl->contr, count); |
|
|
1124 | } |
1081 | |
1125 | |
1082 | /* link the object above us */ |
1126 | /* link the object above us */ |
1083 | if (above) |
1127 | if (above) |
1084 | above->below = below; |
1128 | above->below = below; |
1085 | else |
1129 | else |
… | |
… | |
1115 | * removed (most likely destroyed), update the player view |
1159 | * removed (most likely destroyed), update the player view |
1116 | * appropriately. |
1160 | * appropriately. |
1117 | */ |
1161 | */ |
1118 | pl->close_container (); |
1162 | pl->close_container (); |
1119 | |
1163 | |
|
|
1164 | //TODO: the floorbox prev/next might need updating |
|
|
1165 | //esrv_del_item (pl->contr, count); |
|
|
1166 | //TODO: update floorbox to preserve ordering |
|
|
1167 | if (pl->contr->ns) |
1120 | pl->contr->ns->floorbox_update (); |
1168 | pl->contr->ns->floorbox_update (); |
1121 | } |
1169 | } |
1122 | |
1170 | |
1123 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1171 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1124 | { |
1172 | { |
1125 | /* No point updating the players look faces if he is the object |
1173 | /* No point updating the players look faces if he is the object |
… | |
… | |
1169 | if (!top) |
1217 | if (!top) |
1170 | for (top = op; top && top->above; top = top->above) |
1218 | for (top = op; top && top->above; top = top->above) |
1171 | ; |
1219 | ; |
1172 | |
1220 | |
1173 | for (; top; top = top->below) |
1221 | for (; top; top = top->below) |
1174 | { |
|
|
1175 | if (top == op) |
|
|
1176 | continue; |
|
|
1177 | |
|
|
1178 | if (object::can_merge (op, top)) |
1222 | if (object::can_merge (op, top)) |
1179 | { |
1223 | { |
1180 | top->nrof += op->nrof; |
1224 | top->nrof += op->nrof; |
1181 | |
1225 | |
1182 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1226 | if (object *pl = top->visible_to ()) |
1183 | op->weight = 0; /* Don't want any adjustements now */ |
1227 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1228 | |
|
|
1229 | op->weight = 0; // cancel the addition above |
|
|
1230 | op->carrying = 0; // must be 0 already |
|
|
1231 | |
1184 | op->destroy (); |
1232 | op->destroy (1); |
|
|
1233 | |
1185 | return top; |
1234 | return top; |
1186 | } |
1235 | } |
1187 | } |
|
|
1188 | |
1236 | |
1189 | return 0; |
1237 | return 0; |
1190 | } |
1238 | } |
1191 | |
1239 | |
1192 | void |
1240 | void |
… | |
… | |
1251 | object * |
1299 | object * |
1252 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1300 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1253 | { |
1301 | { |
1254 | assert (!op->flag [FLAG_FREED]); |
1302 | assert (!op->flag [FLAG_FREED]); |
1255 | |
1303 | |
1256 | object *top, *floor = NULL; |
|
|
1257 | |
|
|
1258 | op->remove (); |
1304 | op->remove (); |
1259 | |
1305 | |
1260 | /* Ideally, the caller figures this out. However, it complicates a lot |
1306 | /* Ideally, the caller figures this out. However, it complicates a lot |
1261 | * of areas of callers (eg, anything that uses find_free_spot would now |
1307 | * of areas of callers (eg, anything that uses find_free_spot would now |
1262 | * need extra work |
1308 | * need extra work |
1263 | */ |
1309 | */ |
1264 | if (!xy_normalise (m, op->x, op->y)) |
1310 | if (!xy_normalise (m, op->x, op->y)) |
1265 | { |
1311 | { |
1266 | op->destroy (); |
1312 | op->destroy (1); |
1267 | return 0; |
1313 | return 0; |
1268 | } |
1314 | } |
1269 | |
1315 | |
1270 | if (object *more = op->more) |
1316 | if (object *more = op->more) |
1271 | if (!insert_ob_in_map (more, m, originator, flag)) |
1317 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1280 | */ |
1326 | */ |
1281 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1327 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1282 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1328 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1283 | if (object::can_merge (op, tmp)) |
1329 | if (object::can_merge (op, tmp)) |
1284 | { |
1330 | { |
|
|
1331 | // TODO: we atcually want to update tmp, not op, |
|
|
1332 | // but some caller surely breaks when we return tmp |
|
|
1333 | // from here :/ |
1285 | op->nrof += tmp->nrof; |
1334 | op->nrof += tmp->nrof; |
1286 | tmp->destroy (1); |
1335 | tmp->destroy (1); |
1287 | } |
1336 | } |
1288 | |
1337 | |
1289 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1338 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
… | |
… | |
1311 | /* since *below* originator, no need to update top */ |
1360 | /* since *below* originator, no need to update top */ |
1312 | originator->below = op; |
1361 | originator->below = op; |
1313 | } |
1362 | } |
1314 | else |
1363 | else |
1315 | { |
1364 | { |
|
|
1365 | object *top, *floor = NULL; |
|
|
1366 | |
1316 | top = ms.bot; |
1367 | top = ms.bot; |
1317 | |
1368 | |
1318 | /* If there are other objects, then */ |
1369 | /* If there are other objects, then */ |
1319 | if (top) |
1370 | if (top) |
1320 | { |
1371 | { |
… | |
… | |
1419 | } |
1470 | } |
1420 | |
1471 | |
1421 | op->map->dirty = true; |
1472 | op->map->dirty = true; |
1422 | |
1473 | |
1423 | if (object *pl = ms.player ()) |
1474 | if (object *pl = ms.player ()) |
|
|
1475 | //TODO: the floorbox prev/next might need updating |
|
|
1476 | //esrv_send_item (pl, op); |
|
|
1477 | //TODO: update floorbox to preserve ordering |
|
|
1478 | if (pl->contr->ns) |
1424 | pl->contr->ns->floorbox_update (); |
1479 | pl->contr->ns->floorbox_update (); |
1425 | |
1480 | |
1426 | /* If this object glows, it may affect lighting conditions that are |
1481 | /* If this object glows, it may affect lighting conditions that are |
1427 | * visible to others on this map. But update_all_los is really |
1482 | * visible to others on this map. But update_all_los is really |
1428 | * an inefficient way to do this, as it means los for all players |
1483 | * an inefficient way to do this, as it means los for all players |
1429 | * on the map will get recalculated. The players could very well |
1484 | * on the map will get recalculated. The players could very well |
… | |
… | |
1494 | return where->env->insert (this); |
1549 | return where->env->insert (this); |
1495 | else |
1550 | else |
1496 | return where->map->insert (this, where->x, where->y, originator, flags); |
1551 | return where->map->insert (this, where->x, where->y, originator, flags); |
1497 | } |
1552 | } |
1498 | |
1553 | |
1499 | // find player who can see this object |
|
|
1500 | object * |
|
|
1501 | object::visible_to () const |
|
|
1502 | { |
|
|
1503 | if (!flag [FLAG_REMOVED]) |
|
|
1504 | { |
|
|
1505 | // see if we are in a container of sorts |
|
|
1506 | if (env) |
|
|
1507 | { |
|
|
1508 | // the player inventory itself is always visible |
|
|
1509 | if (env->type == PLAYER) |
|
|
1510 | return env; |
|
|
1511 | |
|
|
1512 | // else a player could have our env open |
|
|
1513 | object *envest = env->outer_env (); |
|
|
1514 | |
|
|
1515 | // the player itself is always on a map, so we will find him here |
|
|
1516 | // even if our inv is in a player. |
|
|
1517 | if (envest->is_on_map ()) |
|
|
1518 | if (object *pl = envest->ms ().player ()) |
|
|
1519 | if (pl->container == env) |
|
|
1520 | return pl; |
|
|
1521 | } |
|
|
1522 | else |
|
|
1523 | { |
|
|
1524 | // maybe there is a player standing on the same mapspace |
|
|
1525 | // this will catch the case where "this" is a player |
|
|
1526 | if (object *pl = ms ().player ()) |
|
|
1527 | return pl; |
|
|
1528 | } |
|
|
1529 | } |
|
|
1530 | |
|
|
1531 | return 0; |
|
|
1532 | } |
|
|
1533 | |
|
|
1534 | /* |
1554 | /* |
1535 | * decrease(object, number) decreases a specified number from |
1555 | * decrease(object, number) decreases a specified number from |
1536 | * the amount of an object. If the amount reaches 0, the object |
1556 | * the amount of an object. If the amount reaches 0, the object |
1537 | * is subsequently removed and freed. |
1557 | * is subsequently removed and freed. |
1538 | * |
1558 | * |
… | |
… | |
1638 | if (object::can_merge (tmp, op)) |
1658 | if (object::can_merge (tmp, op)) |
1639 | { |
1659 | { |
1640 | /* return the original object and remove inserted object |
1660 | /* return the original object and remove inserted object |
1641 | (client needs the original object) */ |
1661 | (client needs the original object) */ |
1642 | tmp->nrof += op->nrof; |
1662 | tmp->nrof += op->nrof; |
|
|
1663 | |
|
|
1664 | if (object *pl = tmp->visible_to ()) |
|
|
1665 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1666 | |
1643 | adjust_weight (this, op->total_weight ()); |
1667 | adjust_weight (this, op->total_weight ()); |
1644 | |
1668 | |
1645 | op->destroy (1); |
1669 | op->destroy (1); |
1646 | op = tmp; |
1670 | op = tmp; |
1647 | goto inserted; |
1671 | goto inserted; |
… | |
… | |
1661 | |
1685 | |
1662 | inv = op; |
1686 | inv = op; |
1663 | |
1687 | |
1664 | op->flag [FLAG_REMOVED] = 0; |
1688 | op->flag [FLAG_REMOVED] = 0; |
1665 | |
1689 | |
|
|
1690 | if (object *pl = op->visible_to ()) |
|
|
1691 | esrv_send_item (pl, op); |
|
|
1692 | |
1666 | adjust_weight (this, op->total_weight ()); |
1693 | adjust_weight (this, op->total_weight ()); |
1667 | |
1694 | |
1668 | inserted: |
1695 | inserted: |
1669 | /* reset the light list and los of the players on the map */ |
1696 | /* reset the light list and los of the players on the map */ |
1670 | if (op->glow_radius && map && map->darkness) |
1697 | if (op->glow_radius && map && map->darkness) |
1671 | update_all_los (map, x, y); |
1698 | update_all_los (map, x, y); |
1672 | |
1699 | |
1673 | if (object *otmp = in_player ()) |
1700 | // if this is a player's inventory, update stats |
1674 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1701 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1675 | otmp->update_stats (); |
1702 | update_stats (); |
1676 | |
1703 | |
1677 | INVOKE_OBJECT (INSERT, this); |
1704 | INVOKE_OBJECT (INSERT, this); |
1678 | |
1705 | |
1679 | return op; |
1706 | return op; |
1680 | } |
1707 | } |
… | |
… | |
2304 | * create clone from object to another |
2331 | * create clone from object to another |
2305 | */ |
2332 | */ |
2306 | object * |
2333 | object * |
2307 | object_create_clone (object *asrc) |
2334 | object_create_clone (object *asrc) |
2308 | { |
2335 | { |
2309 | object *dst = 0, *tmp, *src, *prev, *item; |
2336 | object *dst = 0; |
2310 | |
2337 | |
2311 | if (!asrc) |
2338 | if (!asrc) |
2312 | return 0; |
2339 | return 0; |
2313 | |
2340 | |
2314 | src = asrc->head_ (); |
2341 | object *src = asrc->head_ (); |
2315 | |
2342 | |
2316 | prev = 0; |
2343 | object *prev = 0; |
2317 | for (object *part = src; part; part = part->more) |
2344 | for (object *part = src; part; part = part->more) |
2318 | { |
2345 | { |
2319 | tmp = part->clone (); |
2346 | object *tmp = part->clone (); |
|
|
2347 | |
2320 | tmp->x -= src->x; |
2348 | tmp->x -= src->x; |
2321 | tmp->y -= src->y; |
2349 | tmp->y -= src->y; |
2322 | |
2350 | |
2323 | if (!part->head) |
2351 | if (!part->head) |
2324 | { |
2352 | { |
… | |
… | |
2334 | prev->more = tmp; |
2362 | prev->more = tmp; |
2335 | |
2363 | |
2336 | prev = tmp; |
2364 | prev = tmp; |
2337 | } |
2365 | } |
2338 | |
2366 | |
2339 | for (item = src->inv; item; item = item->below) |
2367 | for (object *item = src->inv; item; item = item->below) |
2340 | insert_ob_in_ob (object_create_clone (item), dst); |
2368 | insert_ob_in_ob (object_create_clone (item), dst); |
2341 | |
2369 | |
2342 | return dst; |
2370 | return dst; |
2343 | } |
2371 | } |
2344 | |
2372 | |
… | |
… | |
2558 | &name, |
2586 | &name, |
2559 | title ? "\",title:\"" : "", |
2587 | title ? "\",title:\"" : "", |
2560 | title ? (const char *)title : "", |
2588 | title ? (const char *)title : "", |
2561 | flag_desc (flagdesc, 512), type); |
2589 | flag_desc (flagdesc, 512), type); |
2562 | |
2590 | |
2563 | if (!this->flag[FLAG_REMOVED] && env) |
2591 | if (!flag[FLAG_REMOVED] && env) |
2564 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2592 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2565 | |
2593 | |
2566 | if (map) |
2594 | if (map) |
2567 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2595 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2568 | |
2596 | |
… | |
… | |
2598 | object::open_container (object *new_container) |
2626 | object::open_container (object *new_container) |
2599 | { |
2627 | { |
2600 | if (container == new_container) |
2628 | if (container == new_container) |
2601 | return; |
2629 | return; |
2602 | |
2630 | |
2603 | if (object *old_container = container) |
2631 | object *old_container = container; |
|
|
2632 | |
|
|
2633 | if (old_container) |
2604 | { |
2634 | { |
2605 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2635 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2606 | return; |
2636 | return; |
2607 | |
2637 | |
2608 | #if 0 |
2638 | #if 0 |
… | |
… | |
2610 | if (object *closer = old_container->inv) |
2640 | if (object *closer = old_container->inv) |
2611 | if (closer->type == CLOSE_CON) |
2641 | if (closer->type == CLOSE_CON) |
2612 | closer->destroy (); |
2642 | closer->destroy (); |
2613 | #endif |
2643 | #endif |
2614 | |
2644 | |
|
|
2645 | // make sure the container is available |
|
|
2646 | esrv_send_item (this, old_container); |
|
|
2647 | |
2615 | old_container->flag [FLAG_APPLIED] = 0; |
2648 | old_container->flag [FLAG_APPLIED] = false; |
2616 | container = 0; |
2649 | container = 0; |
2617 | |
2650 | |
|
|
2651 | // client needs item update to make it work, client bug requires this to be separate |
2618 | esrv_update_item (UPD_FLAGS, this, old_container); |
2652 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2653 | |
2619 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2654 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2620 | play_sound (sound_find ("chest_close")); |
2655 | play_sound (sound_find ("chest_close")); |
2621 | } |
2656 | } |
2622 | |
2657 | |
2623 | if (new_container) |
2658 | if (new_container) |
… | |
… | |
2636 | } |
2671 | } |
2637 | #endif |
2672 | #endif |
2638 | |
2673 | |
2639 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2674 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2640 | |
2675 | |
|
|
2676 | // make sure the container is available, client bug requires this to be separate |
|
|
2677 | esrv_send_item (this, new_container); |
|
|
2678 | |
2641 | new_container->flag [FLAG_APPLIED] = 1; |
2679 | new_container->flag [FLAG_APPLIED] = true; |
2642 | container = new_container; |
2680 | container = new_container; |
2643 | |
2681 | |
|
|
2682 | // client needs flag change |
2644 | esrv_update_item (UPD_FLAGS, this, new_container); |
2683 | esrv_update_item (UPD_FLAGS, this, new_container); |
2645 | esrv_send_inventory (this, new_container); |
2684 | esrv_send_inventory (this, new_container); |
2646 | play_sound (sound_find ("chest_open")); |
2685 | play_sound (sound_find ("chest_open")); |
2647 | } |
2686 | } |
|
|
2687 | // else if (!old_container->env && contr && contr->ns) |
|
|
2688 | // contr->ns->floorbox_reset (); |
2648 | } |
2689 | } |
2649 | |
2690 | |
2650 | object * |
2691 | object * |
2651 | object::force_find (const shstr name) |
2692 | object::force_find (const shstr name) |
2652 | { |
2693 | { |