mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r23478) -Codechange: add a method to copy string parameters *and* its raw strings

This commit is contained in:
rubidium 2011-12-10 16:03:12 +00:00
parent 7bb4a0b825
commit c06a3555fb
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/strings.cpp
View File

@ -96,6 +96,30 @@ void CopyOutDParam(uint64 *dst, int offs, int num)
MemCpyT(dst, _global_string_params.GetPointerToOffset(offs), num);
}
/**
* Copy \a num string parameters from the global string parameter array to the \a dst array.
* Furthermore clone raw string parameters into \a strings and amend the data in \a dst.
* @param dst Destination array of string parameters.
* @param strings Destination array for clone of the raw strings. Must be of same length as dst. Deallocation left to the caller.
* @param string The string used to determine where raw strings are and where there are no raw strings.
* @param num Number of string parameters to copy.
*/
void CopyOutDParam(uint64 *dst, const char **strings, StringID string, int num)
{
char buf[DRAW_STRING_BUFFER];
GetString(buf, string, lastof(buf));
MemCpyT(dst, _global_string_params.GetPointerToOffset(0), num);
for (int i = 0; i < num; i++) {
if (_global_string_params.HasTypeInformation() && _global_string_params.GetTypeAtOffset(i) == SCC_RAW_STRING_POINTER) {
strings[i] = strdup((const char *)(size_t)_global_string_params.GetParam(i));
dst[i] = (size_t)strings[i];
} else {
strings[i] = NULL;
}
}
}
static char *StationGetSpecialString(char *buff, int x, const char *last);
static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed, const char *last);
static char *GetSpecialNameString(char *buff, int ind, StringParameters *args, const char *last);
@ -822,7 +846,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
break;
case SCC_RAW_STRING_POINTER: { // {RAW_STRING}
const char *str = (const char *)(size_t)args->GetInt64();
const char *str = (const char *)(size_t)args->GetInt64(SCC_RAW_STRING_POINTER);
buff = FormatString(buff, str, args, last);
break;
}

1
src/strings_func.h
View File

@ -168,6 +168,7 @@ void SetDParamStr(uint n, const char *str);
void CopyInDParam(int offs, const uint64 *src, int num);
void CopyOutDParam(uint64 *dst, int offs, 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.