aboutsummaryrefslogtreecommitdiff
path: root/src/network/serveropcodes.h
diff options
context:
space:
mode:
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>2020-11-04 16:57:47 +0100
committerGitHub <noreply@github.com>2020-11-04 16:57:47 +0100
commit3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch)
treec070350db219f2c4241d22bc31949685c7b42fe9 /src/network/serveropcodes.h
parent5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff)
parent6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff)
downloaddragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/network/serveropcodes.h')
-rw-r--r--src/network/serveropcodes.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/network/serveropcodes.h b/src/network/serveropcodes.h
index 9d3c1ab9e..6df09d5ef 100644
--- a/src/network/serveropcodes.h
+++ b/src/network/serveropcodes.h
@@ -25,8 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class NetworkPacket;
-enum ToServerConnectionState
-{
+enum ToServerConnectionState {
TOSERVER_STATE_NOT_CONNECTED,
TOSERVER_STATE_STARTUP,
TOSERVER_STATE_INGAME,
@@ -34,14 +33,14 @@ enum ToServerConnectionState
};
struct ToServerCommandHandler
{
- const std::string name;
- ToServerConnectionState state;
- void (Server::*handler)(NetworkPacket *pkt);
+ const std::string name;
+ ToServerConnectionState state;
+ void (Server::*handler)(NetworkPacket* pkt);
};
struct ClientCommandFactory
{
- const char *name;
+ const char* name;
u8 channel;
bool reliable;
};