cpp/openttd-patchpack/source Changeset - r27569:6a9aa0750697

Changeset - r27569:6a9aa0750697

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Rubidium - 18 months ago 2023-06-11 19:59:58
rubidium@openttd.org

Codechange: remove need for GetDParamX

2 files changed with 6 insertions and 16 deletions:

src/error_gui.cpp

src/strings_func.h

0 comments (0 inline, 0 general)

src/error_gui.cpp

➞

Show inline comments

@@ @@ -128,26 +128,27 @@ ErrorMessageData::ErrorMessageData(Strin @@
 /**
  * Copy error parameters from current DParams.
  */
 void ErrorMessageData::CopyOutDParams()
+{
 	if (this->detailed_msg == STR_ERROR_OWNED_BY) {
 		/* The parameters are set by SetDParamsForOwnedBy. */
 		CompanyID company = (CompanyID)GetDParam(OWNED_BY_OWNER_IN_PARAMETERS_OFFSET);
 		if (company < MAX_COMPANIES) face = company;
+	}
 	/* Reset parameters */
 	for (size_t i = 0; i < lengthof(this->strings); i++) free(this->strings[i]);
 	memset(this->decode_params, 0, sizeof(this->decode_params));
 	memset(this->strings, 0, sizeof(this->strings));
 	/* Get parameters using type information */
 	if (this->textref_stack_size > 0) StartTextRefStackUsage(this->textref_stack_grffile, this->textref_stack_size, this->textref_stack);
 	CopyOutDParam(this->decode_params, this->strings, this->detailed_msg == INVALID_STRING_ID ? this->summary_msg : this->detailed_msg, lengthof(this->decode_params));
 	if (this->textref_stack_size > 0) StopTextRefStackUsage();
 	if (this->detailed_msg == STR_ERROR_OWNED_BY) {
 		CompanyID company = (CompanyID)GetDParamX(this->decode_params, OWNED_BY_OWNER_IN_PARAMETERS_OFFSET);
 		if (company < MAX_COMPANIES) face = company;
+	}
+}
 /**
  * Set a error string parameter.
  * @param n Parameter index
  * @param v Parameter value

src/strings_func.h

➞

Show inline comments

@@ @@ -209,23 +209,12 @@ void SetDParamStr(uint n, std::string && @@
 void CopyInDParam(const uint64 *src, int num);
 void CopyOutDParam(uint64 *dst, int num);
 void CopyOutDParam(uint64 *dst, const char **strings, StringID string, int num);
 /**
  * Get the current string parameter at index \a n from parameter array \a s.
  * @param s Array of string parameters.
  * @param n Index of the string parameter.
  * @return Value of the requested string parameter.
  */
 static inline uint64 GetDParamX(const uint64 *s, uint n)
+{
 	return s[n];
+}
 /**
  * Get the current string parameter at index \a n from the global string parameter array.
  * @param n Index of the string parameter.
  * @return Value of the requested string parameter.
  */
 static inline uint64 GetDParam(uint n)
+{

0 comments (0 inline, 0 general)