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/script/api/ai_changelog.hpp

@@ -313,7 +313,7 @@
  *     destination it its catchment area. One industry tile or one town house
  *     is enough as long as station accepts the cargo. Awarded subsidies are no
  *     longer bound to stations used for first delivery, any station can be
- *     used for loading and unloading as long as cargo is transfered from
+ *     used for loading and unloading as long as cargo is transferred from
  *     source to destination.
  * \li Make AIEngine:CanRefitCargo() not report refittability to mail by
  *     default for aircraft. It is not necessarily true. This means that even

src/script/api/script_cargo.hpp

@@ -36,7 +36,7 @@ public:
 		CC_LIQUID       = ::CC_LIQUID,       ///< Liquids (Oil, Water, Rubber)
 		CC_REFRIGERATED = ::CC_REFRIGERATED, ///< Refrigerated cargo (Food, Fruit)
 		CC_HAZARDOUS    = ::CC_HAZARDOUS,    ///< Hazardous cargo (Nuclear Fuel, Explosives, etc.)
-		CC_COVERED      = ::CC_COVERED,      ///< Covered/Sheltered Freight (Transporation in Box Vans, Silo Wagons, etc.)
+		CC_COVERED      = ::CC_COVERED,      ///< Covered/Sheltered Freight (Transportation in Box Vans, Silo Wagons, etc.)
 	};
 
 	/**

src/script/api/script_client.hpp

@@ -26,7 +26,7 @@ class ScriptClient : public ScriptObject {
 public:
 
 	/** Different constants related to ClientID. */
-	enum ClientID {
+	enum ClientID : uint32 {
 		CLIENT_INVALID = 0,  ///< Client is not part of anything
 		CLIENT_SERVER  = 1,  ///< Servers always have this ID
 		CLIENT_FIRST   = 2,  ///< The first client ID

src/script/api/script_event_types.hpp

@@ -799,8 +799,8 @@ private:
 
 /**
  * Event AircraftDestTooFar, indicating the next destination of an aircraft is too far away.
- * This event can be trigger when the current oder of an aircraft changes, usually either when
- * loading is done or when switch manually.
+ * This event can be triggered when the current order of an aircraft changes, usually either when
+ * loading is done or when switched manually.
  * @api ai
  */
 class ScriptEventAircraftDestTooFar : public ScriptEvent {

src/script/api/script_goal.cpp

@@ -84,7 +84,7 @@
 	EnforcePrecondition(false, IsValidGoal(goal_id));
 	EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY);
 
-	/* Ensure null as used for emtpy string. */
+	/* Ensure null as used for empty string. */
 	if (progress != nullptr && StrEmpty(progress->GetEncodedText())) {
 		progress = nullptr;
 	}

src/script/api/script_road.hpp

@@ -219,7 +219,7 @@ public:
 	static bool AreRoadTilesConnected(TileIndex tile_from, TileIndex tile_to);
 
 	/**
-	 * Lookup function for building road parts independend on whether the
+	 * Lookup function for building road parts independent of whether the
 	 *  "building on slopes" setting is enabled or not.
 	 *  This implementation can be used for abstract reasoning about a tile as
 	 *  it needs the slope and existing road parts of the tile as information.
@@ -250,10 +250,10 @@ public:
 	static int32 CanBuildConnectedRoadParts(ScriptTile::Slope slope, struct Array *existing, TileIndex start, TileIndex end);
 
 	/**
-	 * Lookup function for building road parts independend on whether the
+	 * Lookup function for building road parts independent of whether the
 	 *  "building on slopes" setting is enabled or not.
 	 *  This implementation can be used for reasoning about an existing tile.
-	 * @param tile The the tile to examine.
+	 * @param tile The tile to examine.
 	 * @param start The tile from where "tile" will be entered.
 	 * @param end The tile from where "tile" will be exited.
 	 * @pre start != end.

src/script/api/script_story_page.hpp

@@ -92,7 +92,7 @@ public:
 	 * Create a new story page element.
 	 * @param story_page_id The page id of the story page which the page element should be appended to.
 	 * @param type Which page element type to create.
-	 * @param reference A reference value to the object that is refered to by some page element types. When type is SPET_GOAL, this is the goal ID. When type is SPET_LOCATION, this is the TileIndex.
+	 * @param reference A reference value to the object that is referred to by some page element types. When type is SPET_GOAL, this is the goal ID. When type is SPET_LOCATION, this is the TileIndex.
 	 * @param text The body text of page elements that allow custom text. (SPET_TEXT and SPET_LOCATION)
 	 * @return The new StoryPageElementID, or STORY_PAGE_ELEMENT_INVALID if it failed.
 	 * @pre No ScriptCompanyMode may be in scope.
@@ -107,7 +107,7 @@ public:
 	/**
 	 * Update the content of a page element
 	 * @param story_page_element_id The page id of the story page which the page element should be appended to.
-	 * @param reference A reference value to the object that is refered to by some page element types. See also NewElement.
+	 * @param reference A reference value to the object that is referred to by some page element types. See also NewElement.
 	 * @param text The body text of page elements that allow custom text. See also NewElement.
 	 * @return True if the action succeeded.
 	 * @pre No ScriptCompanyMode may be in scope.