Merge branch 'master' into template_train_replacement

Fix Template creation window vehicle drag cursor.
This commit is contained in:
Jonathan G Rennison
2016-08-26 00:00:20 +01:00
156 changed files with 6426 additions and 796 deletions

View File

@@ -23,6 +23,7 @@
#include "transport_type.h"
#include "group_type.h"
#include "base_consist.h"
#include "network/network.h"
#include <list>
#include <map>
@@ -1076,6 +1077,9 @@ struct SpecializedVehicle : public Vehicle {
*/
inline void UpdateViewport(bool force_update, bool update_delta)
{
/* Skip updating sprites on dedicated servers without screen */
if (_network_dedicated) return;
/* 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);