# HG changeset patch # User peter1138 # Date 1213363735 0 # Node ID d4534fb0208dfab6ae936fa03735eca0d37052ab # Parent 4db23258381f294aec2da61429057f260cc97e2b (svn r13507) -Fix (r12856): first engine change should've been moved too diff -r 4db23258381f -r d4534fb0208d src/train_cmd.cpp --- a/src/train_cmd.cpp Fri Jun 13 05:50:24 2008 +0000 +++ b/src/train_cmd.cpp Fri Jun 13 13:28:55 2008 +0000 @@ -211,6 +211,8 @@ u->u.rail.first_engine = v == u ? INVALID_ENGINE : first_engine; u->u.rail.railtype = rvi_u->railtype; + if (IsTrainEngine(u)) first_engine = u->engine_type; + /* Set user defined data to its default value */ u->u.rail.user_def_data = rvi_u->user_def_data; } @@ -225,8 +227,6 @@ if (!HasBit(EngInfo(u->engine_type)->misc_flags, EF_RAIL_TILTS)) train_can_tilt = false; - if (IsTrainEngine(u)) first_engine = u->engine_type; - /* Cache wagon override sprite group. NULL is returned if there is none */ u->u.rail.cached_override = GetWagonOverrideSpriteSet(u->engine_type, u->cargo_type, u->u.rail.first_engine);