summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2014-01-12 17:59:27 +0000
committerfrosch <frosch@openttd.org>2014-01-12 17:59:27 +0000
commitbc86bf9b12ba513e33aeab8a5ff7203009ba2d87 (patch)
treee15687ae6ab96daa8ca2db6fc1cce10238fa6e5c
parent9ad173c9ccc5e223c4d326837ffae3aa6d7cb9ff (diff)
downloadopenttd-bc86bf9b12ba513e33aeab8a5ff7203009ba2d87.tar.xz
(svn r26237) -Cleanup: Remove unused SCC_STRING_ID.
-rw-r--r--src/strings.cpp13
-rw-r--r--src/strings_func.h1
-rw-r--r--src/table/control_codes.h1
3 files changed, 0 insertions, 15 deletions
diff --git a/src/strings.cpp b/src/strings.cpp
index 3f35c5c8f..d29381cdb 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -277,14 +277,6 @@ char *GetString(char *buffr, StringID string, const char *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
@@ -1017,11 +1009,6 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
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);
diff --git a/src/strings_func.h b/src/strings_func.h
index dbdbf2842..67a26a1b8 100644
--- a/src/strings_func.h
+++ b/src/strings_func.h
@@ -124,7 +124,6 @@ public:
};
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);
diff --git a/src/table/control_codes.h b/src/table/control_codes.h
index 2c616ab9d..feb4c975f 100644
--- a/src/table/control_codes.h
+++ b/src/table/control_codes.h
@@ -85,7 +85,6 @@ enum StringControlCode {
SCC_HEX,
SCC_BYTES,
- SCC_STRING_ID,
SCC_RAW_STRING_POINTER,
SCC_PLURAL_LIST,
SCC_GENDER_LIST,