--- a/gameServer2/src/server/actions.rs Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/actions.rs Fri Dec 07 18:21:06 2018 +0300
@@ -4,7 +4,7 @@
mem::replace
};
use super::{
- server::HWServer,
+ core::HWServer,
room::{GameInfo, RoomFlags},
client::HWClient,
coretypes::{ClientId, RoomId, GameCfg, VoteType},
--- a/gameServer2/src/server/handlers/checker.rs Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/checker.rs Fri Dec 07 18:21:06 2018 +0300
@@ -3,7 +3,7 @@
use crate::{
server::{
- server::HWServer,
+ core::HWServer,
coretypes::ClientId,
},
protocol::messages::{
--- a/gameServer2/src/server/handlers/common.rs Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/common.rs Fri Dec 07 18:21:06 2018 +0300
@@ -1,5 +1,5 @@
use crate::{
- server::{actions::Action, server::HWServer},
+ server::{actions::Action, core::HWServer},
protocol::messages::{
HWProtocolMessage::{self, Rnd}, HWServerMessage::{self, ChatMsg},
}
--- a/gameServer2/src/server/handlers/inroom.rs Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/inroom.rs Fri Dec 07 18:21:06 2018 +0300
@@ -6,7 +6,7 @@
ClientId, RoomId, Voting, VoteType, GameCfg,
MAX_HEDGEHOGS_PER_TEAM
},
- server::HWServer,
+ core::HWServer,
room::{HWRoom, RoomFlags},
actions::{Action, Action::*}
},
--- a/gameServer2/src/server/handlers/lobby.rs Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/lobby.rs Fri Dec 07 18:21:06 2018 +0300
@@ -2,7 +2,7 @@
use crate::{
server::{
- server::HWServer,
+ core::HWServer,
coretypes::ClientId,
actions::{Action, Action::*}
},
--- a/gameServer2/src/server/handlers/loggingin.rs Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/loggingin.rs Fri Dec 07 18:21:06 2018 +0300
@@ -3,7 +3,7 @@
use crate::{
server::{
client::HWClient,
- server::HWServer,
+ core::HWServer,
coretypes::ClientId,
actions::{Action, Action::*}
},
--- a/gameServer2/src/server/network.rs Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/network.rs Fri Dec 07 18:21:06 2018 +0300
@@ -20,7 +20,7 @@
protocol::{ProtocolDecoder, messages::*}
};
use super::{
- server::{HWServer},
+ core::{HWServer},
coretypes::ClientId
};
#[cfg(feature = "tls-connections")]