mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26237) -Cleanup: Remove unused SCC_STRING_ID.

release/1.4
frosch 2014-01-12 17:59:27 +00:00
parent 9ad173c9cc
commit bc86bf9b12
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/strings.cpp
View File

@ -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. * This function is used to "bind" a C string to a OpenTTD dparam slot.
* @param n slot of the string * @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); buff = strecpy(buff, _openttd_revision, last);
break; 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} case SCC_RAW_STRING_POINTER: { // {RAW_STRING}
if (game_script) break; if (game_script) break;
const char *str = (const char *)(size_t)args->GetInt64(SCC_RAW_STRING_POINTER); const char *str = (const char *)(size_t)args->GetInt64(SCC_RAW_STRING_POINTER);

1
src/strings_func.h
View File

@ -124,7 +124,6 @@ public:
}; };
extern StringParameters _global_string_params; extern StringParameters _global_string_params;
char *InlineString(char *buf, StringID string);
char *GetString(char *buffr, StringID string, const char *last); 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); char *GetStringWithArgs(char *buffr, StringID string, StringParameters *args, const char *last, uint case_index = 0, bool game_script = false);
const char *GetStringPtr(StringID string); const char *GetStringPtr(StringID string);

1
src/table/control_codes.h
View File

@ -85,7 +85,6 @@ enum StringControlCode {
SCC_HEX, SCC_HEX,
SCC_BYTES, SCC_BYTES,
SCC_STRING_ID,
SCC_RAW_STRING_POINTER, SCC_RAW_STRING_POINTER,
SCC_PLURAL_LIST, SCC_PLURAL_LIST,
SCC_GENDER_LIST, SCC_GENDER_LIST,