Mercurial > hg > openttd
changeset 8168:e321f51fe381 draft
(svn r11731) -Fix [FS#1582]: Clear sprite override data before performing NewGRF wagon attach callback. This stopped
the callback working for autoreplace and when moving wagons from train to train in a depot.
-Fix (r11724): Don't check wagon attach callback for the chain when moving a single wagon.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Mon, 31 Dec 2007 21:51:16 +0000 |
parents | 9d8b747e8a5f |
children | 7962907a27a1 |
files | src/train_cmd.cpp |
diffstat | 1 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1063,7 +1063,15 @@ Vehicle *src_previous = src->Previous(); while (next_to_attach != NULL) { + /* Back up and clear the first_engine data to avoid using wagon override group */ + EngineID first_engine = next_to_attach->u.rail.first_engine; + next_to_attach->u.rail.first_engine = INVALID_ENGINE; + uint16 callback = GetVehicleCallbackParent(CBID_TRAIN_ALLOW_WAGON_ATTACH, 0, 0, dst_head->engine_type, next_to_attach, dst_head); + + /* Restore original first_engine data */ + next_to_attach->u.rail.first_engine = first_engine; + if (callback != CALLBACK_FAILED) { StringID error = STR_NULL; @@ -1088,6 +1096,9 @@ } } + /* Only check further wagons if told to move the chain */ + if (!HasBit(p2, 0)) break; + /* * Adding a next wagon to the chain so we can test the other wagons. * First 'take' the first wagon from 'next_to_attach' and move it