mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r21597) -Fix (r21239): Also catch the case when callback 10 returns VE_DEFAULT.

This commit is contained in:
frosch 2010-12-22 14:51:12 +00:00
parent fbe653d4ef
commit 4b2624de1d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/vehicle.cpp
View File

@ -1923,7 +1923,16 @@ void Vehicle::UpdateVisualEffect(bool allow_power_change)
if (HasBit(e->info.callback_mask, CBM_VEHICLE_VISUAL_EFFECT)) {
uint16 callback = GetVehicleCallback(CBID_VEHICLE_VISUAL_EFFECT, 0, 0, this->engine_type, this);
if (callback != CALLBACK_FAILED) this->vcache.cached_vis_effect = GB(callback, 0, 8);
if (callback != CALLBACK_FAILED) {
callback = GB(callback, 0, 8);
/* Avoid accidentally setting 'visual_effect' to the default value
* Since bit 6 (disable effects) is set anyways, we can safely erase some bits. */
if (callback == VE_DEFAULT) {
assert(HasBit(callback, VE_DISABLE_EFFECT));
SB(callback, VE_TYPE_START, VE_TYPE_COUNT, 0);
}
this->vcache.cached_vis_effect = callback;
}
}
if (!allow_power_change && powered_before != HasBit(this->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER)) {