dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add road vehicle state to UpdateViewport()->GetImage() var whitelist.

Browse Source 
Minor refactoring of var check.
This commit is contained in:
Jonathan G Rennison
2016-09-09 23:44:13 +01:00
parent 0c1f59807d
commit d733955d33
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vehicle_base.h
View File

@@ -1148,19 +1148,19 @@ struct SpecializedVehicle : public Vehicle {
/* Skip updating sprites on dedicated servers without screen */
if (_network_dedicated) return;
extern bool _sprite_group_resolve_check_veh_enable;
extern bool _sprite_group_resolve_check_veh_result;
extern bool _sprite_group_resolve_check_veh_check;
extern VehicleType _sprite_group_resolve_check_veh_type;
/* Explicitly choose method to call to prevent vtable dereference -
* it gives ~3% runtime improvements in games with many vehicles */
if (update_delta) ((T *)this)->T::UpdateDeltaXY(this->direction);
SpriteID old_image = this->cur_image;
if (this->cur_image_valid_dir != this->direction) {
_sprite_group_resolve_check_veh_enable = true;
_sprite_group_resolve_check_veh_result = true;
_sprite_group_resolve_check_veh_check = true;
_sprite_group_resolve_check_veh_type = EXPECTED_TYPE;
this->cur_image = ((T *)this)->T::GetImage(this->direction, EIT_ON_MAP);
this->cur_image_valid_dir = _sprite_group_resolve_check_veh_result ? this->direction : INVALID_DIR;
_sprite_group_resolve_check_veh_enable = false;
this->cur_image_valid_dir = _sprite_group_resolve_check_veh_check ? this->direction : INVALID_DIR;
_sprite_group_resolve_check_veh_check = false;
}
if (force_update || this->cur_image != old_image) this->Vehicle::UpdateViewport(true);
}