mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r23027) -Fix: in some cases NewGRF string arguments were popped twice from the newgrf textstack
This commit is contained in:
parent
560b527f6f
commit
bac8ce6b41
|
@ -1020,11 +1020,12 @@ void RewindTextRefStack()
|
|||
* @param buff the buffer we're writing to
|
||||
* @param str the string that we need to write
|
||||
* @param argv the OpenTTD stack of values
|
||||
* @param modify_argv When true, modify the OpenTTD stack.
|
||||
* @return the string control code to "execute" now
|
||||
*/
|
||||
uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const char **str, int64 *argv)
|
||||
uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const char **str, int64 *argv, bool modify_argv)
|
||||
{
|
||||
if (_newgrf_textrefstack.used) {
|
||||
if (_newgrf_textrefstack.used && modify_argv) {
|
||||
switch (scc) {
|
||||
default: NOT_REACHED();
|
||||
case SCC_NEWGRF_PRINT_BYTE_SIGNED: *argv = _newgrf_textrefstack.PopSignedByte(); break;
|
||||
|
|
|
@ -40,7 +40,7 @@ void RewindTextRefStack();
|
|||
bool UsingNewGRFTextStack();
|
||||
struct TextRefStack *CreateTextRefStackBackup();
|
||||
void RestoreTextRefStackBackup(struct TextRefStack *backup);
|
||||
uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const char **str, int64 *argv);
|
||||
uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const char **str, int64 *argv, bool modify_argv);
|
||||
|
||||
StringID TTDPStringIDToOTTDStringIDMapping(StringID string);
|
||||
|
||||
|
|
|
@ -668,7 +668,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||
uint orig_offset = args->offset;
|
||||
|
||||
/* When there is no array with types there is no need to do a dry run. */
|
||||
if (!args->HasTypeInformation()) dry_run = true;
|
||||
if (!args->HasTypeInformation() && !UsingNewGRFTextStack()) dry_run = true;
|
||||
if (!dry_run) {
|
||||
if (UsingNewGRFTextStack()) {
|
||||
/* Values from the NewGRF text stack are only copied to the normal
|
||||
|
@ -702,7 +702,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|||
if (SCC_NEWGRF_FIRST <= b && b <= SCC_NEWGRF_LAST) {
|
||||
/* We need to pass some stuff as it might be modified; oh boy. */
|
||||
//todo: should argve be passed here too?
|
||||
b = RemapNewGRFStringControlCode(b, buf_start, &buff, &str, (int64 *)args->GetDataPointer());
|
||||
b = RemapNewGRFStringControlCode(b, buf_start, &buff, &str, (int64 *)args->GetDataPointer(), dry_run);
|
||||
if (b == 0) continue;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue