Merge branch 'template_train_replacement-sx' into jgrpp

2016-03-21 21:19:46 +00:00
parent df421a55bb 5519bf33b3
commit 13c88dcef2
4 changed files with 20 additions and 1 deletions
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -732,6 +732,7 @@ uint CountVehiclesInChain(const Vehicle *v)
 */
 bool Vehicle::IsEngineCountable() const
 {
+	if (HasBit(this->subtype, GVSF_VIRTUAL)) return false;
 	switch (this->type) {
 		case VEH_AIRCRAFT: return Aircraft::From(this)->IsNormalAircraft(); // don't count plane shadows and helicopter rotors
 		case VEH_TRAIN: