Fix: Incorrect mask files for NE river slopes (#11503)

This disambiguates it with LinkType in league tables.

media/baseset/orig_extra/rivers/rapids.nfo

@@ -13,7 +13,7 @@
     | sprites/rapids.png          mask  90   10
    -1 sprites/rapids.png          8bpp 170   10  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170   10  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10   10
+    | sprites/rapids.png          mask 170   10
    -1 sprites/rapids.png          8bpp 250   10  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250   10  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250   10
@@ -28,7 +28,7 @@
     | sprites/rapids.png          mask  90   60
    -1 sprites/rapids.png          8bpp 170   60  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170   60  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10   60
+    | sprites/rapids.png          mask 170   60
    -1 sprites/rapids.png          8bpp 250   60  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250   60  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250   60
@@ -43,7 +43,7 @@
     | sprites/rapids.png          mask  90  110
    -1 sprites/rapids.png          8bpp 170  110  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  110  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  110
+    | sprites/rapids.png          mask 170  110
    -1 sprites/rapids.png          8bpp 250  110  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  110  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  110
@@ -58,7 +58,7 @@
     | sprites/rapids.png          mask  90  160
    -1 sprites/rapids.png          8bpp 170  160  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  160  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  160
+    | sprites/rapids.png          mask 170  160
    -1 sprites/rapids.png          8bpp 250  160  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  160  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  160
@@ -73,7 +73,7 @@
     | sprites/rapids.png          mask  90  210
    -1 sprites/rapids.png          8bpp 170  210  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  210  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  210
+    | sprites/rapids.png          mask 170  210
    -1 sprites/rapids.png          8bpp 250  210  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  210  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  210
@@ -88,7 +88,7 @@
     | sprites/rapids.png          mask  90  260
    -1 sprites/rapids.png          8bpp 170  260  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  260  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  260
+    | sprites/rapids.png          mask 170  260
    -1 sprites/rapids.png          8bpp 250  260  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  260  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  260
@@ -103,7 +103,7 @@
     | sprites/rapids.png          mask  90  310
    -1 sprites/rapids.png          8bpp 170  310  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  310  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  310
+    | sprites/rapids.png          mask 170  310
    -1 sprites/rapids.png          8bpp 250  310  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  310  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  310
@@ -118,7 +118,7 @@
     | sprites/rapids.png          mask  90  360
    -1 sprites/rapids.png          8bpp 170  360  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  360  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  360
+    | sprites/rapids.png          mask 170  360
    -1 sprites/rapids.png          8bpp 250  360  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  360  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  360
@@ -133,7 +133,7 @@
     | sprites/rapids.png          mask  90  410
    -1 sprites/rapids.png          8bpp 170  410  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  410  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  410
+    | sprites/rapids.png          mask 170  410
    -1 sprites/rapids.png          8bpp 250  410  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  410  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  410
@@ -148,7 +148,7 @@
     | sprites/rapids.png          mask  90  460
    -1 sprites/rapids.png          8bpp 170  460  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  460  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  460
+    | sprites/rapids.png          mask 170  460
    -1 sprites/rapids.png          8bpp 250  460  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  460  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  460
@@ -163,7 +163,7 @@
     | sprites/rapids.png          mask  90  510
    -1 sprites/rapids.png          8bpp 170  510  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  510  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  510
+    | sprites/rapids.png          mask 170  510
    -1 sprites/rapids.png          8bpp 250  510  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  510  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  510
@@ -178,7 +178,7 @@
     | sprites/rapids.png          mask  90  560
    -1 sprites/rapids.png          8bpp 170  560  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  560  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  560
+    | sprites/rapids.png          mask 170  560
    -1 sprites/rapids.png          8bpp 250  560  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  560  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  560
@@ -193,7 +193,7 @@
     | sprites/rapids.png          mask  90  610
    -1 sprites/rapids.png          8bpp 170  610  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  610  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  610
+    | sprites/rapids.png          mask 170  610
    -1 sprites/rapids.png          8bpp 250  610  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  610  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  610
@@ -208,7 +208,7 @@
     | sprites/rapids.png          mask  90  660
    -1 sprites/rapids.png          8bpp 170  660  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  660  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  660
+    | sprites/rapids.png          mask 170  660
    -1 sprites/rapids.png          8bpp 250  660  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  660  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  660
@@ -223,7 +223,7 @@
     | sprites/rapids.png          mask  90  710
    -1 sprites/rapids.png          8bpp 170  710  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  710  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  710
+    | sprites/rapids.png          mask 170  710
    -1 sprites/rapids.png          8bpp 250  710  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  710  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  710
@@ -238,7 +238,7 @@
     | sprites/rapids.png          mask  90  760
    -1 sprites/rapids.png          8bpp 170  760  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  760  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  760
+    | sprites/rapids.png          mask 170  760
    -1 sprites/rapids.png          8bpp 250  760  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  760  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  760

src/textfile_gui.cpp

@@ -160,7 +160,7 @@ void TextfileWindow::SetupScrollbars(bool force_reflow)
 static const std::regex _markdown_link_regex{"\\[(.+?)\\]\\((.+?)\\)", std::regex_constants::ECMAScript | std::regex_constants::optimize};
 
 /** Types of link we support in markdown files. */
-enum class LinkType {
+enum class HyperlinkType {
 	Internal, ///< Internal link, or "anchor" in HTML language.
 	Web,      ///< Link to an external website.
 	File,     ///< Link to a local file.
@@ -172,20 +172,20 @@ enum class LinkType {
  *
  * @param destination The hyperlink destination.
  * @param trusted Whether we trust the content of this file.
- * @return LinkType The classification of the link.
+ * @return HyperlinkType The classification of the link.
  */
-static LinkType ClassifyHyperlink(const std::string &destination, bool trusted)
+static HyperlinkType ClassifyHyperlink(const std::string &destination, bool trusted)
 {
-	if (destination.empty()) return LinkType::Unknown;
-	if (StrStartsWith(destination, "#")) return LinkType::Internal;
+	if (destination.empty()) return HyperlinkType::Unknown;
+	if (StrStartsWith(destination, "#")) return HyperlinkType::Internal;
 
 	/* Only allow external / internal links for sources we trust. */
-	if (!trusted) return LinkType::Unknown;
+	if (!trusted) return HyperlinkType::Unknown;
 
-	if (StrStartsWith(destination, "http://")) return LinkType::Web;
-	if (StrStartsWith(destination, "https://")) return LinkType::Web;
-	if (StrStartsWith(destination, "./")) return LinkType::File;
-	return LinkType::Unknown;
+	if (StrStartsWith(destination, "http://")) return HyperlinkType::Web;
+	if (StrStartsWith(destination, "https://")) return HyperlinkType::Web;
+	if (StrStartsWith(destination, "./")) return HyperlinkType::File;
+	return HyperlinkType::Unknown;
 }
 
 /**
@@ -249,16 +249,16 @@ void TextfileWindow::FindHyperlinksInMarkdown(Line &line, size_t line_index)
 		link.destination = match[2].str();
 		this->links.push_back(link);
 
-		LinkType link_type = ClassifyHyperlink(link.destination, this->trusted);
+		HyperlinkType link_type = ClassifyHyperlink(link.destination, this->trusted);
 		StringControlCode link_colour;
 		switch (link_type) {
-			case LinkType::Internal:
+			case HyperlinkType::Internal:
 				link_colour = SCC_GREEN;
 				break;
-			case LinkType::Web:
+			case HyperlinkType::Web:
 				link_colour = SCC_LTBLUE;
 				break;
-			case LinkType::File:
+			case HyperlinkType::File:
 				link_colour = SCC_LTBROWN;
 				break;
 			default:
@@ -394,7 +394,7 @@ void TextfileWindow::NavigateHistory(int delta)
 /* virtual */ void TextfileWindow::OnHyperlinkClick(const Hyperlink &link)
 {
 	switch (ClassifyHyperlink(link.destination, this->trusted)) {
-		case LinkType::Internal:
+		case HyperlinkType::Internal:
 		{
 			auto it = std::find_if(this->link_anchors.cbegin(), this->link_anchors.cend(), [&](const Hyperlink &other) { return link.destination == other.destination; });
 			if (it != this->link_anchors.cend()) {
@@ -405,11 +405,11 @@ void TextfileWindow::NavigateHistory(int delta)
 			break;
 		}
 
-		case LinkType::Web:
+		case HyperlinkType::Web:
 			OpenBrowser(link.destination.c_str());
 			break;
 
-		case LinkType::File:
+		case HyperlinkType::File:
 			this->NavigateToFile(link.destination, 0);
 			break;