From 1b9ea5468e9208075879c9e2dbb88f4095f85f41 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Fri, 31 Aug 2007 17:31:54 +0000
Subject: [PATCH] (svn r11019) -Fix [FS#1176]: Vehicles in a group must always
 have the same type when adding new vehicles to a group. Patch by SmatZ.

---
 src/group_cmd.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index f27473640f..7942d406e8 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -216,12 +216,13 @@ CommandCost CmdAddVehicleGroup(TileIndex tile, uint32 flags, uint32 p1, uint32 p
 
 	if (!IsValidVehicleID(p2) || (!IsValidGroupID(new_g) && !IsDefaultGroupID(new_g))) return CMD_ERROR;
 
+	Vehicle *v = GetVehicle(p2);
+
 	if (IsValidGroupID(new_g)) {
 		Group *g = GetGroup(new_g);
-		if (g->owner != _current_player) return CMD_ERROR;
+		if (g->owner != _current_player || g->vehicle_type != v->type) return CMD_ERROR;
 	}
 
-	Vehicle *v = GetVehicle(p2);
 	if (v->owner != _current_player || !v->IsPrimaryVehicle()) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {