dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23027) -Fix: in some cases NewGRF string arguments were popped twice from the newgrf textstack

Browse Source
This commit is contained in:
yexo
2011-10-12 19:25:52 +00:00
parent 560b527f6f
commit bac8ce6b41
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_text.cpp
View File

@@ -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;