diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/network/serveropcodes.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/network/serveropcodes.h')
| -rw-r--r-- | src/network/serveropcodes.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/network/serveropcodes.h b/src/network/serveropcodes.h index 6df09d5ef..9d3c1ab9e 100644 --- a/src/network/serveropcodes.h +++ b/src/network/serveropcodes.h @@ -25,7 +25,8 @@ 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, @@ -33,14 +34,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; }; |