mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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.
release/0.6
peter1138 2007-12-31 21:51:16 +00:00
parent d8f4a80b0a
commit 7031358cff
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/train_cmd.cpp
View File

@ -1063,7 +1063,15 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p
Vehicle *src_previous = src->Previous(); Vehicle *src_previous = src->Previous();
while (next_to_attach != NULL) { 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); 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) { if (callback != CALLBACK_FAILED) {
StringID error = STR_NULL; StringID error = STR_NULL;
@ -1088,6 +1096,9 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p
} }
} }
/* 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. * 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 * First 'take' the first wagon from 'next_to_attach' and move it