Codechange: use args.GetParam(offset) over *args.GetPointerToOffset(offset)

src/strings.cpp

@@ -1036,7 +1036,7 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
 					_scan_for_gender_data = true;
 					std::string buffer;
 					StringBuilder tmp_builder(buffer);
-					StringParameters tmp_params(args.GetPointerToOffset(offset), args.num_param - offset, nullptr);
+					StringParameters tmp_params = args.GetRemainingParameters(offset);
 					FormatString(tmp_builder, input, tmp_params);
 					_scan_for_gender_data = old_sgd;
 
@@ -1064,7 +1064,7 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
 			case SCC_PLURAL_LIST: { // {P}
 				int plural_form = *str++;          // contains the plural form for this string
 				uint offset = orig_offset + (byte)*str++;
-				int64 v = *args.GetPointerToOffset(offset); // contains the number that determines plural
+				int64 v = args.GetParam(offset); // contains the number that determines plural
 				str = ParseStringChoice(str, DeterminePluralForm(v, plural_form), builder);
 				break;
 			}

src/strings_internal.h

@@ -81,16 +81,28 @@ public:
 
 	/**
 	 * Get a new instance of StringParameters that is a "range" into the
-	 * parameters existing parameters. Upon destruction the offset in the parent
+	 * remaining existing parameters. Upon destruction the offset in the parent
 	 * is not updated. However, calls to SetDParam do update the parameters.
 	 *
 	 * The returned StringParameters must not outlive this StringParameters.
 	 * @return A "range" of the string parameters.
 	 */
-	StringParameters GetRemainingParameters()
+	StringParameters GetRemainingParameters() { return GetRemainingParameters(this->offset); }
+
+	/**
+	 * Get a new instance of StringParameters that is a "range" into the
+	 * remaining existing parameters from the given offset. Upon destruction the
+	 * offset in the parent is not updated. However, calls to SetDParam do
+	 * update the parameters.
+	 *
+	 * The returned StringParameters must not outlive this StringParameters.
+	 * @param offset The offset to get the remaining parameters for.
+	 * @return A "range" of the string parameters.
+	 */
+	StringParameters GetRemainingParameters(size_t offset)
 	{
-		return StringParameters(&this->data[this->offset], GetDataLeft(),
-			this->type == nullptr ? nullptr : &this->type[this->offset]);
+		return StringParameters(&this->data[offset], GetDataLeft(),
+			this->type == nullptr ? nullptr : &this->type[offset]);
 	}
 
 	/** Return the amount of elements which can still be read. */