cpp/openttd-patchpack/source Changeset - r21151:32d9eab0d5a9

Changeset - r21151:32d9eab0d5a9

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 10 years ago 2014-01-12 17:59:27
frosch@openttd.org

(svn r26237) -Cleanup: Remove unused SCC_STRING_ID.

3 files changed with 0 insertions and 15 deletions:

src/strings.cpp

src/strings_func.h

src/table/control_codes.h

0 comments (0 inline, 0 general)

src/strings.cpp

➞

Show inline comments

@@ @@ -274,20 +274,12 @@ char *GetString(char *buffr, StringID st @@
 	_global_string_params.ClearTypeInformation();
 	_global_string_params.offset = 0;
 	return GetStringWithArgs(buffr, string, &_global_string_params, last);
+}
 char *InlineString(char *buf, StringID string)
+{
 	buf += Utf8Encode(buf, SCC_STRING_ID);
 	buf += Utf8Encode(buf, string);
 	return buf;
+}
 /**
  * This function is used to "bind" a C string to a OpenTTD dparam slot.
  * @param n slot of the string
  * @param str string to bind
  */
 void SetDParamStr(uint n, const char *str)
@@ @@ -1014,17 +1006,12 @@ static char *FormatString(char *buff, co @@
+			}
 			case SCC_REVISION: // {REV}
 				buff = strecpy(buff, _openttd_revision, last);
 				break;
 			case SCC_STRING_ID: // {STRINL}
 				if (game_script) break;
 				buff = GetStringWithArgs(buff, Utf8Consume(&str), args, last);
 				break;
 			case SCC_RAW_STRING_POINTER: { // {RAW_STRING}
 				if (game_script) break;
 				const char *str = (const char *)(size_t)args->GetInt64(SCC_RAW_STRING_POINTER);
 				buff = FormatString(buff, str, args, last);
 				break;
+			}

src/strings_func.h

➞

Show inline comments

@@ @@ -121,13 +121,12 @@ public: @@
 		assert(n < this->num_param);
 		return this->data[n];
+	}
 };
 extern StringParameters _global_string_params;
 char *InlineString(char *buf, StringID string);
 char *GetString(char *buffr, StringID string, const char *last);
 char *GetStringWithArgs(char *buffr, StringID string, StringParameters *args, const char *last, uint case_index = 0, bool game_script = false);
 const char *GetStringPtr(StringID string);
 uint ConvertKmhishSpeedToDisplaySpeed(uint speed);
 uint ConvertDisplaySpeedToKmhishSpeed(uint speed);

src/table/control_codes.h

➞

Show inline comments

@@ @@ -82,13 +82,12 @@ enum StringControlCode { @@
 	SCC_DECIMAL,
 	SCC_NUM,
 	SCC_ZEROFILL_NUM,
 	SCC_HEX,
 	SCC_BYTES,
 	SCC_STRING_ID,
 	SCC_RAW_STRING_POINTER,
 	SCC_PLURAL_LIST,
 	SCC_GENDER_LIST,
 	SCC_GENDER_INDEX,
 	SCC_ARG_INDEX,
 	SCC_SET_CASE,

0 comments (0 inline, 0 general)