Merge tag '14.0-beta3' into jgrpp

# Conflicts:
#	regression/regression/result.txt
#	src/industrytype.h
#	src/network/core/config.h
#	src/network/core/network_game_info.cpp
#	src/network/core/network_game_info.h
#	src/network/core/packet.cpp
#	src/network/core/packet.h
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_admin.cpp
#	src/network/core/tcp_content.cpp
#	src/network/core/tcp_coordinator.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/core/tcp_turn.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_admin.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_command.cpp
#	src/network/network_content.cpp
#	src/network/network_internal.h
#	src/network/network_query.cpp
#	src/network/network_query.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_turn.cpp
#	src/network/network_udp.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp

src/network/core/udp.h

@@ -20,7 +20,7 @@
 #include <time.h>
 
 /** Enum with all types of UDP packets. The order MUST not be changed **/
-enum PacketUDPType {
+enum PacketUDPType : uint8_t {
 	PACKET_UDP_CLIENT_FIND_SERVER,   ///< Queries a game server for game information
 	PACKET_UDP_SERVER_RESPONSE,      ///< Reply of the game server with game information
 	PACKET_UDP_END,                  ///< Must ALWAYS be the last non-extended item in the list!! (period)
@@ -47,27 +47,27 @@ protected:
 	};
 	std::vector<FragmentSet> fragments;
 
-	void ReceiveInvalidPacket(PacketUDPType, NetworkAddress *client_addr);
+	void ReceiveInvalidPacket(PacketUDPType, NetworkAddress &client_addr);
 
 	/**
 	 * Queries to the server for information about the game.
 	 * @param p           The received packet.
 	 * @param client_addr The origin of the packet.
 	 */
-	virtual void Receive_CLIENT_FIND_SERVER(Packet *p, NetworkAddress *client_addr);
+	virtual void Receive_CLIENT_FIND_SERVER(Packet &p, NetworkAddress &client_addr);
 
 	/**
 	 * Response to a query letting the client know we are here.
 	 * @param p           The received packet.
 	 * @param client_addr The origin of the packet.
 	 */
-	virtual void Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr);
+	virtual void Receive_SERVER_RESPONSE(Packet &p, NetworkAddress &client_addr);
 
-	virtual void Receive_EX_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr);
+	virtual void Receive_EX_SERVER_RESPONSE(Packet &p, NetworkAddress &client_addr);
 
-	void HandleUDPPacket(Packet *p, NetworkAddress *client_addr);
+	void HandleUDPPacket(Packet &p, NetworkAddress &client_addr);
 
-	virtual void Receive_EX_MULTI(Packet *p, NetworkAddress *client_addr);
+	virtual void Receive_EX_MULTI(Packet &p, NetworkAddress &client_addr);
 public:
 	NetworkUDPSocketHandler(NetworkAddressList *bind = nullptr);
 
@@ -77,7 +77,7 @@ public:
 	bool Listen();
 	void CloseSocket();
 
-	void SendPacket(Packet *p, NetworkAddress *recv, bool all = false, bool broadcast = false, bool short_mtu = false);
+	void SendPacket(Packet &p, NetworkAddress &recv, bool all = false, bool broadcast = false, bool short_mtu = false);
 	void ReceivePackets();
 };