… | |
… | |
259 | /* IF the player is flying & trying to take the item out of a container |
259 | /* IF the player is flying & trying to take the item out of a container |
260 | * that is in his inventory, let him. tmp->env points to the container |
260 | * that is in his inventory, let him. tmp->env points to the container |
261 | * (sack, luggage, etc), tmp->env->env then points to the player (nested |
261 | * (sack, luggage, etc), tmp->env->env then points to the player (nested |
262 | * containers not allowed as of now) |
262 | * containers not allowed as of now) |
263 | */ |
263 | */ |
264 | if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl) |
264 | if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) |
265 | { |
265 | { |
266 | new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); |
266 | new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); |
267 | return; |
267 | return; |
268 | } |
268 | } |
269 | |
269 | |
… | |
… | |
743 | /* Need to update the weight for the player */ |
743 | /* Need to update the weight for the player */ |
744 | esrv_send_item (op, op); |
744 | esrv_send_item (op, op); |
745 | op->contr->socket->floorbox_update (); |
745 | op->contr->socket->floorbox_update (); |
746 | } |
746 | } |
747 | |
747 | |
748 | for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above) |
748 | for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) |
749 | if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) |
749 | if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) |
750 | return; |
750 | return; |
751 | |
751 | |
752 | if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) |
752 | if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) |
753 | sell_item (tmp, op); |
753 | sell_item (tmp, op); |