Merge branch 'master' into jgrpp

# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h

src/network/core/address.h

@@ -91,15 +91,6 @@ public:
 		this->SetPort(port);
 	}
 
-	/**
-	 * Make a clone of another address
-	 * @param address the address to clone
-	 */
-	NetworkAddress(const NetworkAddress &address)
-	{
-		memcpy(this, &address, sizeof(*this));
-	}
-
 	const char *GetHostname();
 	void GetAddressAsString(char *buffer, const char *last, bool with_family = true);
 	const char *GetAddressAsString(bool with_family = true);

src/network/network_content.cpp

@@ -133,7 +133,7 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet *p)
 		ci->state = ContentInfo::UNSELECTED;
 	}
 
-	/* Something we don't have and has filesize 0 does not exist in te system */
+	/* Something we don't have and has filesize 0 does not exist in the system */
 	if (ci->state == ContentInfo::UNSELECTED && ci->filesize == 0) ci->state = ContentInfo::DOES_NOT_EXIST;
 
 	/* Do we already have a stub for this? */
@@ -781,7 +781,7 @@ void ClientNetworkContentSocketHandler::SendReceive()
 
 	if (this->CanSendReceive()) {
 		if (this->ReceivePackets()) {
-			/* Only update activity once a packet is received, instead of everytime we try it. */
+			/* Only update activity once a packet is received, instead of every time we try it. */
 			this->lastActivity = _realtime_tick;
 		}
 	}

src/network/network_content_gui.cpp

@@ -289,7 +289,7 @@ struct ContentListFilterData {
 	std::bitset<CONTENT_TYPE_END> types; ///< Content types displayed
 };
 
-/** Filter criterias for NetworkContentListWindow. */
+/** Filter criteria for NetworkContentListWindow. */
 enum ContentListFilterCriteria {
 	CONTENT_FILTER_TEXT = 0,        ///< Filter by query sting
 	CONTENT_FILTER_TYPE_OR_SELECTED,///< Filter by being of displayed type or selected for download

src/network/network_gui.cpp

@@ -240,7 +240,7 @@ protected:
 
 	int lock_offset; ///< Left offset for lock icon.
 	int blot_offset; ///< Left offset for green/yellow/red compatibility icon.
-	int flag_offset; ///< Left offset for langauge flag icon.
+	int flag_offset; ///< Left offset for language flag icon.
 
 	/**
 	 * (Re)build the GUI network game list (a.k.a. this->servers) as some

src/network/network_server.cpp

@@ -1302,7 +1302,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_ACK(Packet *p)
 
 	/* The client is trying to catch up with the server */
 	if (this->status == STATUS_PRE_ACTIVE) {
-		/* The client is not yet catched up? */
+		/* The client is not yet caught up? */
 		if (frame + DAY_TICKS < _frame_counter) return NETWORK_RECV_STATUS_OKAY;
 
 		/* Now he is! Unpause the game */

src/network/network_type.h

@@ -38,7 +38,7 @@ enum NetworkVehicleType {
 };
 
 /** 'Unique' identifier to be given to clients */
-enum ClientID {
+enum ClientID : uint32 {
 	INVALID_CLIENT_ID = 0, ///< Client is not part of anything
 	CLIENT_ID_SERVER  = 1, ///< Servers always have this ID
 	CLIENT_ID_FIRST   = 2, ///< The first client ID