diff options
| -rw-r--r-- | light-client/src/atlas.rs | 2 | ||||
| -rw-r--r-- | light-client/src/network.rs | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/light-client/src/atlas.rs b/light-client/src/atlas.rs index b1d2c5e0..4a39b649 100644 --- a/light-client/src/atlas.rs +++ b/light-client/src/atlas.rs @@ -97,7 +97,7 @@ impl<'a> SpriteRenderer<'a> { tiles: vec![], sprites: vec![], view_offset: Vec2::ZERO, - view_scale: Vec2::new(1., 0.75) * 2., + view_scale: Vec2::splat(4.), } } diff --git a/light-client/src/network.rs b/light-client/src/network.rs index 3eb3f50a..997a3344 100644 --- a/light-client/src/network.rs +++ b/light-client/src/network.rs @@ -36,27 +36,26 @@ pub struct Network { impl Network { pub fn connect(addr: &str) -> Result<Self> { let (parts, _) = addr.into_client_request().unwrap().into_parts(); - let uri = parts.uri.clone(); - let mut builder = Request::builder() - .uri(uri.clone()) + .uri(parts.uri.clone().clone()) .method(parts.method.clone()) .version(parts.version); *builder.headers_mut().unwrap() = parts.headers.clone(); let request = builder.body(()).unwrap(); - let uri = request.uri(); - let mode = uri_mode(uri)?; let host = request.uri().host().unwrap(); let host = if host.starts_with('[') { &host[1..host.len() - 1] } else { host }; - let port = uri.port_u16().unwrap_or(match mode { - Mode::Plain => 27032, - Mode::Tls => 443, - }); + let port = request + .uri() + .port_u16() + .unwrap_or(match uri_mode(request.uri())? { + Mode::Plain => 27032, + Mode::Tls => 443, + }); let stream = TcpStream::connect((host, port))?; stream.set_nodelay(true).unwrap(); |