# HG changeset patch # User frosch # Date 2011-07-03 13:53:42 # Node ID e2ae8a6fd081d04e46d7ae462078184e0fd6bdaf # Parent e881883992f4b334915dbdd6238341e1a53e78cf (svn r22628) -Codechange: Allow passing the textref stack values to use to StartTextRefStackUsage() instead of always using the temporary NewGRF registers. diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -969,8 +969,9 @@ void RestoreTextRefStackBackup(struct Te * normal string parameters again. * * @param numEntries number of entries to copy from the registers + * @param values values to copy onto the stack; if NULL the temporary NewGRF registers will be used instead */ -void StartTextRefStackUsage(byte numEntries) +void StartTextRefStackUsage(byte numEntries, const uint32 *values) { extern TemporaryStorageArray _temp_store; @@ -978,8 +979,9 @@ void StartTextRefStackUsage(byte numEntr byte *p = _newgrf_textrefstack->stack; for (uint i = 0; i < numEntries; i++) { + uint32 value = values != NULL ? values[i] : _temp_store.GetValue(0x100 + i); for (uint j = 0; j < 32; j += 8) { - *p = GB(_temp_store.GetValue(0x100 + i), j, 8); + *p = GB(value, j, 8); p++; } } diff --git a/src/newgrf_text.h b/src/newgrf_text.h --- a/src/newgrf_text.h +++ b/src/newgrf_text.h @@ -34,7 +34,7 @@ void CleanUpGRFText(struct GRFText *grft bool CheckGrfLangID(byte lang_id, byte grf_version); -void StartTextRefStackUsage(byte numEntries); +void StartTextRefStackUsage(byte numEntries, const uint32 *values = NULL); void StopTextRefStackUsage(); void SwitchToNormalRefStack(); void SwitchToErrorRefStack();