… | |
… | |
1089 | if (map->in_memory == MAP_SAVING) |
1089 | if (map->in_memory == MAP_SAVING) |
1090 | return; |
1090 | return; |
1091 | |
1091 | |
1092 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1092 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1093 | |
1093 | |
|
|
1094 | if (object *pl = ms.player ()) |
|
|
1095 | { |
|
|
1096 | if (pl->container == this) |
|
|
1097 | /* If a container that the player is currently using somehow gets |
|
|
1098 | * removed (most likely destroyed), update the player view |
|
|
1099 | * appropriately. |
|
|
1100 | */ |
|
|
1101 | pl->close_container (); |
|
|
1102 | |
|
|
1103 | pl->contr->ns->floorbox_update (); |
|
|
1104 | } |
|
|
1105 | |
1094 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1106 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1095 | { |
1107 | { |
1096 | /* No point updating the players look faces if he is the object |
1108 | /* No point updating the players look faces if he is the object |
1097 | * being removed. |
1109 | * being removed. |
1098 | */ |
1110 | */ |
1099 | |
|
|
1100 | if (tmp->type == PLAYER && tmp != this) |
|
|
1101 | { |
|
|
1102 | /* If a container that the player is currently using somehow gets |
|
|
1103 | * removed (most likely destroyed), update the player view |
|
|
1104 | * appropriately. |
|
|
1105 | */ |
|
|
1106 | if (tmp->container == this) |
|
|
1107 | { |
|
|
1108 | flag [FLAG_APPLIED] = 0; |
|
|
1109 | tmp->container = 0; |
|
|
1110 | } |
|
|
1111 | |
|
|
1112 | if (tmp->contr->ns) |
|
|
1113 | tmp->contr->ns->floorbox_update (); |
|
|
1114 | } |
|
|
1115 | |
1111 | |
1116 | /* See if object moving off should effect something */ |
1112 | /* See if object moving off should effect something */ |
1117 | if (check_walk_off |
1113 | if (check_walk_off |
1118 | && ((move_type & tmp->move_off) |
1114 | && ((move_type & tmp->move_off) |
1119 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1115 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
… | |
… | |
1430 | /* If we have a floor, we know the player, if any, will be above |
1426 | /* If we have a floor, we know the player, if any, will be above |
1431 | * it, so save a few ticks and start from there. |
1427 | * it, so save a few ticks and start from there. |
1432 | */ |
1428 | */ |
1433 | if (!(flag & INS_MAP_LOAD)) |
1429 | if (!(flag & INS_MAP_LOAD)) |
1434 | if (object *pl = ms.player ()) |
1430 | if (object *pl = ms.player ()) |
1435 | if (pl->contr->ns) |
|
|
1436 | pl->contr->ns->floorbox_update (); |
1431 | pl->contr->ns->floorbox_update (); |
1437 | |
1432 | |
1438 | /* If this object glows, it may affect lighting conditions that are |
1433 | /* If this object glows, it may affect lighting conditions that are |
1439 | * visible to others on this map. But update_all_los is really |
1434 | * visible to others on this map. But update_all_los is really |
1440 | * an inefficient way to do this, as it means los for all players |
1435 | * an inefficient way to do this, as it means los for all players |
1441 | * on the map will get recalculated. The players could very well |
1436 | * on the map will get recalculated. The players could very well |
… | |
… | |
2349 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2344 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2350 | * core dumps if they do. |
2345 | * core dumps if they do. |
2351 | * |
2346 | * |
2352 | * Add a check so we can't pick up invisible objects (0.93.8) |
2347 | * Add a check so we can't pick up invisible objects (0.93.8) |
2353 | */ |
2348 | */ |
2354 | |
|
|
2355 | int |
2349 | int |
2356 | can_pick (const object *who, const object *item) |
2350 | can_pick (const object *who, const object *item) |
2357 | { |
2351 | { |
2358 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2352 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2359 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2353 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
… | |
… | |
2674 | old_container->flag [FLAG_APPLIED] = 0; |
2668 | old_container->flag [FLAG_APPLIED] = 0; |
2675 | container = 0; |
2669 | container = 0; |
2676 | |
2670 | |
2677 | esrv_update_item (UPD_FLAGS, this, old_container); |
2671 | esrv_update_item (UPD_FLAGS, this, old_container); |
2678 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2672 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2673 | play_sound (sound_find ("chest_close")); |
2679 | } |
2674 | } |
2680 | |
2675 | |
2681 | if (new_container) |
2676 | if (new_container) |
2682 | { |
2677 | { |
2683 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2678 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2699 | new_container->flag [FLAG_APPLIED] = 1; |
2694 | new_container->flag [FLAG_APPLIED] = 1; |
2700 | container = new_container; |
2695 | container = new_container; |
2701 | |
2696 | |
2702 | esrv_update_item (UPD_FLAGS, this, new_container); |
2697 | esrv_update_item (UPD_FLAGS, this, new_container); |
2703 | esrv_send_inventory (this, new_container); |
2698 | esrv_send_inventory (this, new_container); |
|
|
2699 | play_sound (sound_find ("chest_open")); |
2704 | } |
2700 | } |
2705 | } |
2701 | } |
2706 | |
2702 | |
2707 | object * |
2703 | object * |
2708 | object::force_find (const shstr name) |
2704 | object::force_find (const shstr name) |