Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ran cargo fmt

Browse Source
This commit is contained in:
telastrus 2019-08-08 12:05:38 -04:00
parent 58e8bd4af9
commit 35a3f67e19
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chat-cli/src/main.rs
View File

@ -48,7 +48,9 @@ fn main() {
println!("Players online: {:?}", client.get_players()); println!("Players online: {:?}", client.get_players());
client.register(comp::Player::new(username, None), password).unwrap(); client
.register(comp::Player::new(username, None), password)
.unwrap();
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
thread::spawn(move || loop { thread::spawn(move || loop {

12
client/src/lib.rs
View File

@ -8,7 +8,7 @@ pub use specs::{join::Join, saveload::Marker, Entity as EcsEntity, ReadStorage};
use common::{ use common::{
comp, comp,
msg::{ClientMsg, ClientState, ServerError, ServerInfo, ServerMsg, RequestStateError}, msg::{ClientMsg, ClientState, RequestStateError, ServerError, ServerInfo, ServerMsg},
net::PostBox, net::PostBox,
state::{State, Uid}, state::{State, Uid},
terrain::{block::Block, chonk::ChonkMetrics, TerrainChunk, TerrainChunkSize}, terrain::{block::Block, chonk::ChonkMetrics, TerrainChunk, TerrainChunkSize},
@ -132,10 +132,12 @@ impl Client {
} }
/// Request a state transition to `ClientState::Registered`. /// Request a state transition to `ClientState::Registered`.
pub fn register(&mut self, player: comp::Player, password: String) /*-> Result<(), Error>*/ { pub fn register(&mut self, player: comp::Player, password: String) /*-> Result<(), Error>*/
self.postbox.send_message(ClientMsg::Register { player, password }); {
self.postbox
.send_message(ClientMsg::Register { player, password });
self.client_state = ClientState::Pending; self.client_state = ClientState::Pending;
/*loop { /*loop {
match self.postbox.next_message() { match self.postbox.next_message() {
Some(ServerMsg::StateAnswer(Err((RequestStateError::Denied, _)))) => { Some(ServerMsg::StateAnswer(Err((RequestStateError::Denied, _)))) => {
println!("Got a bad"); println!("Got a bad");
@ -149,7 +151,7 @@ impl Client {
println!("Got unusual message: {:?}", x); println!("Got unusual message: {:?}", x);
} }
None => { println!("Got nothing?"); }, None => { println!("Got nothing?"); },
} }
}*/ }*/
} }

3
server/src/lib.rs
View File

@ -26,7 +26,7 @@ use log::debug;
use rand::Rng; use rand::Rng;
use specs::{join::Join, world::EntityBuilder as EcsEntityBuilder, Builder, Entity as EcsEntity}; use specs::{join::Join, world::EntityBuilder as EcsEntityBuilder, Builder, Entity as EcsEntity};
use std::{ use std::{
collections::{HashSet, HashMap}, collections::{HashMap, HashSet},
i32, i32,
net::SocketAddr, net::SocketAddr,
sync::{mpsc, Arc}, sync::{mpsc, Arc},
@ -535,7 +535,6 @@ impl Server {
break; break;
} }
} else { } else {
player.alias, password);
accounts.insert(player.alias.clone(), password); accounts.insert(player.alias.clone(), password);
} }
match client.client_state { match client.client_state {

7
voxygen/src/menu/main/client_init.rs
View File

@ -30,7 +30,12 @@ pub struct ClientInit {
rx: Receiver<Result<Client, Error>>, rx: Receiver<Result<Client, Error>>,
} }
impl ClientInit { impl ClientInit {
pub fn new(connection_args: (String, u16, bool), player: comp::Player, password: String, wait: bool) -> Self { pub fn new(
connection_args: (String, u16, bool),
player: comp::Player,
password: String,
wait: bool,
) -> Self {
let (server_address, default_port, prefer_ipv6) = connection_args; let (server_address, default_port, prefer_ipv6) = connection_args;
let (tx, rx) = channel(); let (tx, rx) = channel();