Update to 1.10.0-beta1

src/network/network_internal.h

@@ -17,8 +17,6 @@
 
 #include "../command_type.h"
 
-#ifdef ENABLE_NETWORK
-
 #ifdef RANDOM_DEBUG
 /**
  * If this line is enable, every frame will have a sync test
@@ -151,8 +149,8 @@ bool IsNetworkCompatibleVersion(const char *version);
  * Everything we need to know about a command to be able to execute it.
  */
 struct CommandPacket : CommandContainer {
-	/** Make sure the pointer is NULL. */
-	CommandPacket() : next(NULL), company(INVALID_COMPANY), frame(0), my_cmd(false) {}
+	/** Make sure the pointer is nullptr. */
+	CommandPacket() : next(nullptr), company(INVALID_COMPANY), frame(0), my_cmd(false) {}
 	CommandPacket *next; ///< the next command packet (if in queue)
 	CompanyID company;   ///< company that is executing the command
 	uint32 frame;        ///< the frame in which this packet is executed
@@ -171,5 +169,4 @@ StringID GetNetworkErrorMsg(NetworkErrorCode err);
 bool NetworkFindName(char *new_name, const char *last);
 const char *GenerateCompanyPasswordHash(const char *password, const char *password_server_id, uint32 password_game_seed);
 
-#endif /* ENABLE_NETWORK */
 #endif /* NETWORK_INTERNAL_H */