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 fmt on codebase

Browse Source 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
This commit is contained in:
Forest Anderson
2019-04-29 20:37:19 +00:00
parent 2bcd6b6295
commit 993388e56a
68 changed files with 1122 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
voxygen/src/menu/main/mod.rs
View File

@ -2,7 +2,6 @@ mod client_init;
mod start_singleplayer;
mod ui;
use start_singleplayer::StartSingleplayerState;
use super::char_selection::CharSelectionState;
use crate::{
window::{Event, Window},
@ -10,6 +9,7 @@ use crate::{
};
use client_init::{ClientInit, Error as InitError};
use common::{clock::Clock, comp};
use start_singleplayer::StartSingleplayerState;
use std::time::Duration;
use ui::{Event as MainMenuEvent, MainMenuUi};
use vek::*;
@ -86,10 +86,7 @@ impl PlayState for MainMenuState {
}
// Maintain the UI
for event in self
.main_menu_ui
.maintain(global_state)
{
for event in self.main_menu_ui.maintain(global_state) {
match event {
MainMenuEvent::LoginAttempt {
username,
@ -104,15 +101,12 @@ impl PlayState for MainMenuState {
// Don't try to connect if there is already a connection in progress
client_init = client_init.or(Some(ClientInit::new(
(server_address, DEFAULT_PORT, false),
(
comp::Player::new(username.clone()),
300,
),
(comp::Player::new(username.clone()), 300),
)));
},
}
MainMenuEvent::StartSingleplayer => {
return PlayStateResult::Push(Box::new(StartSingleplayerState::new()));
},
}
MainMenuEvent::Quit => return PlayStateResult::Shutdown,
}
}