mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11413) -Fix [FS#1405]: don't use cached override spriteset for callbacks
This commit is contained in:
parent
21c02fee87
commit
80b9e0bc5b
|
@ -845,9 +845,10 @@ static inline void NewVehicleResolver(ResolverObject *res, EngineID engine_type,
|
||||||
* chosen. For trains, an additional engine override lookup is performed.
|
* chosen. For trains, an additional engine override lookup is performed.
|
||||||
* @param engine Engine type of the vehicle.
|
* @param engine Engine type of the vehicle.
|
||||||
* @param v The vehicle itself.
|
* @param v The vehicle itself.
|
||||||
|
* @param use_cache Use cached override
|
||||||
* @returns The selected SpriteGroup for the vehicle.
|
* @returns The selected SpriteGroup for the vehicle.
|
||||||
*/
|
*/
|
||||||
static const SpriteGroup *GetVehicleSpriteGroup(EngineID engine, const Vehicle *v)
|
static const SpriteGroup *GetVehicleSpriteGroup(EngineID engine, const Vehicle *v, bool use_cache = true)
|
||||||
{
|
{
|
||||||
const SpriteGroup *group;
|
const SpriteGroup *group;
|
||||||
CargoID cargo;
|
CargoID cargo;
|
||||||
|
@ -858,7 +859,10 @@ static const SpriteGroup *GetVehicleSpriteGroup(EngineID engine, const Vehicle *
|
||||||
cargo = v->cargo_type;
|
cargo = v->cargo_type;
|
||||||
|
|
||||||
if (v->type == VEH_TRAIN) {
|
if (v->type == VEH_TRAIN) {
|
||||||
group = v->u.rail.cached_override;
|
/* We always use cached value, except for callbacks because the override spriteset
|
||||||
|
* to use may be different than the one cached. It happens for callback 0x15 (refit engine),
|
||||||
|
* as v->cargo_type is temporary changed to the new type */
|
||||||
|
group = use_cache ? v->u.rail.cached_override : GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, v->u.rail.first_engine);
|
||||||
if (group != NULL) return group;
|
if (group != NULL) return group;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -942,7 +946,7 @@ uint16 GetVehicleCallback(CallbackID callback, uint32 param1, uint32 param2, Eng
|
||||||
object.callback_param1 = param1;
|
object.callback_param1 = param1;
|
||||||
object.callback_param2 = param2;
|
object.callback_param2 = param2;
|
||||||
|
|
||||||
group = Resolve(GetVehicleSpriteGroup(engine, v), &object);
|
group = Resolve(GetVehicleSpriteGroup(engine, v, false), &object);
|
||||||
if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED;
|
if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED;
|
||||||
|
|
||||||
return group->g.callback.result;
|
return group->g.callback.result;
|
||||||
|
@ -971,7 +975,7 @@ uint16 GetVehicleCallbackParent(CallbackID callback, uint32 param1, uint32 param
|
||||||
|
|
||||||
object.u.vehicle.parent = parent;
|
object.u.vehicle.parent = parent;
|
||||||
|
|
||||||
group = Resolve(GetVehicleSpriteGroup(engine, v), &object);
|
group = Resolve(GetVehicleSpriteGroup(engine, v, false), &object);
|
||||||
if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED;
|
if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED;
|
||||||
|
|
||||||
return group->g.callback.result;
|
return group->g.callback.result;
|
||||||
|
|
Loading…
Reference in New Issue