cpp/openttd-patchpack/source File Diff

File diff r22548:e350bbe3b5af → r22549:21c2f1153122

src/newgrf_text.cpp

➞

Show inline comments

@@ @@ -35,8 +35,6 @@ @@
 #include "safeguards.h"
 #define GRFTAB  28
 /**
  * Explains the newgrf shift bit positioning.
  * the grf base will not be used in order to find the string, but rather for
@@ @@ -695,7 +693,7 @@ StringID AddGRFString(uint32 grfid, uint @@
 	grfmsg(3, "Added 0x%X: grfid %08X string 0x%X lang 0x%X string '%s'", id, grfid, stringid, newtext->langid, newtext->text);
-	return MakeStringID(GRFTAB, 0) + id; // Id reaches across multiple tabs
+	return MakeStringID(TEXT_TAB_NEWGRF1, 0) + id; // Id reaches across multiple tabs
+}
 /**
@@ @@ -705,7 +703,7 @@ StringID GetGRFStringID(uint32 grfid, ui @@
+{
 	for (uint id = 0; id < _num_grf_texts; id++) {
 		if (_grf_text[id].grfid == grfid && _grf_text[id].stringid == stringid) {
-			return MakeStringID(GRFTAB, 0) + id; // Id reaches across multiple tabs
+			return MakeStringID(TEXT_TAB_NEWGRF1, 0) + id; // Id reaches across multiple tabs
+		}
+	}