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

(svn r23714) -Codechange: don't mix Viewport with non-viewport code

Browse Source
This commit is contained in:
truebrain
2012-01-02 13:44:37 +00:00
parent 92c60447dc
commit d9f717dcfa
6 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vehicle_base.h
View File

@@ -986,19 +986,19 @@ struct SpecializedVehicle : public Vehicle {
/**
* Update vehicle sprite- and position caches
* @param moved Was the vehicle moved?
* @param turned Did the vehicle direction change?
* @param force_update Force updating the vehicle on the viewport.
* @param update_delta Also update the delta?
*/
inline void UpdateViewport(bool moved, bool turned)
inline void UpdateViewport(bool force_update, bool update_delta)
{
extern void VehicleUpdatePositionAndViewport(Vehicle *v);
extern void VehicleUpdateViewport(Vehicle *v, bool dirty);
/* Explicitly choose method to call to prevent vtable dereference -
* it gives ~3% runtime improvements in games with many vehicles */
if (turned) ((T *)this)->T::UpdateDeltaXY(this->direction);
if (update_delta) ((T *)this)->T::UpdateDeltaXY(this->direction);
SpriteID old_image = this->cur_image;
this->cur_image = ((T *)this)->T::GetImage(this->direction, EIT_ON_MAP);
if (moved || this->cur_image != old_image) VehicleUpdatePositionAndViewport(this);
if (force_update || this->cur_image != old_image) VehicleUpdateViewport(this, true);
}
};